diff --git a/addons/l10n_ch_qriban/__init__.py b/addons/l10n_ch_qriban/__init__.py
new file mode 100644
index 00000000000..dc5e6b693d1
--- /dev/null
+++ b/addons/l10n_ch_qriban/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import models
diff --git a/addons/l10n_ch_qriban/__manifest__.py b/addons/l10n_ch_qriban/__manifest__.py
new file mode 100644
index 00000000000..1c248869d2a
--- /dev/null
+++ b/addons/l10n_ch_qriban/__manifest__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+{
+ 'name': "Switzerland - QR-IBAN",
+ 'description': """
+Swiss localization
+==================
+Added a QR-IBAN field on bank account.
+If this field is empty, but the bank account number itself is a valid QR-IBAN number, it will still be used as QR-IBAN as before.
+But if you fill in the new QR-IBAN field, that one will be used as the QR-IBAN. This should help for reconciliation as
+on the bank statements, the old IBAN code is still used.
+ """,
+ 'version': '1.0',
+ 'author': 'Odoo S.A',
+ 'category': 'Localization',
+ 'depends': ['l10n_ch'],
+ 'data': [
+ 'views/res_bank_views.xml',
+ 'views/swissqr_report.xml',
+ ],
+ 'auto_install': True,
+}
diff --git a/addons/l10n_ch_qriban/i18n/l10n_ch_qriban.pot b/addons/l10n_ch_qriban/i18n/l10n_ch_qriban.pot
new file mode 100644
index 00000000000..e33209ddb1c
--- /dev/null
+++ b/addons/l10n_ch_qriban/i18n/l10n_ch_qriban.pot
@@ -0,0 +1,42 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * l10n_ch_qriban
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 13.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-09-02 11:41+0000\n"
+"PO-Revision-Date: 2020-09-02 11:41+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_ch_qriban
+#: model:ir.model,name:l10n_ch_qriban.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: l10n_ch_qriban
+#: model:ir.model.fields,help:l10n_ch_qriban.field_account_setup_bank_manual_config__l10n_ch_qr_iban
+#: model:ir.model.fields,help:l10n_ch_qriban.field_res_partner_bank__l10n_ch_qr_iban
+msgid ""
+"Put the QR-IBAN here for your own bank accounts. That way, you can still "
+"use the main IBAN in the Account Number while you will see the QR-IBAN for "
+"the barcode. "
+msgstr ""
+
+#. module: l10n_ch_qriban
+#: model:ir.model.fields,field_description:l10n_ch_qriban.field_account_setup_bank_manual_config__l10n_ch_qr_iban
+#: model:ir.model.fields,field_description:l10n_ch_qriban.field_res_partner_bank__l10n_ch_qr_iban
+msgid "QR-IBAN"
+msgstr ""
+
+#. module: l10n_ch_qriban
+#: code:addons/l10n_ch_qriban/models/res_bank.py:0
+#, python-format
+msgid "QR-IBAN '%s' is invalid."
+msgstr ""
diff --git a/addons/l10n_ch_qriban/models/__init__.py b/addons/l10n_ch_qriban/models/__init__.py
new file mode 100644
index 00000000000..e7a0951c8f2
--- /dev/null
+++ b/addons/l10n_ch_qriban/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import res_bank
diff --git a/addons/l10n_ch_qriban/models/res_bank.py b/addons/l10n_ch_qriban/models/res_bank.py
new file mode 100644
index 00000000000..d88750efd63
--- /dev/null
+++ b/addons/l10n_ch_qriban/models/res_bank.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo.addons.base_iban.models.res_partner_bank import normalize_iban, pretty_iban, validate_iban
+from odoo.addons.base.models.res_bank import sanitize_account_number
+from odoo.exceptions import ValidationError
+
+class ResPartnerBank(models.Model):
+ _inherit = 'res.partner.bank'
+
+ l10n_ch_qr_iban = fields.Char(string='QR-IBAN', help="Put the QR-IBAN here for your own bank accounts. That way, you can "
+ "still use the main IBAN in the Account Number while you will see the "
+ "QR-IBAN for the barcode. ")
+
+ def _validate_qr_iban(self, qr_iban):
+ # Check first if it's a valid IBAN.
+ validate_iban(qr_iban)
+ # We sanitize first so that _check_qr_iban_range() can extract correct IID from IBAN to validate it.
+ sanitized_qr_iban = sanitize_account_number(qr_iban)
+ # Now, check if it's valid QR-IBAN (based on its IID).
+ if not self._check_qr_iban_range(sanitized_qr_iban):
+ raise ValidationError(_("QR-IBAN '%s' is invalid.") % qr_iban)
+ return True
+
+ @api.model
+ def create(self, vals):
+ if vals.get('l10n_ch_qr_iban'):
+ self._validate_qr_iban(vals['l10n_ch_qr_iban'])
+ vals['l10n_ch_qr_iban'] = pretty_iban(normalize_iban(vals['l10n_ch_qr_iban']))
+ return super().create(vals)
+
+ def write(self, vals):
+ if vals.get('l10n_ch_qr_iban'):
+ self._validate_qr_iban(vals['l10n_ch_qr_iban'])
+ vals['l10n_ch_qr_iban'] = pretty_iban(normalize_iban(vals['l10n_ch_qr_iban']))
+ return super().write(vals)
+
+ def _is_qr_iban(self):
+ return super()._is_qr_iban() or self.l10n_ch_qr_iban
+
+ def _l10n_ch_get_qr_vals(self, amount, currency, debtor_partner, free_communication, structured_communication):
+ qr_vals = super()._l10n_ch_get_qr_vals(amount, currency, debtor_partner, free_communication, structured_communication)
+ # If there is a QR IBAN we use it for the barcode instead of the account number
+ if self.l10n_ch_qr_iban:
+ qr_vals[3] = sanitize_account_number(self.l10n_ch_qr_iban)
+ return qr_vals
diff --git a/addons/l10n_ch_qriban/views/res_bank_views.xml b/addons/l10n_ch_qriban/views/res_bank_views.xml
new file mode 100644
index 00000000000..b343785ba90
--- /dev/null
+++ b/addons/l10n_ch_qriban/views/res_bank_views.xml
@@ -0,0 +1,25 @@
+
+
+
+ l10n_ch_qr.res.partner.bank.form
+ res.partner.bank
+
+
+
+
+
+
+
+
+
+
+ account.setup.bank.manual.config.form.ch.qr.inherit
+ account.setup.bank.manual.config
+
+
+
+
+
+
+
+
diff --git a/addons/l10n_ch_qriban/views/swissqr_report.xml b/addons/l10n_ch_qriban/views/swissqr_report.xml
new file mode 100644
index 00000000000..ab43eafbc3c
--- /dev/null
+++ b/addons/l10n_ch_qriban/views/swissqr_report.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+