Skip to content

[IMP] accounting: batch payments and SEPA overhaul (+ additional CH loca info)#18650

Closed
fw-bot wants to merge 1 commit into
19.0from
19.0-17.0-batch-payments-tohor-540160-fw
Closed

[IMP] accounting: batch payments and SEPA overhaul (+ additional CH loca info)#18650
fw-bot wants to merge 1 commit into
19.0from
19.0-17.0-batch-payments-tohor-540160-fw

Conversation

@fw-bot

@fw-bot fw-bot commented Jun 26, 2026

Copy link
Copy Markdown
Collaborator

taskid-5262362

Up to master.

Changes to forward-ports:

18.0 (only): No charge bearer etc options for ISO20022 payments
18.0+: Add :doc: link to journals in batch.rst
18.0+: Change 'Print' to 'Send & Print' for mandates in sepa_payments.rst
18.0+: SEPA and ISO20022 (PAIN) are different and their specific thing, need to adapt this in sepa_payments.rst
18.2+: Charge bearer options etc for ISO20022 payments.
19.0: I don't think you're able to reconcile against batch payments anymore, so some of this intro and the bank rec section will need to change

Apply the sames changes for the Swiss page.

Forward-Port-Of: #18639
Forward-Port-Of: #17751

@robodoo

robodoo commented Jun 26, 2026

Copy link
Copy Markdown
Collaborator

Pull request status dashboard

@fw-bot

fw-bot commented Jun 26, 2026

Copy link
Copy Markdown
Collaborator Author

@tohor-odoo @dade-odoo cherrypicking of pull request #17751 failed.

stdout:

CONFLICT (modify/delete): content/applications/finance/accounting/payments/batch_sdd.rst deleted in 08dcc783a08de911d5eba3fb021e4602e3606a70 and modified in eab1d5b2418a398fececee82e0de7d2018996fa9.  Version eab1d5b2418a398fececee82e0de7d2018996fa9 of content/applications/finance/accounting/payments/batch_sdd.rst left in tree.
Auto-merging content/applications/finance/accounting/vendor_bills.rst
Auto-merging content/applications/finance/fiscal_localizations/united_states.rst
CONFLICT (content): Merge conflict in content/applications/finance/fiscal_localizations/united_states.rst
Auto-merging content/applications/finance/payment_providers/bank_payments.rst

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

:shipit: you can use git-fw to re-do the forward-port for you locally.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@tohor-odoo tohor-odoo force-pushed the 19.0-17.0-batch-payments-tohor-540160-fw branch from 0141968 to 6c133c7 Compare June 29, 2026 14:33
@C3POdoo C3POdoo requested review from a team June 29, 2026 15:33
@tohor-odoo tohor-odoo removed request for a team June 30, 2026 12:50
@tohor-odoo tohor-odoo force-pushed the 19.0-17.0-batch-payments-tohor-540160-fw branch from 6c133c7 to 80158e5 Compare June 30, 2026 13:20
@tohor-odoo

Copy link
Copy Markdown
Contributor

@robodoo r+

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants