Rename BVR and BVR/ESR to ISR in english and make it the base term

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
 ------------------

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

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"

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é"

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 ""

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 !')]