diff options
| author | Laurent Smet <las@odoo.com> | 2019-10-29 12:21:27 +0000 |
|---|---|---|
| committer | qdp-odoo <qdp@odoo.com> | 2020-04-10 09:47:24 +0000 |
| commit | caeb782841fc5a7ad71a196e2c9ee67644ef9074 (patch) | |
| tree | 28103bc29ab4f0d98162095f607c4c6ab1433f25 /addons/l10n_ch/report | |
| parent | b4d1360ed1d71c8fda44ca0c3b1a80d5a112b93f (diff) | |
[IMP] account,*: Improve bank statements/payments workflow
- Create journal entries as soon as bank/cash statement lines are created, temporary booked on a suspense account set on the journal.
- Simplify the management of "blue" lines in the reconciliation widget. A "blue" line is now a journal item using a temporary liquidity account (outstanding payment/receipt accounts, set on the journal).
- Adapt and simplify the bank reconciliation report.
- Remove the bank reconciliation threshold date. The reconciliation report will show the not already reconciled journal entries using a liquidity account and the not already reconciled journal entries using a temporary liquidity account. Without accounting, an account.payment will involve directly the liquidity account and then, will be considered as a statement line directly.
- Remove the post_at bank reconciliation feature. The "paid" state will be set on the invoices only if reconciled with a journal entry involving the journal's liquidity account.
With invoicing, the payment will do that so the "in_payment" state should never be shown up.
With accounting, only the statement lines have the power to move an invoice to the "paid" state.
- Fix various corner cases about the management of multi-currency in bank statement lines.
- Fix the conversion dates in multi-currency: Since the bank/cash is always used on the statement lines, it will use always the real "bank" date instead of the fictive payment one.
- Ensure the 'reconcile' method will raise an error if the involved moves are not posted.
related enterprise PR odoo/enterprise#7019
closes odoo/odoo#41301
--task: 2092096
Related: odoo/upgrade#1018
Signed-off-by: Quentin De Paoli (qdp) <qdp@openerp.com>
Diffstat (limited to 'addons/l10n_ch/report')
| -rw-r--r-- | addons/l10n_ch/report/isr_report.xml | 12 | ||||
| -rw-r--r-- | addons/l10n_ch/report/swissqr_report.xml | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/addons/l10n_ch/report/isr_report.xml b/addons/l10n_ch/report/isr_report.xml index bbc3ed89641..bbf50ae6e7f 100644 --- a/addons/l10n_ch/report/isr_report.xml +++ b/addons/l10n_ch/report/isr_report.xml @@ -62,9 +62,9 @@ <t t-if="print_bank"> <div id="voucher-for-bank"> <p t-if="not invoice.company_id.l10n_ch_isr_preprinted_bank"> - <t t-esc="invoice.invoice_partner_bank_id.bank_id.name"/><br /> - <t t-esc="invoice.invoice_partner_bank_id.bank_id.zip"/> - <t t-esc="invoice.invoice_partner_bank_id.bank_id.city"/> + <t t-esc="invoice.partner_bank_id.bank_id.name"/><br /> + <t t-esc="invoice.partner_bank_id.bank_id.zip"/> + <t t-esc="invoice.partner_bank_id.bank_id.city"/> </p> </div> <!--Zugunsten von/En faveur de/A favore di--> @@ -103,9 +103,9 @@ <t t-if="print_bank"> <div id="slip-for-bank"> <p t-if="not invoice.company_id.l10n_ch_isr_preprinted_bank"> - <t t-esc="invoice.invoice_partner_bank_id.bank_id.name"/><br /> - <t t-esc="invoice.invoice_partner_bank_id.bank_id.zip"/> - <t t-esc="invoice.invoice_partner_bank_id.bank_id.city"/> + <t t-esc="invoice.partner_bank_id.bank_id.name"/><br /> + <t t-esc="invoice.partner_bank_id.bank_id.zip"/> + <t t-esc="invoice.partner_bank_id.bank_id.city"/> </p> </div> <!--Zugunsten von/En faveur de/A favore di--> diff --git a/addons/l10n_ch/report/swissqr_report.xml b/addons/l10n_ch/report/swissqr_report.xml index 795c675bbf9..54a3450e515 100644 --- a/addons/l10n_ch/report/swissqr_report.xml +++ b/addons/l10n_ch/report/swissqr_report.xml @@ -9,7 +9,7 @@ <xpath expr="//div[@id='qrcode']" position="after"> <link type="text/css" rel="stylesheet" href="/l10n_ch/static/src/scss/report_swissqr.css"/> <div class="swissqr_content" t-if="o.display_swiss_qr_code()"> - <div class="swissqr_body" t-if="o.invoice_partner_bank_id._eligible_for_qr_code('ch_qr', o.partner_id, o.currency_id)"> + <div class="swissqr_body" t-if="o.partner_bank_id._eligible_for_qr_code('ch_qr', o.partner_id, o.currency_id)"> <div id="title_zone" class="swissqr_column_left title_zone"> <span class="swissqr_text title title_zone">QR-bill payment part</span><br/> </div> @@ -19,11 +19,11 @@ <span class="swissqr_text content">Credit transfer</span> </div> - <img class="swissqr" t-att-src="o.invoice_partner_bank_id.build_qr_code_url(o.amount_residual, o.ref or o.name, o.invoice_payment_ref, o.currency_id, o.partner_id, 'ch_qr')"/> + <img class="swissqr" t-att-src="o.partner_bank_id.build_qr_code_url(o.amount_residual, o.ref or o.name, o.payment_reference, o.currency_id, o.partner_id, 'ch_qr')"/> <div id="indications_zone" class="swissqr_column_right indication_zone"> <span class="swissqr_text title">Account</span><br/> - <span class="swissqr_text content" t-field="o.invoice_partner_bank_id.acc_number"/><br/> + <span class="swissqr_text content" t-field="o.partner_bank_id.acc_number"/><br/> <span class="swissqr_text title">Creditor</span><br/> <span class="swissqr_text content" t-field="o.company_id.name"/><br/> @@ -33,11 +33,11 @@ <span class="swissqr_text content" t-field="o.company_id.city"/><br/> <span class="swissqr_text title">Reference number</span><br/> - <t t-if="o.invoice_partner_bank_id.currency_id.name == 'EUR'"> - <span class="swissqr_text content" t-field="o.invoice_partner_bank_id.l10n_ch_isr_subscription_eur"/><br/> + <t t-if="o.partner_bank_id.currency_id.name == 'EUR'"> + <span class="swissqr_text content" t-field="o.partner_bank_id.l10n_ch_isr_subscription_eur"/><br/> </t> - <t t-if="o.invoice_partner_bank_id.currency_id.name == 'CHF'"> - <span class="swissqr_text content" t-field="o.invoice_partner_bank_id.l10n_ch_isr_subscription_chf"/><br/> + <t t-if="o.partner_bank_id.currency_id.name == 'CHF'"> + <span class="swissqr_text content" t-field="o.partner_bank_id.l10n_ch_isr_subscription_chf"/><br/> </t> <span class="swissqr_text title">Additional information</span><br/> |
