" -msgstr "" +msgid "Acceptance point" +msgstr "Annahmestelle" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"
\n" -"\n" -" Payable by
" -msgstr "" +msgid "Account / Payable to
" +msgstr "Konto / Zahlbar an
" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"
\n" -"\n" -" Reference
" -msgstr "" - -#. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.res_config_settings_view_form -msgid "ISR scan line offset" -msgstr "" +msgid "Additional information
" +msgstr "Zusätzliche Informationen
" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"QR-bill Payment Part
" -msgstr "" +msgid "Amount
" +msgstr "Betrag
" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"QR-bill Payment Receipt Part
\n" -"\n" -" Payable to
" -msgstr "" +msgid "Currency
" +msgstr "Währung
" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Acceptance point" -msgstr "" +msgid "Payable by
" +msgstr "Zahlbar durch
" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Additional information
" -msgstr "" +msgid "Reference
" +msgstr "Referenz
" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Amount
" -msgstr "" +msgid "Payment Part" +msgstr "Zahlteil" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Currency
" -msgstr "" - -#. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Payable by
" -msgstr "" - -#. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Payable to
" -msgstr "" - -#. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"Supports
\n" -" Credit " -"transfer" -msgstr "" +msgid "Receipt" +msgstr "Empfangsschein" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_autres_mouv diff --git a/addons/l10n_ch/i18n_extra/fr.po b/addons/l10n_ch/i18n_extra/fr.po new file mode 100644 index 00000000000..55f97427b05 --- /dev/null +++ b/addons/l10n_ch/i18n_extra/fr.po @@ -0,0 +1,78 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * l10n_ch +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-28 09:52+0000\n" +"PO-Revision-Date: 2020-06-17 10:00+0000\n" +"Last-Translator: yannick.vaucher@camptocamp.com\n" +"Language-Team: \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: \n" +"X-Generator: Poedit 2.2.1\n" + +#. module: l10n_ch +#: model:ir.actions.report,print_report_name:l10n_ch.l10n_ch_qr_report +msgid "'QR-bill-%s' % object.name" +msgstr "'QR-facture-%s' % object.name" + +#. module: l10n_ch +#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template +msgid "QR-bill for invoice" +msgstr "QR-facture" + +#. module: l10n_ch +#: model_terms:ir.ui.view,arch_db:l10n_ch.isr_invoice_form +msgid "Print QR-bill" +msgstr "Imprimer QR-facture" + +#. module: l10n_ch +#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template +msgid "Acceptance point" +msgstr "Point de dépôt" + +#. module: l10n_ch +#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template +msgid "Account / Payable to
" +msgstr "Compte / Payable à
" + +#. module: l10n_ch +#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template +msgid "Additional information
" +msgstr "Information supplémentaires
" + +#. module: l10n_ch +#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template +msgid "Amount
" +msgstr "Montant
" + +#. module: l10n_ch +#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template +msgid "Currency
" +msgstr "Monnaie
" + +#. module: l10n_ch +#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template +msgid "Payable by
" +msgstr "Payable par
" + +#. module: l10n_ch +#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template +msgid "Reference
" +msgstr "Référence
" + +#. module: l10n_ch +#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template +msgid "Payment Part" +msgstr "Section paiement" + +#. module: l10n_ch +#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template +msgid "Receipt" +msgstr "Récépissé" diff --git a/addons/l10n_ch/i18n_extra/it.po b/addons/l10n_ch/i18n_extra/it.po index 2f8b5dbfeab..92e0e32d7c9 100644 --- a/addons/l10n_ch/i18n_extra/it.po +++ b/addons/l10n_ch/i18n_extra/it.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-28 09:52+0000\n" -"PO-Revision-Date: 2020-05-28 14:49+0200\n" +"PO-Revision-Date: 2020-06-17 10:00+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "Language: it\n" @@ -328,113 +328,48 @@ msgstr "910 Donazioni, dividendi, compensi, ..." #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"
\n" -"\n" -" Due date
" -msgstr "" -"
\n" -"\n" -" Data di " -"scadenza
" +msgid "Acceptance point" +msgstr "Punto di accettazione" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"
\n" -"\n" -" Payable by
" -msgstr "" -"
\n" -"\n" -" Pagabile da
" +msgid "Account / Payable to
" +msgstr "Conto / Pagabile a
" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"
\n" -"\n" -" Reference
" -msgstr "" -"
\n" -"\n" -" Riferimento
" - -#. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.res_config_settings_view_form -msgid "ISR scan line offset" -msgstr "" -"Offset della linea di scansione SRI" +msgid "Additional information
" +msgstr "Informationi supplementari
" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"QR-bill Payment Part
" -msgstr "" -"Parte di pagamento QR-fattura
" +msgid "Amount
" +msgstr "Importo
" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"QR-bill Payment Receipt Part
\n" -"\n" -" Payable to
" -msgstr "" -"QR-fattura Parte Ricevuta di " -"pagamento
\n" -"\n" -" Pagabile a
" +msgid "Currency
" +msgstr "Valuta
" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Acceptance point" -msgstr "Punto di accettazione" +msgid "Payable by
" +msgstr "Pagabile da
" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Additional information
" -msgstr "Ulteriori informazioni
" +msgid "Reference
" +msgstr "Riferimento
" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Amount
" -msgstr "Importo
" +msgid "Payment Part" +msgstr "Sezione pagamento" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Currency
" -msgstr "Valuta
" - -#. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Payable by
" -msgstr "Pagabile da
" - -#. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Payable to
" -msgstr "Pagabile a
" - -#. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"Supports
\n" -" Credit " -"transfer" -msgstr "" -"Supporta
\n" -" Bonifico " -"bancario" +msgid "Receipt" +msgstr "Ricevuta" #. module: l10n_ch #: model:account.tax.report.line,name:l10n_ch.account_tax_report_line_chtax_autres_mouv @@ -1431,6 +1366,11 @@ msgstr "QR-fattura" msgid "QR-bill for invoice" msgstr "QR per fattura" +#. module: l10n_ch +#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template +msgid "QR-bill for invoice" +msgstr "QR-facture" + #. module: l10n_ch #: model:account.account.template,name:l10n_ch.ch_coa_3801 msgid "Rabais et réduction de prix" diff --git a/addons/l10n_ch/i18n_extra/l10n_ch.pot b/addons/l10n_ch/i18n_extra/l10n_ch.pot index f6811c3797b..8cff14a83ca 100644 --- a/addons/l10n_ch/i18n_extra/l10n_ch.pot +++ b/addons/l10n_ch/i18n_extra/l10n_ch.pot @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-28 09:52+0000\n" -"PO-Revision-Date: 2020-05-28 09:52+0000\n" +"PO-Revision-Date: 2020-06-17 10:00+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -324,30 +324,6 @@ msgstr "" msgid "910 Les dons, les dividendes, les dédommagements, ..." msgstr "" -#. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"
\n" -"\n" -" Due date
" -msgstr "" - -#. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"
\n" -"\n" -" Payable by
" -msgstr "" - -#. module: l10n_ch -#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"
\n" -"\n" -" Reference
" -msgstr "" - #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.res_config_settings_view_form msgid "ISR scan line offset" @@ -355,54 +331,52 @@ msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"QR-bill Payment " -"Part
" +msgid "Acceptance point" msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"QR-bill Payment Receipt Part
\n" -"\n" -" Payable to
" +msgid "Additional information
" msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Acceptance point" +msgid "Amount
" msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Additional information
" +msgid "Account / Payable to
" msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Amount
" +msgid "Currency
" msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Currency
" +msgid "Payable by
" msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Payable by
" +msgid "Payable to
" msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "Payable to
" +msgid "Reference
" msgstr "" #. module: l10n_ch #: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template -msgid "" -"Supports
\n" -" Credit transfer" +msgid "Payment Part" +msgstr "" + +#. module: l10n_ch +#: model_terms:ir.ui.view,arch_db:l10n_ch.l10n_ch_swissqr_template +msgid "Receipt" msgstr "" #. module: l10n_ch diff --git a/addons/l10n_ch/models/account_invoice.py b/addons/l10n_ch/models/account_invoice.py index 5799f41384f..3ed18cbad8a 100644 --- a/addons/l10n_ch/models/account_invoice.py +++ b/addons/l10n_ch/models/account_invoice.py @@ -60,9 +60,9 @@ class AccountMove(models.Model): record.l10n_ch_isr_subscription = _format_isr_subscription_scanline(isr_subscription) record.l10n_ch_isr_subscription_formatted = _format_isr_subscription(isr_subscription) - @api.depends('name', 'partner_bank_id.l10n_ch_postal') + @api.depends('name', 'partner_bank_id.l10n_ch_postal', 'partner_bank_id.acc_number') def _compute_l10n_ch_isr_number(self): - """ The ISR reference number is 27 characters long. The first 12 of them + """ The QRR or ISR reference number is 27 characters long. The first 12 of them contain the postal account number of this ISR's issuer, removing the zeros at the beginning and filling the empty places with zeros on the right if it is too short. The next 14 characters contain an internal reference identifying @@ -72,8 +72,10 @@ class AccountMove(models.Model): of a recursive modulo 10 on its first 26 characters. """ for record in self: - if record.name and record.partner_bank_id and record.partner_bank_id.l10n_ch_postal: - invoice_issuer_ref = record.partner_bank_id.l10n_ch_postal.ljust(l10n_ch_ISR_NUMBER_ISSUER_LENGTH, '0') + has_qriban = record.partner_bank_id._is_qr_iban() + isr_subscription = record.partner_bank_id.l10n_ch_postal + if (has_qriban or isr_subscription) and record.name: + invoice_issuer_ref = (isr_subscription or '').ljust(l10n_ch_ISR_NUMBER_ISSUER_LENGTH, '0') invoice_ref = re.sub('[^\d]', '', record.name) #We only keep the last digits of the sequence number if it is too long invoice_ref = invoice_ref[-l10n_ch_ISR_NUMBER_ISSUER_LENGTH:] diff --git a/addons/l10n_ch/models/res_bank.py b/addons/l10n_ch/models/res_bank.py index d01c7a875e9..779acdc331a 100644 --- a/addons/l10n_ch/models/res_bank.py +++ b/addons/l10n_ch/models/res_bank.py @@ -103,7 +103,7 @@ class ResPartnerBank(models.Model): if qr_method == 'ch_qr': qr_code_vals = self._l10n_ch_get_qr_vals(amount, currency, debtor_partner, free_communication, structured_communication) - return '/report/barcode/?type=%s&value=%s&width=%s&height=%s&humanreadable=1&mask=ch_cross' % ('QR', werkzeug.urls.url_quote_plus('\n'.join(qr_code_vals)), 256, 256) + return '/report/barcode/?type=%s&value=%s&width=%s&height=%s&quiet=1&mask=ch_cross' % ('QR', werkzeug.urls.url_quote_plus('\n'.join(qr_code_vals)), 256, 256) return super()._get_qr_code_url(qr_method, amount, currency, debtor_partner, free_communication, structured_communication) @@ -161,12 +161,27 @@ class ResPartnerBank(models.Model): 'EPD', # Mandatory trailer part ] + def _get_partner_address_lines(self, partner): + """ Returns a tuple of two elements containing the address lines to use + for this partner. Line 1 contains the street and number, line 2 contains + zip and city. Those two lines are limited to 70 characters + """ + streets = [partner.street, partner.street2] + line_1 = ' '.join(filter(None, streets)) + line_2 = partner.zip + ' ' + partner.city + return line_1[:70], line_2[:70] + def _is_qr_iban(self): """ Tells whether or not this bank account has a QR-IBAN account number. QR-IBANs are specific identifiers used in Switzerland as references in QR-codes. They are formed like regular IBANs, but are actually something different. """ + # for conveniance when invoice.partner_bank_id, could be replaced + # by a computed field + if not self: + return False + self.ensure_one() iid_start_index = 4 @@ -210,7 +225,7 @@ class ResPartnerBank(models.Model): return partner.zip and \ partner.city and \ partner.country_id.code and \ - (self.partner_id.street or self.partner_id.street2) + (partner.street or partner.street2) if qr_method == 'ch_qr': if not _partner_fields_set(self.partner_id): diff --git a/addons/l10n_ch/report/swissqr_report.xml b/addons/l10n_ch/report/swissqr_report.xml index 8df6286e2a3..69c149c6f25 100644 --- a/addons/l10n_ch/report/swissqr_report.xml +++ b/addons/l10n_ch/report/swissqr_report.xml @@ -20,100 +20,127 @@ +
- QR-bill for invoice
+ QR-bill for invoice
QR-bill for invoice
+ QR-bill for invoice
-
- QR-bill Payment Receipt Part
+
-
-
- - -
- -
- Reference
-
-
-
- Payable by
-
- - -
- -
+
+ Receipt
+
- Payable to-
-
- - -
- -
-
-
-
- - -
- -
- Amount
- - +
- - +
+
+
+
+
+
+ Account / Payable to
+
+
+
+ + +
- Acceptance point
+ +
+
+
+ + +
+ Reference
+
+
+ +
+
+ Payable by
+
+ +
+ + +
+
+
+ +
+ +
+ + +
+
+
+
+
+
+
+ Currency
+ +
+ + +
+ Amount
+ +
+ + +
+
+ Acceptance point
+
-
- QR-bill Payment Part
-
-
- -
- Supports
- Credit transfer +![]()
- Credit transfer +
+ Payment Part
- Payable to
-
-
-
- - -
- -
- Reference
-
-
-
- Additional information
- - -
- - Payable by
-
- -
- - -
- - Due date
-
- -
-
-
+
diff --git a/addons/l10n_ch/static/src/scss/report_swissqr.scss b/addons/l10n_ch/static/src/scss/report_swissqr.scss
index 379ac0690a4..2eefad0eba0 100644
--- a/addons/l10n_ch/static/src/scss/report_swissqr.scss
+++ b/addons/l10n_ch/static/src/scss/report_swissqr.scss
@@ -19,13 +19,13 @@ body.l10n_ch_qr {
.swissqr_receipt {
position: absolute;
- background_color: white;
+ background-color: white;
border-color:black;
border-width: 1pt 1pt 1pt 1pt;
border-style: solid;
height: 131mm; /* 105 * 1.25 - 0.25 mm to cope for rendering issues due to header (probably a rounding issue) */
- width: 77.5mm; /* 62 * 1.25 */
- top: 240mm; /* 192 * 1.25 */
+ width: 77.5mm; /* 62 * 1.25 */
+ top: 240mm; /* 192 * 1.25 */
left: 0mm;
/*These measures are multiplied by 1.25 here to fit the canvas size used by our reporting engine (1.25 times bigger than A4)*/
}
@@ -37,56 +37,63 @@ body.l10n_ch_qr {
border-width: 1pt 1pt 1pt 1pt;
border-style: solid;
height: 131mm; /* 105 * 1.25 - 0.25mm to cope for rendering issues due to header (probably a rounding issue)*/
- width: 185mm; /* 148 * 1.25 */
- top: 240mm; /* 192 * 1.25 */
- left: 77.5mm; /* 62 * 1.25 */
+ width: 185mm; /* 148 * 1.25 */
+ top: 240mm; /* 192 * 1.25 */
+ left: 77.5mm; /* 62 * 1.25 */
/*These measures are multiplied by 1.25 here to fit the canvas size used by our reporting engine (1.25 times bigger than A4)*/
+
}
.swissqr {
position: absolute;
- height: 70mm;
- width: 70mm;
- top: 29.5mm;
- left: 7mm;
+ height: 57.5mm; /* 46 * 1.25 */
+ width: 57.5mm; /* 46 * 1.25 */
+ top: 20mm; /* 16 * 1.25 */
+ left: 6.25mm; /* 5 * 1.25 min readability margin for QR */
+ /*These measures are multiplied by 1.25 here to fit the canvas size used by our reporting engine (1.25 times bigger than A4)*/
}
.ch_cross {
position: absolute;
background-color: white;
- height: 8.5mm;
- width: 8.5mm;
- top: 60.25mm;
- left: 37.75mm;
+ height: 8.75mm; /* 7 * 1.25 */
+ width: 8.75mm; /* 7 * 1.25 */
+ top: 44.375mm; /* (16 + 23 - 7/2) * 1.25 = 41.5 * 1.25 */
+ left: 30.625mm; /* (5 + 23 - 7/2) * 1.25 = 24.5 * 1.25 */
+ /*These measures are multiplied by 1.25 here to fit the canvas size used by our reporting engine (1.25 times bigger than A4)*/
}
.swissqr_text {
- font-family: OCR-B, Arial, Frutiger, Helvetica;
+ font-family: Arial, Frutiger, Helvetica;
color: black;
+ line-height: 1;
+ padding-top: 1em;
+
+ .title {
+ font-size: 8pt;
+ font-weight: bold;
+ margin-top: 2mm;
+ }
+ .content {
+ font-size: 10pt;
+ }
+
}
- .swissqr_text.title {
- font-size: 9pt;
- font-weight: bold;
- }
-
- .swissqr_text.title.title_zone {
+ .main_title {
+ margin-top: 5mm;
font-size: 11pt;
font-weight: bold;
}
- .swissqr_text.content {
- font-size: 11pt;
- }
-
.swissqr_column_left {
position: absolute;
- left: 12mm;
+ left: 5mm;
}
.swissqr_column_right {
position: absolute;
- left: 83mm;
+ left: 70mm; /* (5 + 46 + 5) * 1.25 */
max-width: 90mm;
}
@@ -94,23 +101,45 @@ body.l10n_ch_qr {
top: 15mm;
}
- .title_zone {
- top: 5mm;
+ .receipt_indication_zone {
+ top: 10mm;
}
.indication_zone {
top: 10mm;
}
- .amount_zone {
+ .receipt_amount_zone {
position: absolute;
- top: 106mm;
+ top: 86mm;
+
+ .column {
+ margin-right: 5mm;
+ float: left;
+ }
}
- .amount {
- position: absolute;
- left: 41mm;
+ .receipt_acceptance_point_zone {
+ position: relative;
+ top: 100mm;
+
+ .content {
+ float: right;
+ padding-right: 1em;
+ }
+
}
+
+ .amount_zone {
+ position: absolute;
+ top: 86mm;
+
+ .column {
+ margin-right: 5mm;
+ float: left;
+ }
+ }
+
}
diff --git a/addons/l10n_ch/tests/__init__.py b/addons/l10n_ch/tests/__init__.py
index f55248130f0..26725066f62 100644
--- a/addons/l10n_ch/tests/__init__.py
+++ b/addons/l10n_ch/tests/__init__.py
@@ -3,3 +3,4 @@
from . import test_ch_qr_code
from . import test_l10n_ch_isr
+from . import test_swissqr
diff --git a/addons/l10n_ch/tests/test_swissqr.py b/addons/l10n_ch/tests/test_swissqr.py
new file mode 100644
index 00000000000..5df778a950c
--- /dev/null
+++ b/addons/l10n_ch/tests/test_swissqr.py
@@ -0,0 +1,177 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+import time
+
+from odoo.addons.account.tests.account_test_classes import AccountingTestCase
+from odoo.exceptions import ValidationError
+from odoo.tests import tagged
+
+CH_IBAN = 'CH15 3881 5158 3845 3843 7'
+QR_IBAN = 'CH21 3080 8001 2345 6782 7'
+
+
+@tagged('post_install', '-at_install')
+class TestSwissQR(AccountingTestCase):
+
+ def setUp(self):
+ super(TestSwissQR, self).setUp()
+ # Activate SwissQR in Swiss invoices
+ self.env['ir.config_parameter'].create(
+ {'key': 'l10n_ch.print_qrcode', 'value': '1'}
+ )
+ self.customer = self.env['res.partner'].create(
+ {
+ "name": "Partner",
+ "street": "Route de Berne 41",
+ "street2": "",
+ "zip": "1000",
+ "city": "Lausanne",
+ "country_id": self.env.ref("base.ch").id,
+ }
+ )
+ self.env.user.company_id.partner_id.write(
+ {
+ "street": "Route de Berne 88",
+ "street2": "",
+ "zip": "2000",
+ "city": "Neuchâtel",
+ "country_id": self.env.ref('base.ch').id,
+ }
+ )
+ self.invoice1 = self.create_invoice('base.CHF')
+ sale_journal = self.env['account.journal'].search([("type", "=", "sale")])
+ sale_journal.invoice_reference_model = "ch"
+
+ def create_invoice(self, currency_to_use='base.CHF'):
+ """ Generates a test invoice """
+
+ product = self.env.ref("product.product_product_4")
+ acc_type = self.env.ref('account.data_account_type_current_assets')
+ account = self.env['account.account'].search(
+ [('user_type_id', '=', acc_type.id)], limit=1
+ )
+ invoice = (
+ self.env['account.move']
+ .with_context(default_type='out_invoice')
+ .create(
+ {
+ 'type': 'out_invoice',
+ 'partner_id': self.customer.id,
+ 'currency_id': self.env.ref(currency_to_use).id,
+ 'date': time.strftime('%Y') + '-12-22',
+ 'invoice_line_ids': [
+ (
+ 0,
+ 0,
+ {
+ 'name': product.name,
+ 'product_id': product.id,
+ 'account_id': account.id,
+ 'quantity': 1,
+ 'price_unit': 42.0,
+ },
+ )
+ ],
+ }
+ )
+ )
+
+ return invoice
+
+ def create_account(self, number):
+ """ Generates a test res.partner.bank. """
+ return self.env['res.partner.bank'].create(
+ {
+ 'acc_number': number,
+ 'partner_id': self.env.user.company_id.partner_id.id,
+ }
+ )
+
+ def swissqr_not_generated(self, invoice):
+ """ Prints the given invoice and tests that no Swiss QR generation is triggered. """
+ self.assertFalse(
+ invoice.can_generate_qr_bill(),
+ 'No Swiss QR should be generated for this invoice',
+ )
+
+ def swissqr_generated(self, invoice, ref_type='NON'):
+ """ Prints the given invoice and tests that a Swiss QR generation is triggered. """
+ self.assertTrue(
+ invoice.can_generate_qr_bill(), 'A Swiss QR can be generated'
+ )
+
+ if ref_type == 'QRR':
+ self.assertTrue(invoice.invoice_payment_ref)
+ struct_ref = invoice.invoice_payment_ref
+ unstr_msg = invoice.ref or invoice.name or ''
+ else:
+ struct_ref = ''
+ unstr_msg = invoice.invoice_payment_ref or invoice.ref or invoice.name or ''
+ unstr_msg = (unstr_msg or invoice.number).replace('/', '%2F')
+
+ payload = (
+ "SPC%0A"
+ "0200%0A"
+ "1%0A"
+ "{iban}%0A"
+ "K%0A"
+ "YourCompany%0A"
+ "Route+de+Berne+88%0A"
+ "2000+Neuch%C3%A2tel%0A"
+ "%0A%0A"
+ "CH%0A"
+ "%0A%0A%0A%0A%0A%0A%0A"
+ "42.00%0A"
+ "CHF%0A"
+ "K%0A"
+ "Partner%0A"
+ "Route+de+Berne+41%0A"
+ "1000+Lausanne%0A"
+ "%0A%0A"
+ "CH%0A"
+ "{ref_type}%0A"
+ "{struct_ref}%0A"
+ "{unstr_msg}%0A"
+ "EPD"
+ ).format(
+ iban=invoice.partner_bank_id.sanitized_acc_number,
+ ref_type=ref_type,
+ struct_ref=struct_ref or '',
+ unstr_msg=unstr_msg,
+ )
+
+ expected_url = ("/report/barcode/?type=QR&value={}"
+ "&width=256&height=256&quiet=1").format(payload)
+
+ url = invoice.partner_bank_id.build_swiss_code_url(
+ invoice.amount_residual,
+ invoice.currency_id.name,
+ None,
+ invoice.partner_id,
+ None,
+ invoice.invoice_payment_ref,
+ invoice.ref or invoice.name,
+ )
+ self.assertEqual(url, expected_url)
+
+ def test_swissQR_missing_bank(self):
+ # Let us test the generation of a SwissQR for an invoice, first by showing an
+ # QR is included in the invoice is only generated when Odoo has all the data it needs.
+ self.invoice1.post()
+ self.swissqr_not_generated(self.invoice1)
+
+ def test_swissQR_iban(self):
+ # Now we add an account for payment to our invoice
+ # Here we don't use a structured reference
+ iban_account = self.create_account(CH_IBAN)
+ self.invoice1.partner_bank_id = iban_account
+ self.invoice1.post()
+ self.swissqr_generated(self.invoice1, ref_type="NON")
+
+ def test_swissQR_qriban(self):
+ # Now use a proper QR-IBAN, we are good to print a QR Bill
+ qriban_account = self.create_account(QR_IBAN)
+ self.assertTrue(qriban_account.acc_type, 'qr-iban')
+ self.invoice1.partner_bank_id = qriban_account
+ self.invoice1.post()
+ self.swissqr_generated(self.invoice1, ref_type="QRR")
diff --git a/odoo/addons/base/models/ir_actions_report.py b/odoo/addons/base/models/ir_actions_report.py
index fd4cca16947..0a927ccacc0 100644
--- a/odoo/addons/base/models/ir_actions_report.py
+++ b/odoo/addons/base/models/ir_actions_report.py
@@ -499,9 +499,15 @@ class IrActionsReport(models.Model):
value = '0%s' % value
try:
width, height, humanreadable, quiet = int(width), int(height), bool(int(humanreadable)), bool(int(quiet))
+ # for `QR` type, `quiet` is not supported. And is simply ignored.
+ # But we can use `barBorder` to get a similar behaviour.
+ bar_border = 4
+ if barcode_type == 'QR' and quiet:
+ bar_border = 0
+
barcode = createBarcodeDrawing(
barcode_type, value=value, format='png', width=width, height=height,
- humanReadable=humanreadable, quiet=quiet
+ humanReadable=humanreadable, quiet=quiet, barBorder=bar_border
)
# If a mask is asked and it is available, call its function to
-
-
-
- - -
- -
-
-
- - -
- - Payable by
-
- -
- - -
- - Due date
-
- -
- Currency
- +
@@ -124,9 +151,9 @@
- +
+ Account / Payable to
+
+
+
+ + +
- +
+
+
+ + +
- Amount
- +
+
+
+
+
+
+
+ - +
+ Reference
+
+
+ +
+
+ Additional information
+ +
+ + +
+ Payable by
+
+ +
+ + +
+
+
+ +
+ +
+ + +
+
+
+
+ Currency
+ +
+ + +
+ Amount
+ +
+ +