diff --git a/README.md b/README.md index 1e6433d49..53a652e42 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Provides the list of Swiss postal ZIPs for auto-completion. l10n_ch_payment_slip -------------------- -Adds ESR/BVR report on invoice. Every ESR/BVR element position can be configured independently by company. +Adds ISR (PVR/BVR/ESR) report on invoice. Every ISR element position can be configured independently by company. Multiple payment terms on invoices are supported. It will also allow you to do the import of V11 bank statement files and do an automatic reconciliation. @@ -59,7 +59,7 @@ Provides support of SEPA/PAIN electronic payment file. l10n_ch_scan_bvr ---------------- -Allows you to scan the ESR/BVR references and automatically create the proper supplier invoices +Allows you to scan the ISR references and automatically create the proper supplier invoices l10n_ch_hr_payroll ------------------ diff --git a/l10n_ch_base_bank/README.rst b/l10n_ch_base_bank/README.rst index 390eb0027..de6687a84 100644 --- a/l10n_ch_base_bank/README.rst +++ b/l10n_ch_base_bank/README.rst @@ -7,7 +7,7 @@ Switzerland - Bank type ======================= This addons will add different bank types required by specific swiss electronic -payment like DTA and ESR. It allows to manage both Post and Bank systems. +payment like DTA and ISR. It allows to manage both Post and Bank systems. It'll perform some validation when entring bank account number or ESR number in invoice and add some Swiss specific fields on bank. @@ -24,7 +24,7 @@ Account type will be discovered authomatically. Entering a postal number of 9 or 6 digits will auto-complete the bank with PostFinance. (You might create it if you haven't installed `l10n_ch_bank`) -* For bank account for BVR, select the bank and fill the CCP field in bank, optionally fill the account number with bank number. +* For bank account for ISR, select the bank and fill the CCP field in bank, optionally fill the account number with bank number. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas diff --git a/l10n_ch_base_bank/i18n/de.po b/l10n_ch_base_bank/i18n/de.po index 4eadf400e..9f90bb03e 100644 --- a/l10n_ch_base_bank/i18n/de.po +++ b/l10n_ch_base_bank/i18n/de.po @@ -21,26 +21,26 @@ msgstr "" #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/invoice.py:56 #, python-format -msgid "BVR Reference" -msgstr "BVR Referenznummer" +msgid "ISR Reference" +msgstr "ESR Referenznummer" #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/invoice.py:99 #, python-format -msgid "BVR/ESR Reference is required" -msgstr "BVR/ESR Referenznummer ist erforderlich" +msgid "ISR Reference is required" +msgstr "ESR Referenznummer ist erforderlich" #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/invoice.py:80 #, python-format -msgid "BVR/ESR Reference type needs a postal account number on the customer." -msgstr "BVR/ESR Referenznummer benötigt eine Postkonto Nummer beim Kunden." +msgid "ISR Reference type needs a postal account number on the customer." +msgstr "ESR Referenznummer benötigt eine Postkonto Nummer beim Kunden." #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/invoice.py:85 #, python-format -msgid "BVR/ESR Reference type needs a postal account number on your company" -msgstr "BVR/ESR Referenznummer benötigt eine Postkonto Nummer bei der Firma." +msgid "ISR Reference type needs a postal account number on your company" +msgstr "ESR Referenznummer benötigt eine Postkonto Nummer bei der Firma." #. module: l10n_ch_base_bank #: model:ir.model,name:l10n_ch_base_bank.model_res_bank @@ -53,9 +53,9 @@ msgid "Bank Accounts" msgstr "Bankkonten" #. module: l10n_ch_base_bank -#: model:ir.model.fields,field_description:l10n_ch_base_bank.field_res_partner_bank_bvr_adherent_num -msgid "Bank BVR/ESR adherent number" -msgstr "Die zur Bank zugehörige BVR/ESR Nummer" +#: model:ir.model.fields,field_description:l10n_ch_base_bank.field_res_partner_bank_isr_adherent_num +msgid "Bank ISR adherent number" +msgstr "Die zur Bank zugehörige ESR Nummer" #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/bank.py:241 @@ -103,8 +103,8 @@ msgstr "Interne Referenznummer" #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/invoice.py:111 #, python-format -msgid "Invalid BVR/ESR Number (wrong checksum)." -msgstr "Ungültige BVR/ESR Nummer (Falsche Prüfziffer)." +msgid "Invalid ISR Number (wrong checksum)." +msgstr "Ungültige ESR Nummer (Falsche Prüfziffer)." #. module: l10n_ch_base_bank #: model:ir.model,name:l10n_ch_base_bank.model_account_invoice @@ -132,24 +132,24 @@ msgstr "" #. module: l10n_ch_base_bank #: sql_constraint:res.partner.bank:0 -msgid "The BVR adherent number must be unique !" -msgstr "Die zugehörige BVR Nummer muss eindeutig sein!" +msgid "The ISR adherent number must be unique !" +msgstr "Die zugehörige ESR Nummer muss eindeutig sein!" #. module: l10n_ch_base_bank -#: model:ir.model.fields,help:l10n_ch_base_bank.field_res_partner_bank_bvr_adherent_num +#: model:ir.model.fields,help:l10n_ch_base_bank.field_res_partner_bank_isr_adherent_num msgid "" -"Your Bank adherent number to be printed in references of your BVR/ESR. This " +"Your Bank adherent number to be printed in references of your ISR. This " "is not a postal account number." msgstr "" -"Die Banknummer, welche als Referenz zur BVR/ESR Nummer gedruckt wird. Dies " +"Die Banknummer, welche als Referenz zur ESR Nummer gedruckt wird. Dies " "ist nicht die Postkontonummer." #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/bank.py:213 #, python-format msgid "" -"Your bank BVR/ESR adherent number must contain only digits!\n" +"Your bank ISR adherent number must contain only digits!\n" "Please check your company bank account." msgstr "" -"Ihre zur Bank zugehörige BVR/ESR Nummer darf nur Ziffern enthalten.\n" +"Ihre zur Bank zugehörige ESR Nummer darf nur Ziffern enthalten.\n" "Bitte überprüfen Sie die Bankkontoeinstellungen der Firma" diff --git a/l10n_ch_base_bank/i18n/fr.po b/l10n_ch_base_bank/i18n/fr.po index ac00b219c..4f21e9bbd 100644 --- a/l10n_ch_base_bank/i18n/fr.po +++ b/l10n_ch_base_bank/i18n/fr.po @@ -21,26 +21,26 @@ msgstr "" #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/invoice.py:56 #, python-format -msgid "BVR Reference" +msgid "ISR Reference" msgstr "Référence BVR" #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/invoice.py:99 #, python-format -msgid "BVR/ESR Reference is required" +msgid "ISR Reference is required" msgstr "La référence BVR est requise" #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/invoice.py:80 #, python-format -msgid "BVR/ESR Reference type needs a postal account number on the customer." +msgid "ISR Reference type needs a postal account number on the customer." msgstr "" "Le type de référence BVR nécessite un numéro de compte postal sur le client." #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/invoice.py:85 #, python-format -msgid "BVR/ESR Reference type needs a postal account number on your company" +msgid "ISR Reference type needs a postal account number on your company" msgstr "" "Le type de référence BVR nécessite un numéro de compte postal sur votre " "compagnie." @@ -56,8 +56,8 @@ msgid "Bank Accounts" msgstr "Comptes bancaires" #. module: l10n_ch_base_bank -#: model:ir.model.fields,field_description:l10n_ch_base_bank.field_res_partner_bank_bvr_adherent_num -msgid "Bank BVR/ESR adherent number" +#: model:ir.model.fields,field_description:l10n_ch_base_bank.field_res_partner_bank_isr_adherent_num +msgid "Bank ISR adherent number" msgstr "Numéro d'adhérent BVR" #. module: l10n_ch_base_bank @@ -106,7 +106,7 @@ msgstr "Référence interne" #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/invoice.py:111 #, python-format -msgid "Invalid BVR/ESR Number (wrong checksum)." +msgid "Invalid ISR Number (wrong checksum)." msgstr "Numéro BVR invalide" #. module: l10n_ch_base_bank @@ -133,13 +133,13 @@ msgstr "Identifiant Suisse unique de la banque, utilisé dans le numéro IBAN" #. module: l10n_ch_base_bank #: sql_constraint:res.partner.bank:0 -msgid "The BVR adherent number must be unique !" +msgid "The ISR adherent number must be unique !" msgstr "Le numéro d'adhérent BVR doit être unique" #. module: l10n_ch_base_bank -#: model:ir.model.fields,help:l10n_ch_base_bank.field_res_partner_bank_bvr_adherent_num +#: model:ir.model.fields,help:l10n_ch_base_bank.field_res_partner_bank_isr_adherent_num msgid "" -"Your Bank adherent number to be printed in references of your BVR/ESR. This " +"Your Bank adherent number to be printed in references of your ISR. This " "is not a postal account number." msgstr "" "Votre numéro d'adhérent qui doit être imprimé dans la référence du BVR. Ce " @@ -149,8 +149,8 @@ msgstr "" #: code:addons/l10n_ch_base_bank/models/bank.py:213 #, python-format msgid "" -"Your bank BVR/ESR adherent number must contain only digits!\n" +"Your bank ISR adherent number must contain only digits!\n" "Please check your company bank account." msgstr "" -"Votre numéro d'adhérent BVR/ESR de votre banque ne doit contenir que des chiffres!\n" +"Votre numéro d'adhérent BVR de votre banque ne doit contenir que des chiffres!\n" "Veuillez vérifier le compte bancaire de votre société" diff --git a/l10n_ch_base_bank/i18n/it.po b/l10n_ch_base_bank/i18n/it.po index a19678dff..5d86e7281 100644 --- a/l10n_ch_base_bank/i18n/it.po +++ b/l10n_ch_base_bank/i18n/it.po @@ -21,26 +21,26 @@ msgstr "" #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/invoice.py:56 #, python-format -msgid "BVR Reference" -msgstr "BVR Reference" +msgid "ISR Reference" +msgstr "" #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/invoice.py:99 #, python-format -msgid "BVR/ESR Reference is required" -msgstr "BVR/ESR Reference is required" +msgid "ISR Reference is required" +msgstr "" #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/invoice.py:80 #, python-format -msgid "BVR/ESR Reference type needs a postal account number on the customer." -msgstr "BVR/ESR Reference type needs a postal account number on the customer." +msgid "ISR Reference type needs a postal account number on the customer." +msgstr "" #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/invoice.py:85 #, python-format -msgid "BVR/ESR Reference type needs a postal account number on your company" -msgstr "BVR/ESR Reference type needs a postal account number on your company" +msgid "ISR Reference type needs a postal account number on your company" +msgstr "" #. module: l10n_ch_base_bank #: model:ir.model,name:l10n_ch_base_bank.model_res_bank @@ -53,9 +53,9 @@ msgid "Bank Accounts" msgstr "Conti Bancari" #. module: l10n_ch_base_bank -#: model:ir.model.fields,field_description:l10n_ch_base_bank.field_res_partner_bank_bvr_adherent_num -msgid "Bank BVR/ESR adherent number" -msgstr "Bank BVR/ESR adherent number" +#: model:ir.model.fields,field_description:l10n_ch_base_bank.field_res_partner_bank_isr_adherent_num +msgid "Bank ISR adherent number" +msgstr "" #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/bank.py:241 @@ -103,8 +103,8 @@ msgstr "Riferimento interno" #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/invoice.py:111 #, python-format -msgid "Invalid BVR/ESR Number (wrong checksum)." -msgstr "Numero BVR/ESR errato (checksum invalido)." +msgid "Invalid ISR Number (wrong checksum)." +msgstr "Numero PVR errato (checksum invalido)." #. module: l10n_ch_base_bank #: model:ir.model,name:l10n_ch_base_bank.model_account_invoice @@ -126,26 +126,24 @@ msgstr "PostFinance" #. module: l10n_ch_base_bank #: model:ir.model.fields,help:l10n_ch_base_bank.field_res_bank_clearing msgid "Swiss unique bank identifier also used in IBAN number" -msgstr "Swiss unique bank identifier also used in IBAN number" +msgstr "" #. module: l10n_ch_base_bank #: sql_constraint:res.partner.bank:0 -msgid "The BVR adherent number must be unique !" +msgid "The ISR adherent number must be unique !" msgstr "Il numero di adesione PVR deve essere univoco" #. module: l10n_ch_base_bank -#: model:ir.model.fields,help:l10n_ch_base_bank.field_res_partner_bank_bvr_adherent_num +#: model:ir.model.fields,help:l10n_ch_base_bank.field_res_partner_bank_isr_adherent_num msgid "" -"Your Bank adherent number to be printed in references of your BVR/ESR. This " +"Your Bank adherent number to be printed in references of your ISR. This " "is not a postal account number." msgstr "" -"Your Bank adherent number to be printed in references of your BVR/ESR. This " -"is not a postal account number." #. module: l10n_ch_base_bank #: code:addons/l10n_ch_base_bank/models/bank.py:213 #, python-format msgid "" -"Your bank BVR/ESR adherent number must contain only digits!\n" +"Your bank ISR adherent number must contain only digits!\n" "Please check your company bank account." msgstr "" diff --git a/l10n_ch_base_bank/models/bank.py b/l10n_ch_base_bank/models/bank.py index 878048c3c..bb38e2e24 100644 --- a/l10n_ch_base_bank/models/bank.py +++ b/l10n_ch_base_bank/models/bank.py @@ -164,12 +164,13 @@ class ResPartnerBank(models.Model, BankCommon): """ _inherit = 'res.partner.bank' - _compile_check_bvr_add_num = re.compile('[0-9]*$') + _compile_check_isr_add_num = re.compile('[0-9]*$') - bvr_adherent_num = fields.Char( - string='Bank BVR/ESR adherent number', size=11, + isr_adherent_num = fields.Char( + string='Bank ISR adherent number', size=11, + oldname='bvr_adherent_num', help="Your Bank adherent number to be printed " - "in references of your BVR/ESR. " + "in references of your ISR. " "This is not a postal account number." ) acc_number = fields.Char( @@ -201,17 +202,17 @@ def get_account_number(self): else: return self.acc_number - @api.constrains('bvr_adherent_num') + @api.constrains('isr_adherent_num') def _check_adherent_number(self): for p_bank in self: - if not p_bank.bvr_adherent_num: + if not p_bank.isr_adherent_num: continue - valid = self._compile_check_bvr_add_num.match( - p_bank.bvr_adherent_num + valid = self._compile_check_isr_add_num.match( + p_bank.isr_adherent_num ) if not valid: raise exceptions.ValidationError( - _('Your bank BVR/ESR adherent number must contain only ' + _('Your bank ISR adherent number must contain only ' 'digits!\nPlease check your company bank account.') ) return True @@ -232,7 +233,7 @@ def _check_postal_num(self): @api.multi def _get_acc_name(self): """ Return an account name for a bank account - to use with a ccp for BVR. + to use with a ccp for ISR. This method make sure to generate a unique name """ part_name = self.partner_id.name @@ -350,5 +351,5 @@ def onchange_partner_set_acc_number(self): if 'Bank/CCP' in self.acc_number: self.acc_number = self._get_acc_name() - _sql_constraints = [('bvr_adherent_uniq', 'unique (bvr_adherent_num, ccp)', - 'The BVR adherent number/ccp pair must be unique !')] + _sql_constraints = [('isr_adherent_uniq', 'unique (isr_adherent_num, ccp)', + 'The ISR adherent number/ccp pair must be unique !')] diff --git a/l10n_ch_base_bank/models/invoice.py b/l10n_ch_base_bank/models/invoice.py index 1412b836a..2bc1069ed 100644 --- a/l10n_ch_base_bank/models/invoice.py +++ b/l10n_ch_base_bank/models/invoice.py @@ -55,50 +55,50 @@ def _search(self, args, offset=0, limit=None, order=None, count=False, @api.model def _get_reference_type(self): selection = super(AccountInvoice, self)._get_reference_type() - selection.append(('bvr', _('BVR Reference'))) + selection.append(('isr', _('ISR Reference'))) return selection @api.onchange('reference') def onchange_reference(self): - """Identify if the reference entered is of type BVR + """Identify if the reference entered is of type ISR if it does, change reference_type""" if len(self.reference or '') == 27: try: - self._is_bvr_reference() + self._is_isr_reference() except exceptions.ValidationError: return - self.reference_type = 'bvr' + self.reference_type = 'isr' @api.constrains('reference_type') - def _check_bank_type_for_type_bvr(self): + def _check_bank_type_for_type_isr(self): for invoice in self: - if invoice.reference_type == 'bvr': + if invoice.reference_type == 'isr': bank_acc = invoice.partner_bank_id if not (bank_acc.acc_type == 'postal' or bank_acc.acc_type != 'postal' and (bank_acc.ccp or bank_acc.bank_id.ccp)): if invoice.type in ('in_invoice', 'in_refund'): raise exceptions.ValidationError( - _('BVR/ESR Reference type needs a postal account' + _('ISR Reference type needs a postal account' ' number on the customer.') ) else: raise exceptions.ValidationError( - _('BVR/ESR Reference type needs a postal account' + _('ISR Reference type needs a postal account' ' number on your company') ) return True @api.multi - def _is_bvr_reference(self): + def _is_isr_reference(self): """ - Function to validate a bvr reference like : + Function to validate a ISR reference like : 0100054150009>132000000000000000000000014+ 1300132412> The validation is based on l10n_ch """ if not self.reference: raise exceptions.ValidationError( - _('BVR/ESR Reference is required') + _('ISR Reference is required') ) # In this case # <010001000060190> 052550152684006+ 43435> @@ -110,15 +110,15 @@ def _is_bvr_reference(self): # if mod10r(self.reference[:-1]) != self.reference: raise exceptions.ValidationError( - _('Invalid BVR/ESR Number (wrong checksum).') + _('Invalid ISR Number (wrong checksum).') ) @api.constrains('reference') - def _check_bvr(self): - """ Do the check only for invoice with reference_type = 'bvr' """ + def _check_isr(self): + """ Do the check only for invoice with reference_type = 'isr' """ for invoice in self: - if invoice.reference_type == 'bvr': - invoice._is_bvr_reference() + if invoice.reference_type == 'isr': + invoice._is_isr_reference() return True @api.model diff --git a/l10n_ch_base_bank/tests/test_bank.py b/l10n_ch_base_bank/tests/test_bank.py index 7e37a8b50..7c9e5faa2 100644 --- a/l10n_ch_base_bank/tests/test_bank.py +++ b/l10n_ch_base_bank/tests/test_bank.py @@ -219,7 +219,7 @@ def test_constraint_adherent_number(self): self.env['res.partner.bank'].create({ 'partner_id': self.partner.id, 'acc_number': '12312123', - 'bvr_adherent_num': 'Wrong bvr adherent number', + 'isr_adherent_num': 'Wrong ISR adherent number', }) def test_get_account_number(self): @@ -227,7 +227,7 @@ def test_get_account_number(self): bank_acc = self.env['res.partner.bank'].create({ 'partner_id': self.partner.id, 'acc_number': 'R 12312123', - 'bvr_adherent_num': '1234567', + 'isr_adherent_num': '1234567', }) acc_num = bank_acc.get_account_number() self.assertEqual(acc_num, bank_acc.acc_number) @@ -282,7 +282,7 @@ def test_name_search(self): result = self.env['res.bank'].name_search('Lausanne-Centre') self.assertEqual(result and result[0][0], self.bank.id) - def test_multiple_bvr_bank_account_for_same_partner(self): + def test_multiple_isr_bank_account_for_same_partner(self): bank_acc = self.env['res.partner.bank'].create({ 'partner_id': self.partner.id, 'acc_number': '46-110-7', diff --git a/l10n_ch_base_bank/tests/test_create_invoice.py b/l10n_ch_base_bank/tests/test_create_invoice.py index c77bdc02c..c3e3cc83c 100644 --- a/l10n_ch_base_bank/tests/test_create_invoice.py +++ b/l10n_ch_base_bank/tests/test_create_invoice.py @@ -6,7 +6,7 @@ class TestCreateInvoice(common.TransactionCase): - def test_emit_invoice_with_bvr_reference(self): + def test_emit_invoice_with_isr_reference(self): self.inv_values.update({ 'partner_id': self.partner.id, 'type': 'out_invoice' @@ -14,15 +14,15 @@ def test_emit_invoice_with_bvr_reference(self): invoice = self.env['account.invoice'].new(self.inv_values) invoice._onchange_partner_id() self.assertEqual(invoice.partner_bank_id, self.bank_acc) - self.assertNotEqual(invoice.reference_type, 'bvr') + self.assertNotEqual(invoice.reference_type, 'isr') invoice.reference = '132000000000000000000000014' invoice.onchange_reference() - self.assertEqual(invoice.reference_type, 'bvr') + self.assertEqual(invoice.reference_type, 'isr') - def test_emit_invoice_with_bvr_reference_15_pos(self): + def test_emit_invoice_with_isr_reference_15_pos(self): self.inv_values.update({ 'partner_id': self.partner.id, 'type': 'out_invoice' @@ -30,17 +30,17 @@ def test_emit_invoice_with_bvr_reference_15_pos(self): invoice = self.env['account.invoice'].new(self.inv_values) invoice._onchange_partner_id() self.assertEqual(invoice.partner_bank_id, self.bank_acc) - self.assertNotEqual(invoice.reference_type, 'bvr') + self.assertNotEqual(invoice.reference_type, 'isr') invoice.reference = '132000000000004' - invoice.reference_type = 'bvr' # set manually bvr reference type + invoice.reference_type = 'isr' # set manually ISR reference type # and save self.env['account.invoice'].create( invoice._convert_to_write(invoice._cache) ) - def test_emit_invoice_with_non_bvr_reference(self): + def test_emit_invoice_with_non_isr_reference(self): self.inv_values.update({ 'partner_id': self.partner.id, 'type': 'out_invoice' @@ -48,15 +48,15 @@ def test_emit_invoice_with_non_bvr_reference(self): invoice = self.env['account.invoice'].new(self.inv_values) invoice._onchange_partner_id() self.assertEqual(invoice.partner_bank_id, self.bank_acc) - self.assertNotEqual(invoice.reference_type, 'bvr') + self.assertNotEqual(invoice.reference_type, 'isr') - invoice.reference = 'Not a BVR ref with 27 chars' + invoice.reference = 'Not a ISR ref with 27 chars' invoice.onchange_reference() - self.assertNotEqual(invoice.reference_type, 'bvr') + self.assertNotEqual(invoice.reference_type, 'isr') - def test_emit_invoice_with_missing_bvr_reference(self): + def test_emit_invoice_with_missing_isr_reference(self): self.inv_values.update({ 'partner_id': self.partner.id, 'type': 'out_invoice', @@ -68,14 +68,14 @@ def test_emit_invoice_with_missing_bvr_reference(self): invoice._onchange_partner_id() invoice.reference = False - invoice.reference_type = 'bvr' # set manually bvr reference type + invoice.reference_type = 'isr' # set manually ISR reference type # and save self.env['account.invoice'].create( invoice._convert_to_write(invoice._cache) ) - def test_emit_invoice_with_bvr_reference_missing_ccp(self): + def test_emit_invoice_with_isr_reference_missing_ccp(self): self.inv_values.update({ 'partner_id': self.partner.id, 'type': 'out_invoice', @@ -90,7 +90,7 @@ def test_emit_invoice_with_bvr_reference_missing_ccp(self): invoice.reference = '132000000000000000000000014' invoice.onchange_reference() - invoice.reference_type = 'bvr' + invoice.reference_type = 'isr' self.env['account.invoice'].create( invoice._convert_to_write(invoice._cache) ) diff --git a/l10n_ch_base_bank/tests/test_search_invoice.py b/l10n_ch_base_bank/tests/test_search_invoice.py index ffaee24b8..63d013232 100644 --- a/l10n_ch_base_bank/tests/test_search_invoice.py +++ b/l10n_ch_base_bank/tests/test_search_invoice.py @@ -29,7 +29,7 @@ def assert_find_ref(self, reference, operator, value): values = { 'partner_id': self.partner.id, 'type': 'out_invoice', - 'reference_type': 'bvr', + 'reference_type': 'isr', 'reference': reference, } invoice = self.env['account.invoice'].create(values) @@ -42,7 +42,7 @@ def assert_not_find_ref(self, reference, operator, value): values = { 'partner_id': self.partner.id, 'type': 'out_invoice', - 'reference_type': 'bvr', + 'reference_type': 'isr', 'reference': reference, } self.env['account.invoice'].create(values) @@ -106,7 +106,7 @@ def test_search_other_field(self): values = { 'partner_id': self.partner.id, 'type': 'out_invoice', - 'reference_type': 'bvr', + 'reference_type': 'isr', 'reference': '27 29990 00000 00001 70400 25019', } invoice = self.env['account.invoice'].create(values) @@ -119,7 +119,7 @@ def test_search_unary_operator(self): values = { 'partner_id': self.partner.id, 'type': 'out_invoice', - 'reference_type': 'bvr', + 'reference_type': 'isr', 'reference': '27 29990 00000 00001 70400 25019', } invoice = self.env['account.invoice'].create(values) diff --git a/l10n_ch_base_bank/views/bank.xml b/l10n_ch_base_bank/views/bank.xml index f6d71751b..6174a1a89 100644 --- a/l10n_ch_base_bank/views/bank.xml +++ b/l10n_ch_base_bank/views/bank.xml @@ -56,7 +56,7 @@ - + diff --git a/l10n_ch_base_bank/views/invoice.xml b/l10n_ch_base_bank/views/invoice.xml index e2ab9a5c0..ea762b520 100644 --- a/l10n_ch_base_bank/views/invoice.xml +++ b/l10n_ch_base_bank/views/invoice.xml @@ -2,7 +2,7 @@ - + account.invoice.form.inherit account.invoice diff --git a/l10n_ch_payment_slip/README.rst b/l10n_ch_payment_slip/README.rst index f108c8bfe..7f3880a1c 100644 --- a/l10n_ch_payment_slip/README.rst +++ b/l10n_ch_payment_slip/README.rst @@ -2,14 +2,19 @@ :target: http://www.gnu.org/licenses/agpl :alt: License: AGPL-3 -=================================== -Swiss Payment slip known as ESR/BVR -=================================== +====================================== +Swiss inpayment slip (ISR/PVR/BVR/ESR) +====================================== -This addon allows you to print the ESR/BVR report Using Qweb report. +This addon allows you to print the ISR report Using Qweb report. -The ESR/BVR is grenerated as an image and is availabe in a fields +ISR is called: +- PVR in italian +- BVR in french +- ESR in german + +The ISR is grenerated as an image and is availabe in a fields of the `l10n_ch.payment_slip` Model. This module will also allow you to import v11 files provided @@ -17,30 +22,30 @@ by financial institute into a bank statement This module also adds transaction_ref field on entries in order to manage reconciliation in multi payment context (unique reference needed on -account.move.line). Many BVR can now be printed from on invoice for each +account.move.line). Many ISR can now be printed from on invoice for each payment terms. Configuration ============= -You can adjust the print out of ESR/BVR, which depend on each printer, -for every company in the "BVR Data" tab. +You can adjust the print out of ISR, which depend on each printer, +for every company in the "ISR Data" tab. This is especialy useful when using pre-printed paper. -Options also allow you to print the ESR/BVR in background when using +Options also allow you to print the ISR in background when using white paper and printing customer address in the page header. -By default address format on ESR/BVR is +By default address format on ISR is `%(street)s\n%(street2)s\n%(zip)s %(city)s` This can be change by setting System parameter -`bvr.address.format` +`isr.address.format` Usage ===== -The ESR/BVR is created each time an invoice is validated. +The ISR is created each time an invoice is validated. To modify it you have to cancel it and reconfirm the invoice. To import v11, use the wizard provided in bank statement. diff --git a/l10n_ch_payment_slip/__manifest__.py b/l10n_ch_payment_slip/__manifest__.py index ed7f923d2..ff77bee08 100644 --- a/l10n_ch_payment_slip/__manifest__.py +++ b/l10n_ch_payment_slip/__manifest__.py @@ -1,7 +1,7 @@ # Copyright 2012-2016 Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -{'name': 'Switzerland - Payment Slip (BVR/ESR)', - 'summary': 'Print ESR/BVR payment slip with your invoices', +{'name': 'Switzerland - ISR inpayment slip (PVR/BVR/ESR)', + 'summary': 'Print inpayment slip from your invoices', 'version': '11.0.1.0.0', 'author': "Camptocamp,Odoo Community Association (OCA)", 'category': 'Localization', @@ -16,13 +16,12 @@ "views/company.xml", "views/bank.xml", "views/account_invoice.xml", - "wizard/bvr_batch_print.xml", - "wizard/bvr_import_view.xml", + "wizard/isr_batch_print.xml", + "wizard/isr_import_view.xml", "report/report_declaration.xml", "security/ir.model.access.csv" ], 'demo': [], - 'test': [], 'auto_install': False, 'installable': True, 'images': [] diff --git a/l10n_ch_payment_slip/i18n/de.po b/l10n_ch_payment_slip/i18n/de.po index 943466b0b..25265c631 100644 --- a/l10n_ch_payment_slip/i18n/de.po +++ b/l10n_ch_payment_slip/i18n/de.po @@ -20,82 +20,82 @@ msgstr "" #. module: l10n_ch_payment_slip #: model:ir.ui.view,arch_db:l10n_ch_payment_slip.company_form_view -msgid "BVR Data" +msgid "ISR Data" msgstr "ESR-Daten" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_delta_horz -msgid "BVR Horz. Delta (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_delta_horz +msgid "ISR Horz. Delta (inch)" msgstr "ESR horiz. Differenz (Inch)" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_delta_vert -msgid "BVR Vert. Delta (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_delta_vert +msgid "ISR Vert. Delta (inch)" msgstr "ESR vert. Differenz (Inch)" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_add_horz -msgid "BVR horiz. position address (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_add_horz +msgid "ISR horiz. position address (inch)" msgstr "ESR horiz. Adressposition (Inch)" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_amount_line_horz -msgid "BVR horiz. position for amount line (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_amount_line_horz +msgid "ISR horiz. position for amount line (inch)" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_scan_line_horz -msgid "BVR horiz. position for scan line(inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_scan_line_horz +msgid "ISR horiz. position for scan line(inch)" msgstr "ESR horiz. Position der Scanzeile (Inch)" #. module: l10n_ch_payment_slip #: model:ir.ui.view,arch_db:l10n_ch_payment_slip.l10n_ch_view_res_partner_bank_from_invoice_slip -msgid "BVR options" +msgid "ISR options" msgstr "ESR Einstellungen" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_account_invoice_bvr_reference -msgid "BVR ref" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_account_invoice_isr_reference +msgid "ISR ref" msgstr "ESR Ref." #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_scan_line_font_size -msgid "BVR scan line font size (pt)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_scan_line_font_size +msgid "ISR scan line font size (pt)" msgstr "ESR Schriftgrösse der Kodierungszeile in pt" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_scan_line_letter_spacing -msgid "BVR scan line letter spacing" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_scan_line_letter_spacing +msgid "ISR scan line letter spacing" msgstr "ESR Scanzeile Zeichenabstand" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_add_vert -msgid "BVR vert. position for address (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_add_vert +msgid "ISR vert. position for address (inch)" msgstr "ESR vert. Adressposition (Inch)" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_amount_line_vert -msgid "BVR vert. position for amount line (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_amount_line_vert +msgid "ISR vert. position for amount line (inch)" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_scan_line_vert -msgid "BVR vert. position for scan line (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_scan_line_vert +msgid "ISR vert. position for scan line (inch)" msgstr "ESR vert. Position der Scanzeile (Inch)" #. module: l10n_ch_payment_slip -#: model:ir.ui.view,arch_db:l10n_ch_payment_slip.invoice_form_add_bvr_ref -msgid "BVR/ESR" +#: model:ir.ui.view,arch_db:l10n_ch_payment_slip.invoice_form_add_isr_ref +msgid "ISR" msgstr "ESR" #. module: l10n_ch_payment_slip #: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_l10n_ch_payment_slip_reference -msgid "BVR/ESR Ref." +msgid "ISR Ref." msgstr "ESR Ref." #. module: l10n_ch_payment_slip #: sql_constraint:l10n_ch.payment_slip:0 -msgid "BVR/ESR reference must be unique" +msgid "ISR reference must be unique" msgstr "ESR Referenz muss eindeutig sein" #. module: l10n_ch_payment_slip @@ -133,17 +133,17 @@ msgid "Display Name" msgstr "Anzeigename" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_add_horz +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_add_horz msgid "Horiz. position in inch for address" msgstr "Horiz. Adressposition (inch)" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_amount_line_horz +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_amount_line_horz msgid "Horiz. position in inch for amount line" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_scan_line_horz +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_scan_line_horz msgid "Horiz. position in inch for scan line" msgstr "Horiz. Position der Scanzeile (inch)" @@ -165,12 +165,12 @@ msgid "Import v11" msgstr "Import v11" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_background -msgid "Insert BVR background ?" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_background +msgid "Insert ISR background ?" msgstr "ESR Hintergrund einfügen?" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:196 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:196 #, python-format msgid "Inv. no %s" msgstr "Rg Nr. %s" @@ -225,13 +225,13 @@ msgid "No invoice related to move line %s" msgstr "Keine Rechnung bezieht sich auf Buchungszeile %s " #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:147 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:147 #, python-format msgid "Number of records differ from the computed one" msgstr "Zahl der Datensätze unterscheidet sich von der errechneten Anzahl" #. module: l10n_ch_payment_slip -#: model:ir.ui.view,arch_db:l10n_ch_payment_slip.invoice_form_add_bvr_ref +#: model:ir.ui.view,arch_db:l10n_ch_payment_slip.invoice_form_add_isr_ref msgid "Open Payment Slips" msgstr "Offene Einzahlungsscheine" @@ -266,34 +266,34 @@ msgid "Please enter a correct postal number like: 01-23456-1" msgstr "Bitte fügen Sie eine korrekte Postkontonummer ein: zB 01-23456-1" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:212 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:212 #, python-format msgid "Please select a file first!" msgstr "Bitte zuerst eine Datei auswählen!" #. module: l10n_ch_payment_slip #: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_partner_bank_print_account -msgid "Print Account Number on BVR" +msgid "Print Account Number on ISR" msgstr "Kontonummer auf ESR drucken" #. module: l10n_ch_payment_slip #: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_partner_bank_print_bank -msgid "Print Bank on BVR" +msgid "Print Bank on ISR" msgstr "Bank auf ESR drucken" #. module: l10n_ch_payment_slip #: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_partner_bank_print_partner -msgid "Print Partner Address on BVR" +msgid "Print Partner Address on ISR" msgstr "Partner-Adresse auf ESR drucken" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:143 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:143 #, python-format msgid "Record found after total record" msgstr "Weiteren Datensatz nach der Totalzeile gefunden " #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:112 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:112 #, python-format msgid "Recursive mod10 is invalid for reference: %s" msgstr "Rekursiver mod10 ist ungültig für Referenz: %s " @@ -336,7 +336,7 @@ msgstr "Einzahlungsschein Bild" #. module: l10n_ch_payment_slip #: code:addons/l10n_ch_payment_slip/models/invoice.py:152 #, python-format -msgid "The bank account {} used in invoice has no BVR/ESR adherent number." +msgid "The bank account {} used in invoice has no ISR adherent number." msgstr "" "Das in der Rechnung verwendete Bankkonto {} hat keine ESR-konforme Nummer." @@ -363,26 +363,26 @@ msgid "The invoice needs a partner bank account." msgstr "Die Rechnung muss ein Partner-Bankkonto definiert haben." #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:190 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:190 #, python-format msgid "Too many receivable/payable lines for reference %s" msgstr "Zu viele Debitoren-/Kreditoren-Zeilen für Referenz %s" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:138 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:138 #, python-format msgid "Too many total record found!" msgstr "Zuviele Total-Sätze gefunden!" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:53 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:53 #, python-format msgid "Total amount differ from the computed amount" msgstr "Gesamtbetrag unterscheidet sich vom errechneten Betrag" #. module: l10n_ch_payment_slip #: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_l10n_ch_payment_slip_amount_total -msgid "Total amount of BVR/ESR" +msgid "Total amount of ISR" msgstr "Gesamtbetrag des ESR" #. module: l10n_ch_payment_slip @@ -391,7 +391,7 @@ msgid "Total amount of V11" msgstr "Gesamtbetrag von V11" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:85 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:85 #, python-format msgid "Total cost differ from the computed amount" msgstr "Totalkosten unterscheiden sich vom errechneten Betrag" @@ -403,12 +403,12 @@ msgstr "Totalkosten von V11" #. module: l10n_ch_payment_slip #: model:ir.actions.act_window,name:l10n_ch_payment_slip.wizard_v11_import -msgid "V11 (BVR/ESR) Import" +msgid "V11 (ISR) Import" msgstr "V11 (ESR) Import" #. module: l10n_ch_payment_slip #: model:ir.ui.view,arch_db:l10n_ch_payment_slip.v11_import_view -msgid "V11 BVR/ESR Import" +msgid "V11 ISR Import" msgstr "V11 ESR-Import" #. module: l10n_ch_payment_slip @@ -417,24 +417,24 @@ msgid "V11 File" msgstr "V11 File" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:221 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:221 #, python-format msgid "V11 file can not be decoded, it contains invalid caracter %s" msgstr "" "V11-Datei kann nicht decodiert werden, sie enthält ungültige Zeichen %s" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_add_vert +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_add_vert msgid "Vert. position in inch for address" msgstr "Vert. Position in Inch für Adresse" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_amount_line_vert +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_amount_line_vert msgid "Vert. position in inch for amount line" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_scan_line_vert +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_scan_line_vert msgid "Vert. position in inch for scan line" msgstr "Vert. Position in Inch für Scan-Zeile" @@ -442,14 +442,14 @@ msgstr "Vert. Position in Inch für Scan-Zeile" #: code:addons/l10n_ch_payment_slip/models/payment_slip.py:348 #, python-format msgid "" -"Your bank BVR number should be of the form 0X-XXX-X! Please check your company information for the invoice:\n" +"Your bank ISR number should be of the form 0X-XXX-X! Please check your company information for the invoice:\n" "%s" msgstr "%s" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_delta_horz +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_delta_horz msgid "" -"horiz. delta in inch 1.2 will print the bvr 1.2 inch lefter, negative value " +"horiz. delta in inch 1.2 will print the ISR 1.2 inch lefter, negative value " "is possible" msgstr "" "Horiz. Differenz z.B. 1.2 inch, druckt den ESR 1.2 Inch weiter links, ein " @@ -481,9 +481,9 @@ msgid "v11.import.wizard" msgstr "v11.import.wizard" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_delta_vert +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_delta_vert msgid "" -"vert. delta in inch 1.2 will print the bvr 1.2 inch lower, negative value is" +"vert. delta in inch 1.2 will print the ISR 1.2 inch lower, negative value is" " possible" msgstr "" "Vertikale Differenz z.B. 1.2 Inch, druckt den ESR 1.2 Inch weiter unten, ein" diff --git a/l10n_ch_payment_slip/i18n/fr.po b/l10n_ch_payment_slip/i18n/fr.po index 76a8a6f40..9b2f17977 100644 --- a/l10n_ch_payment_slip/i18n/fr.po +++ b/l10n_ch_payment_slip/i18n/fr.po @@ -20,82 +20,82 @@ msgstr "" #. module: l10n_ch_payment_slip #: model:ir.ui.view,arch_db:l10n_ch_payment_slip.company_form_view -msgid "BVR Data" +msgid "ISR Data" msgstr "Données BVR" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_delta_horz -msgid "BVR Horz. Delta (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_delta_horz +msgid "ISR Horz. Delta (inch)" msgstr "Décalage horizontal global en pouces" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_delta_vert -msgid "BVR Vert. Delta (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_delta_vert +msgid "ISR Vert. Delta (inch)" msgstr "Décalage vertical global en pouces" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_add_horz -msgid "BVR horiz. position address (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_add_horz +msgid "ISR horiz. position address (inch)" msgstr "Décalage horizontal de l'adresse en pouces" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_amount_line_horz -msgid "BVR horiz. position for amount line (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_amount_line_horz +msgid "ISR horiz. position for amount line (inch)" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_scan_line_horz -msgid "BVR horiz. position for scan line(inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_scan_line_horz +msgid "ISR horiz. position for scan line(inch)" msgstr "Décalage horizontal de la scanline en pouces" #. module: l10n_ch_payment_slip #: model:ir.ui.view,arch_db:l10n_ch_payment_slip.l10n_ch_view_res_partner_bank_from_invoice_slip -msgid "BVR options" +msgid "ISR options" msgstr "Options BVR" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_account_invoice_bvr_reference -msgid "BVR ref" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_account_invoice_isr_reference +msgid "ISR ref" msgstr "Référence du BVR" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_scan_line_font_size -msgid "BVR scan line font size (pt)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_scan_line_font_size +msgid "ISR scan line font size (pt)" msgstr "Taille de la police de la scanline en points" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_scan_line_letter_spacing -msgid "BVR scan line letter spacing" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_scan_line_letter_spacing +msgid "ISR scan line letter spacing" msgstr "Espace entre les caractères de la scanline" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_add_vert -msgid "BVR vert. position for address (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_add_vert +msgid "ISR vert. position for address (inch)" msgstr "Décalage vertical de l'adresse en pouces" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_amount_line_vert -msgid "BVR vert. position for amount line (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_amount_line_vert +msgid "ISR vert. position for amount line (inch)" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_scan_line_vert -msgid "BVR vert. position for scan line (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_scan_line_vert +msgid "ISR vert. position for scan line (inch)" msgstr "Décalage vertical de la scanline en pouces" #. module: l10n_ch_payment_slip -#: model:ir.ui.view,arch_db:l10n_ch_payment_slip.invoice_form_add_bvr_ref -msgid "BVR/ESR" +#: model:ir.ui.view,arch_db:l10n_ch_payment_slip.invoice_form_add_isr_ref +msgid "ISR" msgstr "" #. module: l10n_ch_payment_slip #: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_l10n_ch_payment_slip_reference -msgid "BVR/ESR Ref." +msgid "ISR Ref." msgstr "Réf. BVR" #. module: l10n_ch_payment_slip #: sql_constraint:l10n_ch.payment_slip:0 -msgid "BVR/ESR reference must be unique" +msgid "ISR reference must be unique" msgstr "La référence BVR doit être unique" #. module: l10n_ch_payment_slip @@ -133,17 +133,17 @@ msgid "Display Name" msgstr "Nom affiché" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_add_horz +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_add_horz msgid "Horiz. position in inch for address" msgstr "Décalage horizontal de l'addresse en pouces" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_amount_line_horz +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_amount_line_horz msgid "Horiz. position in inch for amount line" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_scan_line_horz +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_scan_line_horz msgid "Horiz. position in inch for scan line" msgstr "Décalage horizontal de la scanline en pouces" @@ -165,12 +165,12 @@ msgid "Import v11" msgstr "Importer le fichier V11" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_background -msgid "Insert BVR background ?" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_background +msgid "Insert ISR background ?" msgstr "Insérer l'arrière-plan dans le BVR" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:196 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:196 #, python-format msgid "Inv. no %s" msgstr "Facture no. %s" @@ -223,13 +223,13 @@ msgid "No invoice related to move line %s" msgstr "Aucune facture liée à la ligne %s" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:147 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:147 #, python-format msgid "Number of records differ from the computed one" msgstr "Le nombre d'entrée diffère du nombre calculé" #. module: l10n_ch_payment_slip -#: model:ir.ui.view,arch_db:l10n_ch_payment_slip.invoice_form_add_bvr_ref +#: model:ir.ui.view,arch_db:l10n_ch_payment_slip.invoice_form_add_isr_ref msgid "Open Payment Slips" msgstr "BVR ouverts" @@ -264,34 +264,34 @@ msgid "Please enter a correct postal number like: 01-23456-1" msgstr "Veuillez saisir un CCP valide exemple: 01-23456-1" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:212 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:212 #, python-format msgid "Please select a file first!" msgstr "Veuillez choisir un fichier" #. module: l10n_ch_payment_slip #: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_partner_bank_print_account -msgid "Print Account Number on BVR" +msgid "Print Account Number on ISR" msgstr "Imprimer le CCP sur le BVR" #. module: l10n_ch_payment_slip #: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_partner_bank_print_bank -msgid "Print Bank on BVR" +msgid "Print Bank on ISR" msgstr "Imprimer la banque sur le BVR" #. module: l10n_ch_payment_slip #: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_partner_bank_print_partner -msgid "Print Partner Address on BVR" +msgid "Print Partner Address on ISR" msgstr "Imprimer l'adresse sur le BVR" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:143 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:143 #, python-format msgid "Record found after total record" msgstr "Enregistrement trouvé après la validation du total" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:112 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:112 #, python-format msgid "Recursive mod10 is invalid for reference: %s" msgstr "La référence %s est invalide" @@ -334,7 +334,7 @@ msgstr "" #. module: l10n_ch_payment_slip #: code:addons/l10n_ch_payment_slip/models/invoice.py:152 #, python-format -msgid "The bank account {} used in invoice has no BVR/ESR adherent number." +msgid "The bank account {} used in invoice has no ISR adherent number." msgstr "" #. module: l10n_ch_payment_slip @@ -358,19 +358,19 @@ msgid "The invoice needs a partner bank account." msgstr "" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:190 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:190 #, python-format msgid "Too many receivable/payable lines for reference %s" msgstr "Trop de lignes débiteurs & créditeurs pour la référence %s" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:138 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:138 #, python-format msgid "Too many total record found!" msgstr "Trop d'enregistrements trouvés" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:53 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:53 #, python-format msgid "Total amount differ from the computed amount" msgstr "Le montant total est différent du montant calculé" @@ -386,7 +386,7 @@ msgid "Total amount of V11" msgstr "Montant total du fichier v11" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:85 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:85 #, python-format msgid "Total cost differ from the computed amount" msgstr "Le coût total diffère du total calculé" @@ -398,12 +398,12 @@ msgstr "Coût total du fichier v11" #. module: l10n_ch_payment_slip #: model:ir.actions.act_window,name:l10n_ch_payment_slip.wizard_v11_import -msgid "V11 (BVR/ESR) Import" +msgid "V11 (ISR) Import" msgstr "Importer le fichier BVR (V11)" #. module: l10n_ch_payment_slip #: model:ir.ui.view,arch_db:l10n_ch_payment_slip.v11_import_view -msgid "V11 BVR/ESR Import" +msgid "V11 ISR Import" msgstr "Import du fichier BVR V11" #. module: l10n_ch_payment_slip @@ -412,7 +412,7 @@ msgid "V11 File" msgstr "Fichier V11" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:221 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:221 #, python-format msgid "V11 file can not be decoded, it contains invalid caracter %s" msgstr "" @@ -420,17 +420,17 @@ msgstr "" "%s." #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_add_vert +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_add_vert msgid "Vert. position in inch for address" msgstr "Décalage vertical de l'adresse en pouces" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_amount_line_vert +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_amount_line_vert msgid "Vert. position in inch for amount line" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_scan_line_vert +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_scan_line_vert msgid "Vert. position in inch for scan line" msgstr "Décalage vertical de la scanline en pouces" @@ -438,16 +438,16 @@ msgstr "Décalage vertical de la scanline en pouces" #: code:addons/l10n_ch_payment_slip/models/payment_slip.py:348 #, python-format msgid "" -"Your bank BVR number should be of the form 0X-XXX-X! Please check your company information for the invoice:\n" +"Your bank ISR number should be of the form 0X-XXX-X! Please check your company information for the invoice:\n" "%s" msgstr "" "Le CCP doit respecter le format suivant 0X-XXX-X pour la facture\n" "%s" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_delta_horz +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_delta_horz msgid "" -"horiz. delta in inch 1.2 will print the bvr 1.2 inch lefter, negative value " +"horiz. delta in inch 1.2 will print the ISR 1.2 inch lefter, negative value " "is possible" msgstr "Décalage global horizontal du BVR en pouces" @@ -477,8 +477,8 @@ msgid "v11.import.wizard" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_delta_vert +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_delta_vert msgid "" -"vert. delta in inch 1.2 will print the bvr 1.2 inch lower, negative value is" +"vert. delta in inch 1.2 will print the ISR 1.2 inch lower, negative value is" " possible" msgstr "Décalage global vertical du BVR en pouces" diff --git a/l10n_ch_payment_slip/i18n/it.po b/l10n_ch_payment_slip/i18n/it.po index 19a91ec70..677b76cd8 100644 --- a/l10n_ch_payment_slip/i18n/it.po +++ b/l10n_ch_payment_slip/i18n/it.po @@ -20,82 +20,82 @@ msgstr "" #. module: l10n_ch_payment_slip #: model:ir.ui.view,arch_db:l10n_ch_payment_slip.company_form_view -msgid "BVR Data" +msgid "ISR Data" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_delta_horz -msgid "BVR Horz. Delta (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_delta_horz +msgid "ISR Horz. Delta (inch)" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_delta_vert -msgid "BVR Vert. Delta (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_delta_vert +msgid "ISR Vert. Delta (inch)" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_add_horz -msgid "BVR horiz. position address (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_add_horz +msgid "ISR horiz. position address (inch)" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_amount_line_horz -msgid "BVR horiz. position for amount line (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_amount_line_horz +msgid "ISR horiz. position for amount line (inch)" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_scan_line_horz -msgid "BVR horiz. position for scan line(inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_scan_line_horz +msgid "ISR horiz. position for scan line(inch)" msgstr "" #. module: l10n_ch_payment_slip #: model:ir.ui.view,arch_db:l10n_ch_payment_slip.l10n_ch_view_res_partner_bank_from_invoice_slip -msgid "BVR options" +msgid "ISR options" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_account_invoice_bvr_reference -msgid "BVR ref" -msgstr "BVR ref" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_account_invoice_isr_reference +msgid "ISR ref" +msgstr "PVR ref" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_scan_line_font_size -msgid "BVR scan line font size (pt)" -msgstr "BVR scan line dimensione carattere (pt)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_scan_line_font_size +msgid "ISR scan line font size (pt)" +msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_scan_line_letter_spacing -msgid "BVR scan line letter spacing" -msgstr "BVR scan line distanza lettere" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_scan_line_letter_spacing +msgid "ISR scan line letter spacing" +msgstr "PVR scan line distanza lettere" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_add_vert -msgid "BVR vert. position for address (inch)" -msgstr "BVR posizione verticale indirizzo (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_add_vert +msgid "ISR vert. position for address (inch)" +msgstr "PVR posizione verticale indirizzo (inch)" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_amount_line_vert -msgid "BVR vert. position for amount line (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_amount_line_vert +msgid "ISR vert. position for amount line (inch)" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_scan_line_vert -msgid "BVR vert. position for scan line (inch)" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_scan_line_vert +msgid "ISR vert. position for scan line (inch)" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.ui.view,arch_db:l10n_ch_payment_slip.invoice_form_add_bvr_ref -msgid "BVR/ESR" +#: model:ir.ui.view,arch_db:l10n_ch_payment_slip.invoice_form_add_isr_ref +msgid "ISR" msgstr "" #. module: l10n_ch_payment_slip #: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_l10n_ch_payment_slip_reference -msgid "BVR/ESR Ref." +msgid "ISR Ref." msgstr "" #. module: l10n_ch_payment_slip #: sql_constraint:l10n_ch.payment_slip:0 -msgid "BVR/ESR reference must be unique" +msgid "ISR reference must be unique" msgstr "" #. module: l10n_ch_payment_slip @@ -133,17 +133,17 @@ msgid "Display Name" msgstr "Nome da visualizzare" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_add_horz +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_add_horz msgid "Horiz. position in inch for address" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_amount_line_horz +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_amount_line_horz msgid "Horiz. position in inch for amount line" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_scan_line_horz +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_scan_line_horz msgid "Horiz. position in inch for scan line" msgstr "" @@ -165,12 +165,12 @@ msgid "Import v11" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_bvr_background -msgid "Insert BVR background ?" +#: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_company_isr_background +msgid "Insert ISR background ?" msgstr "" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:196 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:196 #, python-format msgid "Inv. no %s" msgstr "Fatt. n. %s" @@ -221,13 +221,13 @@ msgid "No invoice related to move line %s" msgstr "" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:147 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:147 #, python-format msgid "Number of records differ from the computed one" msgstr "Numero di record diverso da quello calcolato" #. module: l10n_ch_payment_slip -#: model:ir.ui.view,arch_db:l10n_ch_payment_slip.invoice_form_add_bvr_ref +#: model:ir.ui.view,arch_db:l10n_ch_payment_slip.invoice_form_add_isr_ref msgid "Open Payment Slips" msgstr "" @@ -262,34 +262,34 @@ msgid "Please enter a correct postal number like: 01-23456-1" msgstr "Inserire un codice di conto postale corretto es. 01-23456-1" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:212 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:212 #, python-format msgid "Please select a file first!" msgstr "Bisogna prima selezionare un file" #. module: l10n_ch_payment_slip #: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_partner_bank_print_account -msgid "Print Account Number on BVR" +msgid "Print Account Number on ISR" msgstr "" #. module: l10n_ch_payment_slip #: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_partner_bank_print_bank -msgid "Print Bank on BVR" +msgid "Print Bank on ISR" msgstr "" #. module: l10n_ch_payment_slip #: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_res_partner_bank_print_partner -msgid "Print Partner Address on BVR" +msgid "Print Partner Address on ISR" msgstr "" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:143 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:143 #, python-format msgid "Record found after total record" msgstr "" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:112 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:112 #, python-format msgid "Recursive mod10 is invalid for reference: %s" msgstr "" @@ -332,7 +332,7 @@ msgstr "" #. module: l10n_ch_payment_slip #: code:addons/l10n_ch_payment_slip/models/invoice.py:152 #, python-format -msgid "The bank account {} used in invoice has no BVR/ESR adherent number." +msgid "The bank account {} used in invoice has no ISR adherent number." msgstr "" #. module: l10n_ch_payment_slip @@ -356,26 +356,26 @@ msgid "The invoice needs a partner bank account." msgstr "" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:190 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:190 #, python-format msgid "Too many receivable/payable lines for reference %s" msgstr "Troppi incassi / pagamenti riferiti a %s" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:138 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:138 #, python-format msgid "Too many total record found!" msgstr "Trovati troppi record." #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:53 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:53 #, python-format msgid "Total amount differ from the computed amount" msgstr "L'importo totale differisce da quello calcolato." #. module: l10n_ch_payment_slip #: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_l10n_ch_payment_slip_amount_total -msgid "Total amount of BVR/ESR" +msgid "Total amount of ISR" msgstr "" #. module: l10n_ch_payment_slip @@ -384,7 +384,7 @@ msgid "Total amount of V11" msgstr "Importo totale del V11" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:85 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:85 #, python-format msgid "Total cost differ from the computed amount" msgstr "Il totale differisce da quello calcolato" @@ -396,13 +396,13 @@ msgstr "Importo totale del V11" #. module: l10n_ch_payment_slip #: model:ir.actions.act_window,name:l10n_ch_payment_slip.wizard_v11_import -msgid "V11 (BVR/ESR) Import" -msgstr "V11 (BVR/ESR) Import" +msgid "V11 (ISR) Import" +msgstr "V11 (PVR) Import" #. module: l10n_ch_payment_slip #: model:ir.ui.view,arch_db:l10n_ch_payment_slip.v11_import_view -msgid "V11 BVR/ESR Import" -msgstr "V11 BVR/ ESR import" +msgid "V11 ISR Import" +msgstr "V11 PVR import" #. module: l10n_ch_payment_slip #: model:ir.model.fields,field_description:l10n_ch_payment_slip.field_v11_import_wizard_v11file @@ -410,24 +410,24 @@ msgid "V11 File" msgstr "V11 File" #. module: l10n_ch_payment_slip -#: code:addons/l10n_ch_payment_slip/wizard/bvr_import.py:221 +#: code:addons/l10n_ch_payment_slip/wizard/isr_import.py:221 #, python-format msgid "V11 file can not be decoded, it contains invalid caracter %s" msgstr "" "Il file V11 non può essere decodificato, contiene il carattere non valido %s" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_add_vert +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_add_vert msgid "Vert. position in inch for address" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_amount_line_vert +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_amount_line_vert msgid "Vert. position in inch for amount line" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_scan_line_vert +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_scan_line_vert msgid "Vert. position in inch for scan line" msgstr "" @@ -435,16 +435,16 @@ msgstr "" #: code:addons/l10n_ch_payment_slip/models/payment_slip.py:348 #, python-format msgid "" -"Your bank BVR number should be of the form 0X-XXX-X! Please check your company information for the invoice:\n" +"Your bank ISR number should be of the form 0X-XXX-X! Please check your company information for the invoice:\n" "%s" msgstr "" -"Il numero BVR della vostra banca deve essere nel formato 0X-XXX-X! Per favore controllate i vostri dati di fatturazione.\n" +"Il numero PVR della vostra banca deve essere nel formato 0X-XXX-X! Per favore controllate i vostri dati di fatturazione.\n" "%s" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_delta_horz +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_delta_horz msgid "" -"horiz. delta in inch 1.2 will print the bvr 1.2 inch lefter, negative value " +"horiz. delta in inch 1.2 will print the ISR 1.2 inch lefter, negative value " "is possible" msgstr "" @@ -474,8 +474,8 @@ msgid "v11.import.wizard" msgstr "" #. module: l10n_ch_payment_slip -#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_bvr_delta_vert +#: model:ir.model.fields,help:l10n_ch_payment_slip.field_res_company_isr_delta_vert msgid "" -"vert. delta in inch 1.2 will print the bvr 1.2 inch lower, negative value is" +"vert. delta in inch 1.2 will print the ISR 1.2 inch lower, negative value is" " possible" msgstr "" diff --git a/l10n_ch_payment_slip/models/bank.py b/l10n_ch_payment_slip/models/bank.py index 6ebd05680..4b59b7735 100644 --- a/l10n_ch_payment_slip/models/bank.py +++ b/l10n_ch_payment_slip/models/bank.py @@ -7,12 +7,12 @@ class ResPartnerBank(models.Model): """ Inherit res.partner.bank class in order to add swiss specific fields such as: - - BVR data - - BVR print options for company accounts + - ISR data + - ISR print options for company accounts We leave it here in order """ _inherit = "res.partner.bank" - print_bank = fields.Boolean('Print Bank on BVR') - print_account = fields.Boolean('Print Account Number on BVR') - print_partner = fields.Boolean('Print Partner Address on BVR') + print_bank = fields.Boolean('Print Bank on ISR') + print_account = fields.Boolean('Print Account Number on ISR') + print_partner = fields.Boolean('Print Partner Address on ISR') diff --git a/l10n_ch_payment_slip/models/company.py b/l10n_ch_payment_slip/models/company.py index 05aac67f2..cca922f01 100644 --- a/l10n_ch_payment_slip/models/company.py +++ b/l10n_ch_payment_slip/models/company.py @@ -4,58 +4,68 @@ class ResCompany(models.Model): - """override company in order to add bvr vertical and + """override company in order to add ISR vertical and Horizontal print delta""" _inherit = "res.company" - bvr_delta_horz = fields.Float( - 'BVR Horz. Delta (inch)', - help='horiz. delta in inch 1.2 will print the bvr 1.2 inch lefter, ' - 'negative value is possible' + isr_delta_horz = fields.Float( + 'ISR Horz. Delta (inch)', + oldname='bvr_delta_horz', + help='horiz. delta in inch 1.2 will print the ISR 1.2 inch lefter,' + ' negative value is possible' ) - bvr_delta_vert = fields.Float( - 'BVR Vert. Delta (inch)', - help='vert. delta in inch 1.2 will print the bvr 1.2 inch lower, ' - 'negative value is possible' + isr_delta_vert = fields.Float( + 'ISR Vert. Delta (inch)', + oldname='bvr_delta_vert', + help='vert. delta in inch 1.2 will print the ISR 1.2 inch lower,' + ' negative value is possible' ) - bvr_scan_line_vert = fields.Float( - 'BVR vert. position for scan line (inch)', + isr_scan_line_vert = fields.Float( + 'ISR vert. position for scan line (inch)', + oldname='bvr_scan_line_vert', help='Vert. position in inch for scan line' ) - bvr_scan_line_horz = fields.Float( - 'BVR horiz. position for scan line(inch)', + isr_scan_line_horz = fields.Float( + 'ISR horiz. position for scan line(inch)', + oldname='bvr_scan_line_horz', help='Horiz. position in inch for scan line' ) - bvr_add_vert = fields.Float( - 'BVR vert. position for address (inch)', + isr_add_vert = fields.Float( + 'ISR vert. position for address (inch)', + oldname='bvr_add_vert', help='Vert. position in inch for address' ) - bvr_add_horz = fields.Float( - 'BVR horiz. position address (inch)', + isr_add_horz = fields.Float( + 'ISR horiz. position address (inch)', + oldname='bvr_add_horz', help='Horiz. position in inch for address' ) - bvr_scan_line_font_size = fields.Integer( - 'BVR scan line font size (pt)' + isr_scan_line_font_size = fields.Integer( + 'ISR scan line font size (pt)', + oldname='bvr_scan_line_font_size', ) - bvr_scan_line_letter_spacing = fields.Float( - 'BVR scan line letter spacing' + isr_scan_line_letter_spacing = fields.Float( + 'ISR scan line letter spacing', + oldname='bvr_scan_line_letter_spacing', ) - bvr_amount_line_horz = fields.Float( - 'BVR horiz. position for amount line (inch)', + isr_amount_line_horz = fields.Float( + 'ISR horiz. position for amount line (inch)', + oldname='bvr_amount_line_horz', help='Horiz. position in inch for amount line', default=0.00 ) - bvr_amount_line_vert = fields.Float( - 'BVR vert. position for amount line (inch)', + isr_amount_line_vert = fields.Float( + 'ISR vert. position for amount line (inch)', + oldname='bvr_amount_line_vert', help='Vert. position in inch for amount line', default=0.00, ) @@ -67,10 +77,14 @@ class ResCompany(models.Model): required=True, default="in_memory" ) - bvr_background = fields.Boolean('Insert BVR background ?') + isr_background = fields.Boolean( + 'Insert ISR background ?', + oldname='bvr_background', + ) - bvr_header_partner_address = fields.Boolean( + isr_header_partner_address = fields.Boolean( 'Header partner address', + oldname='bvr_header_partner_address', default=False, help='Enabling this will print partner address top-right on the ' 'page header', diff --git a/l10n_ch_payment_slip/models/invoice.py b/l10n_ch_payment_slip/models/invoice.py index d2f923dfc..4ed4df11e 100644 --- a/l10n_ch_payment_slip/models/invoice.py +++ b/l10n_ch_payment_slip/models/invoice.py @@ -23,8 +23,8 @@ class AccountMoveLine(models.Model): class AccountInvoice(models.Model): - """Inherit account.invoice in order to add bvr - printing functionnalites. BVR is a Swiss payment vector""" + """Inherit account.invoice in order to add ISR + printing functionnalites. ISR is a Swiss payment vector""" _inherit = "account.invoice" @@ -37,9 +37,10 @@ class AccountInvoice(models.Model): 'Keep empty to use the default' ) - bvr_reference = fields.Text( - string='BVR ref', - compute='_compute_full_bvr_name', + isr_reference = fields.Text( + string='ISR ref', + compute='_compute_full_isr_name', + oldname='bvr_reference', store=True, ) @@ -50,7 +51,7 @@ class AccountInvoice(models.Model): ) @api.depends('slip_ids', 'state') - def _compute_full_bvr_name(self): + def _compute_full_isr_name(self): """Concatenate related slip references :return: reference comma separated @@ -60,7 +61,7 @@ def _compute_full_bvr_name(self): if (rec.state not in ('open', 'paid') or not rec.slip_ids): continue - rec.bvr_reference = ', '.join(x.reference + rec.isr_reference = ', '.join(x.reference for x in rec.slip_ids if x.reference) @@ -90,7 +91,7 @@ def _update_ref_on_account_analytic_line(self, ref, move_id): return True @api.model - def _action_bvr_number_move_line(self, move_line, ref): + def _action_isr_number_move_line(self, move_line, ref): """Propagate reference on move lines and analytic lines""" if not ref: return @@ -102,36 +103,36 @@ def _action_bvr_number_move_line(self, move_line, ref): @api.multi def invoice_validate(self): - """ Copy the BVR/ESR reference in the transaction_ref of move lines. + """ Copy the ISR reference in the transaction_ref of move lines. - For customers invoices: the BVR reference is computed using - ``get_bvr_ref()`` on the invoice or move lines. + For customers invoices: the ISR reference is computed using + ``get_isr_ref()`` on the invoice or move lines. - For suppliers invoices: the BVR reference is stored in the reference + For suppliers invoices: the ISR reference is stored in the reference field of the invoice. """ pay_slip = self.env['l10n_ch.payment_slip'] for inv in self: if inv.type in ('in_invoice', 'in_refund'): - if inv.reference_type == 'bvr' and inv._check_bvr(): + if inv.reference_type == 'isr' and inv._check_isr(): ref = inv.reference else: ref = False move_lines = inv.get_payment_move_line() for move_line_id in move_lines: - self._action_bvr_number_move_line(move_line_id, + self._action_isr_number_move_line(move_line_id, ref) else: for pay_slip in pay_slip._compute_pay_slips_from_invoices(inv): ref = pay_slip.reference - self._action_bvr_number_move_line(pay_slip.move_line_id, + self._action_isr_number_move_line(pay_slip.move_line_id, ref) return super(AccountInvoice, self).invoice_validate() @api.multi - def print_bvr(self): - self._check_bvr_generatable() + def print_isr(self): + self._check_isr_generatable() self.write({ 'sent': True }) @@ -143,7 +144,7 @@ def print_bvr(self): return act_report.report_action(docids) @api.multi - def _check_bvr_generatable(self): + def _check_isr_generatable(self): errors = [] for inv in self: msg = [] @@ -153,10 +154,10 @@ def _check_bvr_generatable(self): if not bank_acc: msg.append(_('- The invoice needs a partner bank account.')) else: - if not bank_acc.bvr_adherent_num: + if not bank_acc.isr_adherent_num: msg.append( - _('- The bank account {} used in invoice has no ' - 'BVR/ESR adherent number.' + _('- The bank account {} used in invoice has no' + ' ISR adherent number.' ).format(bank_acc.acc_number)) if not (bank_acc.acc_type == 'postal' or bank_acc.ccp): msg.append( diff --git a/l10n_ch_payment_slip/models/payment_slip.py b/l10n_ch_payment_slip/models/payment_slip.py index d53de3b96..962b3597a 100644 --- a/l10n_ch_payment_slip/models/payment_slip.py +++ b/l10n_ch_payment_slip/models/payment_slip.py @@ -51,12 +51,12 @@ class PaymentSlip(models.Model): _default_scan_font_size = 11 _default_amount_font_size = 16 _compile_get_ref = re.compile(r'[^0-9]') - _compile_check_bvr = re.compile(r'[0-9][0-9]-[0-9]{3,6}-[0-9]') + _compile_check_isr = re.compile(r'[0-9][0-9]-[0-9]{3,6}-[0-9]') _name = 'l10n_ch.payment_slip' _rec_name = 'reference' - reference = fields.Char('BVR/ESR Ref.', + reference = fields.Char('ISR Ref.', compute='_compute_ref', index=True, store=True) @@ -66,7 +66,7 @@ class PaymentSlip(models.Model): readonly=True, ondelete='cascade') - amount_total = fields.Float('Total amount of BVR/ESR', + amount_total = fields.Float('Total amount of ISR', compute='_compute_amount') scan_line = fields.Char('Scan Line', @@ -89,7 +89,7 @@ class PaymentSlip(models.Model): _sql_constraints = [('unique reference', 'UNIQUE (reference)', - 'BVR/ESR reference must be unique')] + 'ISR reference must be unique')] @api.model def _can_generate(self, move_line): @@ -105,7 +105,7 @@ def _can_generate(self, move_line): if not invoice: return False return (invoice.partner_bank_id and - invoice.partner_bank_id.bvr_adherent_num and + invoice.partner_bank_id.isr_adherent_num and ( invoice.partner_bank_id.acc_type == 'postal' or invoice.partner_bank_id.ccp @@ -120,8 +120,8 @@ def _get_adherent_number(self): self.ensure_one() move_line = self.move_line_id ad_number = '' - if move_line.invoice_id.partner_bank_id.bvr_adherent_num: - ad_number = move_line.invoice_id.partner_bank_id.bvr_adherent_num + if move_line.invoice_id.partner_bank_id.isr_adherent_num: + ad_number = move_line.invoice_id.partner_bank_id.isr_adherent_num return ad_number def _compute_amount_hook(self): @@ -152,9 +152,9 @@ def _compute_amount(self): @api.depends('move_line_id', 'move_line_id.invoice_id.number') def _compute_ref(self): - """Retrieve ESR/BVR reference from move line in order to print it + """Retrieve ISR reference from move line in order to print it - Returns False when no BVR reference should be generated. No + Returns False when no ISR reference should be generated. No reference is generated when a transaction reference already exists for the line (likely been generated by a payment service). """ @@ -340,10 +340,10 @@ def _validate(self): _('No invoice related to move line %s' ) % rec.move_line_id.ref ) - if not rec._compile_check_bvr.match( + if not rec._compile_check_isr.match( invoice.partner_bank_id.get_account_number() or ''): raise exceptions.ValidationError( - _('Your bank BVR number should be of the form 0X-XXX-X! ' + _('Your bank ISR number should be of the form 0X-XXX-X! ' 'Please check your company ' 'information for the invoice:\n%s') % (invoice.name) ) @@ -435,21 +435,21 @@ def _get_scan_line_text_font(self, print_settings): font_identifier = 'ocrb_font' # pdfmetrics.registerFont(TTFont(font_identifier, # self.font_absolute_path())) - size = (print_settings.bvr_scan_line_font_size or + size = (print_settings.isr_scan_line_font_size or self._default_scan_font_size) return FontMeta(name=font_identifier, size=size) @api.model def _get_address_lines(self, com_partner): - bvr_address_format = ( - self.env['ir.config_parameter'].get_param('bvr.address.format') or + isr_address_format = ( + self.env['ir.config_parameter'].get_param('isr.address.format') or ADDR_FORMAT) # use onchange to define our own temporary address format with self.env.do_in_onchange(): # assign a fake country in case partner has no country set com_partner.country_id = self.env['res.country'].new( - {'address_format': bvr_address_format} + {'address_format': isr_address_format} ) address_lines = com_partner._display_address( without_company=True).split("\n") @@ -490,7 +490,7 @@ def _draw_address(self, canvas, print_settings, initial_position, font, """Draw an address on canvas Address format can be changed by adding system parameter - `bvr.address.format`. + `isr.address.format`. :param canvas: payment slip reportlab component to be drawn :type canvas: :py:class:`reportlab.pdfgen.canvas.Canvas` @@ -514,8 +514,8 @@ def _draw_address(self, canvas, print_settings, initial_position, font, font.size, address_lines, com_partner) x, y = initial_position - x += print_settings.bvr_add_horz * inch - y += print_settings.bvr_add_vert * inch + x += print_settings.isr_add_horz * inch + y += print_settings.isr_add_vert * inch text = canvas.beginText() text.setTextOrigin(x, y) text.setFont(font.name, font_size) @@ -549,7 +549,7 @@ def _draw_description_line(self, canvas, print_settings, initial_position, """ x, y = initial_position # align with the address - x += print_settings.bvr_add_horz * inch + x += print_settings.isr_add_horz * inch invoice = self.move_line_id.invoice_id date_maturity = self.move_line_id.date_maturity message = _('Payment slip related to invoice %s ' @@ -580,8 +580,8 @@ def _draw_bank(self, canvas, print_settings, initial_position, font, bank): """ x, y = initial_position - x += print_settings.bvr_delta_horz * inch - y += print_settings.bvr_delta_vert * inch + x += print_settings.isr_delta_horz * inch + y += print_settings.isr_delta_vert * inch text = canvas.beginText() text.setTextOrigin(x, y) text.setFont(font.name, font.size) @@ -623,8 +623,8 @@ def _draw_bank_account(self, canvas, print_settings, initial_position, """ x, y = initial_position - x += print_settings.bvr_delta_horz * inch - y += print_settings.bvr_delta_vert * inch + x += print_settings.isr_delta_horz * inch + y += print_settings.isr_delta_vert * inch canvas.setFont(font.name, font.size) canvas.drawString(x, y, acc) @@ -649,8 +649,8 @@ def _draw_ref(self, canvas, print_settings, initial_position, font, ref): """ x, y = initial_position - x += print_settings.bvr_delta_horz * inch - y += print_settings.bvr_delta_vert * inch + x += print_settings.isr_delta_horz * inch + y += print_settings.isr_delta_vert * inch canvas.setFont(font.name, font.size) canvas.drawString(x, y, ref) @@ -676,8 +676,8 @@ def _draw_recipe_ref(self, canvas, print_settings, initial_position, """ x, y = initial_position - x += print_settings.bvr_add_horz * inch - y += print_settings.bvr_add_vert * inch + x += print_settings.isr_add_horz * inch + y += print_settings.isr_add_vert * inch canvas.setFont(font.name, font.size) canvas.drawString(x, y, ref) @@ -703,10 +703,10 @@ def _draw_amount(self, canvas, print_settings, initial_position, """ x, y = initial_position - x += (print_settings.bvr_delta_horz * inch + - print_settings.bvr_amount_line_horz * inch) - y += (print_settings.bvr_delta_vert * inch + - print_settings.bvr_amount_line_vert * inch) + x += (print_settings.isr_delta_horz * inch + + print_settings.isr_amount_line_horz * inch) + y += (print_settings.isr_delta_vert * inch + + print_settings.isr_amount_line_vert * inch) indice = 0 canvas.setFont(font.name, font.size) for car in amount[::-1]: @@ -737,8 +737,8 @@ def _draw_scan_line(self, canvas, print_settings, initial_position, font): """ x, y = initial_position - x += print_settings.bvr_scan_line_horz * inch - y += print_settings.bvr_scan_line_vert * inch + x += print_settings.isr_scan_line_horz * inch + y += print_settings.isr_scan_line_vert * inch canvas.setFont(font.name, font.size) for car in self._compute_scan_line_list()[::-1]: canvas.drawString(x, y, car) @@ -756,8 +756,8 @@ def _draw_background(self, canvas, print_settings): :type print_settings: :py:class:`PaymentSlipSettings` or subclass """ - if print_settings.bvr_background: - canvas.drawImage(self.image_absolute_path('bvr.png'), + if print_settings.isr_background: + canvas.drawImage(self.image_absolute_path('isr.png'), 0, 0, 8.271 * inch, 4.174 * inch) @api.model @@ -770,7 +770,7 @@ def _get_settings(self, report_name): company = self.env.user.company_id company_settings = { col: getattr(company, col) for col in company._fields if - col.startswith('bvr_') + col.startswith('isr_') } return PaymentSlipSettings(report_name, **company_settings) @@ -826,14 +826,14 @@ def _draw_payment_slip(self, a4=False, out_format='PDF', scale=None, default_font) if invoice.partner_bank_id.print_partner: if (invoice.partner_bank_id.print_account or - invoice.partner_bank_id.bvr_adherent_num): + invoice.partner_bank_id.isr_adherent_num): initial_position = (0.05 * inch, 3.30 * inch) else: initial_position = (0.05 * inch, 3.75 * inch) self._draw_address(canvas, print_settings, initial_position, default_font, company.partner_id) if (invoice.partner_bank_id.print_account or - invoice.partner_bank_id.bvr_adherent_num): + invoice.partner_bank_id.isr_adherent_num): initial_position = (2.45 * inch, 3.30 * inch) else: initial_position = (2.45 * inch, 3.75 * inch) @@ -882,7 +882,7 @@ def _draw_payment_slip(self, a4=False, out_format='PDF', scale=None, default_font, bank_acc.get_account_number()) - if print_settings.bvr_header_partner_address: + if print_settings.isr_header_partner_address: self._draw_address(canvas, print_settings, (4.9 * inch, 9.0 * inch), default_font, com_partner) diff --git a/l10n_ch_payment_slip/report/report.py b/l10n_ch_payment_slip/report/report.py index 34be9c7bf..ed3fa7c16 100644 --- a/l10n_ch_payment_slip/report/report.py +++ b/l10n_ch_payment_slip/report/report.py @@ -3,5 +3,5 @@ from odoo import models, api -class BVRFromInvoice(models.AbstractModel): +class ISRFromInvoice(models.AbstractModel): _name = 'report.one_slip_per_page_from_invoice' diff --git a/l10n_ch_payment_slip/tests/test_payment_slip.py b/l10n_ch_payment_slip/tests/test_payment_slip.py index b9bf97e28..3384e5ee9 100644 --- a/l10n_ch_payment_slip/tests/test_payment_slip.py +++ b/l10n_ch_payment_slip/tests/test_payment_slip.py @@ -33,7 +33,7 @@ def make_bank(self): 'bank_id': bank.id, 'bank_bic': bank.bic, 'acc_number': '01-1234-1', - 'bvr_adherent_num': '1234567', + 'isr_adherent_num': '1234567', 'print_bank': True, 'print_account': True, 'print_partner': True, @@ -192,7 +192,7 @@ def test_address_format_special_format(self): ICP = self.env['ir.config_parameter'] ICP.set_param( - 'bvr.address.format', + 'isr.address.format', "%(street)s\n%(zip)s %(city)s" ) invoice = self.make_invoice() @@ -237,10 +237,10 @@ def test_address_length(self): self.assertEqual(res, result, "Wrong result for len %s" % text_len) - def test_print_bvr(self): + def test_print_isr(self): invoice = self.make_invoice() - bvr = invoice.print_bvr() - self.assertEqual(bvr['report_name'], + isr = invoice.print_isr() + self.assertEqual(isr['report_name'], 'l10n_ch_payment_slip.one_slip_per_page_from_invoice') - self.assertEqual(bvr['report_file'], + self.assertEqual(isr['report_file'], 'l10n_ch_payment_slip.one_slip_per_page') diff --git a/l10n_ch_payment_slip/views/account_invoice.xml b/l10n_ch_payment_slip/views/account_invoice.xml index 5c3ea1a44..2d482a38f 100644 --- a/l10n_ch_payment_slip/views/account_invoice.xml +++ b/l10n_ch_payment_slip/views/account_invoice.xml @@ -8,33 +8,33 @@ [('invoice_id', '=', active_id)] - - account.invoice.form.bvr.ref + + account.invoice.form.isr.ref account.invoice form