[ADD] Improved module base_bank_account_number_unique.

account_bank_statement_import/parserlib.py

@@ -1,28 +1,22 @@
 # -*- coding: utf-8 -*-
 """Classes and definitions used in parsing bank statements."""
-##############################################################################
-#
-#  Copyright (C) 2015 Therp BV <http://therp.nl>.
-#
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU Affero General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU Affero General Public License for more details.
-#
-#  You should have received a copy of the GNU Affero General Public License
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# © 2015-2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 
 class BankTransaction(dict):
     """Single transaction that is part of a bank statement."""
 
+    @property
+    def transaction_id(self):
+        """property getter"""
+        return self['transaction_id']
+
+    @transaction_id.setter
+    def transaction_id(self, transaction_id):
+        """property setter"""
+        self['transaction_id'] = transaction_id
+
     @property
     def value_date(self):
         """property getter"""
@@ -112,6 +106,7 @@ class BankTransaction(dict):
         Not all attributes are already used in the actual import.
         """
         super(BankTransaction, self).__init__()
+        self.transaction_id = ''  # Fill this only if unique for import
         self.transfer_type = False  # Action type that initiated this message
         self.execution_date = False  # The posted date of the action
         self.value_date = False  # The value date of the action
@@ -152,8 +147,15 @@ class BankStatement(dict):
         subno = 0
         for transaction in self['transactions']:
             subno += 1
-            transaction['unique_import_id'] = (
-                self.statement_id + str(subno).zfill(4))
+            if transaction.transaction_id:
+                transaction['unique_import_id'] = transaction.transaction_id
+            else:
+                # Cut local_account from prefix if applicable:
+                if self.statement_id.startswith(self.local_account):
+                    prefix = self.statement_id[len(self.local_account):]
+                else:
+                    prefix = self.statement_id
+                transaction['unique_import_id'] = prefix + str(subno).zfill(4)
 
     @statement_id.setter
     def statement_id(self, statement_id):

account_bank_statement_import_mt940_nl_ing/mt940.py

@@ -1,23 +1,7 @@
 # -*- coding: utf-8 -*-
 """Implement BankStatementParser for MT940 IBAN ING files."""
-##############################################################################
-#
-#    Copyright (C) 2014-2015 Therp BV <http://therp.nl>.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published
-#    by the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# © 2014-2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 import re
 from openerp.addons.account_bank_statement_import_mt940_base.mt940 import (
     MT940, str2amount, get_subfields, handle_common_subfields)
@@ -48,7 +32,7 @@ class MT940Parser(MT940):
         self.current_transaction.transferred_amount = (
             str2amount(parsed_data['sign'], parsed_data['amount']))
         self.current_transaction.eref = parsed_data['reference']
-        self.current_transaction.id = parsed_data['ingid']
+        self.current_transaction.transaction_id = parsed_data['ingid']
 
     def handle_tag_86(self, data):
         """Parse 86 tag containing reference data."""

base_bank_account_number_unique/README.rst

@@ -8,36 +8,45 @@ It can be desirable to be able to rely on a bank account number identifying
 exactly one partner. This module allows you to enforce this, so that an
 account number is unique in the system.
 
-Installation
-============
+There are some valid corner cases were it is valid to have multiple records
+for the same account number. For instance in a multicompany setup where the
+bank-account linked to one company, is a partner bank account for another
+company.
 
-During installation, the module checks if your bank account numbers are
-unique already. If this is not the case, you won't be able to install the
-module until duplicates are fixed.
+Because of these corner cases, the constraint is no longer implemented as
+a SQL unique index. This has the added advantage, that the module can be
+installed on databases where the bank-account numbers are not unique already.
 
-The error message only shows the first few duplicates, in order to find all
-of them, use the following statement::
+To find records that are not unique, you could use the following SQL
+statement.
 
     with res_partner_bank_sanitized as (
         select
-            id, acc_number,
-            regexp_replace(acc_number, '\W+', '', 'g') acc_number_sanitized
+            id, acc_number, coalesce(company_id, 0) as company_id,
+            sanitized_acc_number
         from res_partner_bank
     ),
     res_partner_bank_sanitized_grouped as (
         select
-            array_agg(id) ids, acc_number_sanitized, count(*) amount
-        from res_partner_bank_sanitized group by acc_number_sanitized
+            array_agg(id) ids, sanitized_acc_number, count(*) kount,
+            company_id
+        from res_partner_bank_sanitized
+        group by sanitized_acc_number, company_id
     )
-    select * from res_partner_bank_sanitized_grouped where amount > 1;
+    select * from res_partner_bank_sanitized_grouped where kount > 1;
+
+Installation
+============
+
+The constraint is active for new and changed numbers, from the moment of
+installation.
+
 
 Bug Tracker
 ===========
 
-Bugs are tracked on `GitHub Issues <https://github.com/OCA/bank-statement-import/issues>`_.
-In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed feedback
-`here <https://github.com/OCA/bank-statement-import/issues/new?body=module:%20base_bank_account_number_unique%0Aversion:%208.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+Bugs are tracked on
+`GitHub Issues <https://github.com/OCA/bank-statement-import/issues>`_.
 
 Credits
 =======
@@ -46,6 +55,7 @@ Contributors
 ------------
 
 * Holger Brunn <hbrunn@therp.nl>
+* Ronald Portier <ronald@therp.nl>
 
 Maintainer
 ----------

base_bank_account_number_unique/__init__.py

@@ -1,21 +1,4 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    This module copyright (C) 2015 Therp BV <http://therp.nl>.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# © 2015-2017 Therp BV <https://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from . import models
-from .hooks import post_init_hook

base_bank_account_number_unique/__openerp__.py

@@ -1,25 +1,9 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2015 Therp BV <http://therp.nl>.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# © 2015-2017 Therp BV <https://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     'name': 'Unique bank account numbers',
-    'version': '8.0.1.0.1',
+    'version': '8.0.1.1.0',
     'author': 'Therp BV, Odoo Community Association (OCA)',
     'license': 'AGPL-3',
     'category': 'Banking addons',
@@ -27,7 +11,6 @@
     'depends': [
         'account_bank_statement_import',
     ],
-    'post_init_hook': 'post_init_hook',
     'auto_install': False,
     'installable': True,
 }

base_bank_account_number_unique/hooks.py

@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    This module copyright (C) 2015 Therp BV <http://therp.nl>.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from openerp import _, SUPERUSER_ID
-from openerp.exceptions import Warning as UserError
-
-
-def post_init_hook(cr, pool):
-    """check if your constraint was actually inserted, raise otherwise"""
-    if not pool['ir.model.constraint'].search(cr, SUPERUSER_ID, [
-        ('name', '=', 'res_partner_bank_unique_number'),
-        ('model.model', '=', 'res.partner.bank'),
-    ]):
-        max_account_numbers = 10
-        cr.execute(
-            """
-            with
-            res_partner_bank_sanitized as
-            (select id, acc_number, regexp_replace(acc_number, '\\W+', '', 'g')
-             acc_number_sanitized from res_partner_bank),
-            res_partner_bank_sanitized_grouped as
-            (select array_agg(id) ids, acc_number_sanitized, count(*) amount
-             from res_partner_bank_sanitized group by acc_number_sanitized)
-            select acc_number_sanitized from res_partner_bank_sanitized_grouped
-            where amount > 1 limit %s;
-            """,
-            (max_account_numbers,))
-        duplicates = [acc_number for acc_number, in cr.fetchall()]
-        message = _(
-            "Module installation can't proceed as you have duplicate "
-            "account numbers in your system already. Please clean that up "
-            "and try again.\n"
-            "The following shows the first %d duplicate account numbers\n"
-            "%s\n"
-            "(if you see less than %d, those are the only duplicates)") % (
-                max_account_numbers, '\n'.join(duplicates),
-                max_account_numbers,
-        )
-        raise UserError(message)

base_bank_account_number_unique/models/__init__.py

@@ -1,20 +1,4 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    This module copyright (C) 2015 Therp BV <http://therp.nl>.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# © 2015-2017 Therp BV <https://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from . import res_partner_bank

base_bank_account_number_unique/models/res_partner_bank.py

@@ -1,39 +1,40 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    This module copyright (C) 2015 Therp BV (<http://therp.nl>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from openerp import models
+# © 2015-2017 Therp BV <https://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from openerp import api, models, _
+from openerp.exceptions import ValidationError
 
 
 class ResPartnerBank(models.Model):
     _inherit = 'res.partner.bank'
 
     def copy_data(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-        if context is None:
-            context = {}
+        default = default or {}
+        context = context or {}
         if 'acc_number' not in default and 'default_acc_number' not in context:
             default['acc_number'] = ''
         return super(ResPartnerBank, self).copy_data(
             cr, uid, id, default=default, context=context)
 
-    _sql_constraints = [
-        ('unique_number', 'unique(sanitized_acc_number)',
-         'Account Number must be unique'),
+    @api.constrains('company_id', 'sanitized_acc_number')
+    def _check_unique_account(self):
+        for this in self:
+            check_domain = [
+                ('sanitized_acc_number', '=', this.sanitized_acc_number),
             ]
+            # No problem if one record has a company and the other not:
+            if this.company_id:
+                check_domain.append(('company_id', '=', this.company_id.id))
+            else:
+                check_domain.append(('company_id', '=', False))
+            # Do not find same record, if existing:
+            if this.exists():
+                check_domain.append(('id', '<>', this.id))
+            already_existing = self.search(check_domain)
+            if already_existing:
+                raise ValidationError(
+                    _("Bank account %s already registered for %s.") %
+                    (this.acc_number,
+                     already_existing.partner_id.display_name or 
+                     _("unknown partner"))
+                )

base_bank_account_number_unique/tests/__init__.py

@@ -1,20 +1,4 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    This module copyright (C) 2015 Therp BV <http://therp.nl>.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# © 2015-2017 Therp BV <https://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from . import test_base_bank_account_number_unique

base_bank_account_number_unique/tests/test_base_bank_account_number_unique.py

@@ -1,42 +1,26 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    This module copyright (C) 2015 Therp BV <http://therp.nl>.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# © 2015-2017 Therp BV <https://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from openerp.tests.common import TransactionCase
-from openerp.exceptions import Warning as UserError
-from ..hooks import post_init_hook
+from openerp.exceptions import ValidationError
 
 
 class TestBaseBankAccountNumberUnique(TransactionCase):
+
     def test_base_bank_account_number_unique(self):
-        # drop our constraint, insert nonunique account numbers and see if
-        # the init hook catches this
-        self.env['ir.model.constraint'].search([
-            ('name', '=', 'res_partner_bank_unique_number'),
-            ('model.model', '=', 'res.partner.bank'),
-        ])._module_data_uninstall()
-        self.env['res.partner.bank'].create({
+        """Add a bank account, then try to add another one with the
+        same number."""
+        bank_account_model = self.env['res.partner.bank']
+        bank_account_model.create({
+            'acc_number': 'BE1234567890',
+            'state': 'bank',
+        })
+        bank_account_model.create({
             'acc_number': 'BE 1234 567 890',
             'state': 'bank',
         })
-        self.env['res.partner.bank'].create({
+        with self.assertRaises(ValidationError):
+            bank_account_model.create({
                 'acc_number': 'BE 1234 567 890',
                 'state': 'bank',
             })
-        with self.assertRaises(UserError):
-            post_init_hook(self.cr, self.registry)