Merge lp:~camptocamp/openerp-swiss-localization/7.0-wip-invoice-ref-transaction-id into lp:~camptocamp/openerp-swiss-localization/7.0

[Guewen Baconnier @ Camptocamp]

Compatibility with the base_transaction_id module. No BVR number for invoices with a transaction id.

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi,

Thanks for the good work. I will love to have Fred's comment in there. But for what I see, that' LGTM.

Regards,

Joël

review: Approve (code review, no tests)

[Frederic Clementi - Camptocamp (frederic-clementi)]

Customer invoices creation :

* BVR number is populated on all account move lines. it is no relevant. We should only have this information on the account move line containing the same account_id than the one indicated on the related invoice.

* The field call reference on the SO (and the webkit pdf also) becomes a description on the invoice and the move line. I suggest to call it description everywhere.
note that on the webkit invoice this information appears twice under the name Subject & You reference... which is not ideal as well

* Bank statement with all swiss modules :
-> button 'import invoice' : no BVR no populated into the transaction ref
-> button 'import payment lines' : no BVR no populated into the transaction ref (but ok in payment lines)
- butoon 'import BVR' - transaction ref is correctely populated but I should have the invoice number into the field 'reference' and a / into 'communication' (currentely it is the other way around so it is not consistent with all the new logic in place)

Thanks

Frederic

review: Needs Fixing

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> Customer invoices creation :
>
> * BVR number is populated on all account move lines. it is no relevant. We
> should only have this information on the account move line containing the same
> account_id than the one indicated on the related invoice.

Done (as well as for the transaction ids branch [0])

>
> * The field call reference on the SO (and the webkit pdf also) becomes a
> description on the invoice and the move line. I suggest to call it description
> everywhere.
> note that on the webkit invoice this information appears twice under the name
> Subject & You reference... which is not ideal as well

I won't rename the fields. This is the field name used by OpenERP and we should keep it even if it is bad, changing it will break the translations. We have 2 possible courses of action here: 1) propose a new name for the next OpenERP release and 2) change the name in a custom translation.

The "Your Reference" field is now hidden when both fields have the same content.
This is done in the account-invoice-report project [1].

>
> * Bank statement with all swiss modules :
> -> button 'import invoice' : no BVR no populated into the transaction ref

Done in a new compatibility module (autoinstallable) account_payment_transaction_id because the base_transaction_id module has no dependency on account_voucher / account_payment. It unfortunately requires the module "statement_voucher_killer" because this module redefine the wizards. I would have preferred this module to work with *and* without "statement_voucher_killer" though but the use case I'm covering here use it.

This is done in the generic MP [0], not in the swiss localization.

> -> button 'import payment lines' : no BVR no populated into the transaction
> ref (but ok in payment lines)

Added in account_payment_transaction_id (same remark than above).

> - butoon 'import BVR' - transaction ref is correctely populated but I should
> have the invoice number into the field 'reference' and a / into
> 'communication' (currentely it is the other way around so it is not consistent
> with all the new logic in place)

Done.

>
> Thanks
>
> Frederic

[0] https://code.launchpad.net/~camptocamp/banking-addons/7.0-bank-statement-reconcile-transaction_id-imp/+merge/202806
[1] https://code.launchpad.net/~camptocamp/account-invoice-report/7.0-invoice-webkit-hide-identical-ref/+merge/209436

[Frederic Clementi - Camptocamp (frederic-clementi)]

LGTM

review: Approve (functional)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM

review: Approve (code review)

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

LGTM

review: Approve

=== modified file 'l10n_ch_base_bank/bank.py'
--- l10n_ch_base_bank/bank.py	2013-05-24 07:33:46 +0000
+++ l10n_ch_base_bank/bank.py	2014-03-21 07:56:44 +0000
@@ -162,6 +162,8 @@
         for p_bank in p_banks:
             if not p_bank.state in ('bv', 'bvr'):
                 continue
+            if not p_bank.get_account_number():
+                continue
             if not (self._check_9_pos_postal_num(p_bank.get_account_number()) or
                     self._check_5_pos_postal_num(p_bank.get_account_number())):
                 return False

=== modified file 'l10n_ch_dta/wizard/create_dta.py'
--- l10n_ch_dta/wizard/create_dta.py	2014-01-15 08:13:14 +0000
+++ l10n_ch_dta/wizard/create_dta.py	2014-03-21 07:56:44 +0000
@@ -490,11 +490,17 @@
         bank = payment.mode.bank_id
         if not bank:
             raise except_osv(_('Error'), _('No bank account for the company.'))
-        elec_context['comp_bank_name'] = bank.bank and bank.bank.name or False
+        if not bank.bank:
+            raise except_osv(_('Error'),
+                             _('You must set a bank '
+                               'for the bank account with number %s' %
+                               bank.acc_number or ''))
+        elec_context['comp_bank_name'] = bank.bank.name
         elec_context['comp_bank_clearing'] = bank.bank.clearing
         if not elec_context['comp_bank_clearing']:
             raise except_osv(_('Error'),
-                             _('You must provide a Clearing Number for your bank account.'))
+                             _('You must provide a Clearing Number '
+                               'for the bank %s.' % bank.bank.name))
         company = payment.company_id
         co_addr = company.partner_id
         elec_context['comp_country'] = co_addr.country_id and co_addr.country_id.name or ''

=== added directory 'l10n_ch_dta_base_transaction_id'
=== added file 'l10n_ch_dta_base_transaction_id/__init__.py'
--- l10n_ch_dta_base_transaction_id/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_ch_dta_base_transaction_id/__init__.py	2014-03-21 07:56:44 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2014 Camptocamp SA
+#
+#    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 . import wizard

=== added file 'l10n_ch_dta_base_transaction_id/__openerp__.py'
--- l10n_ch_dta_base_transaction_id/__openerp__.py	1970-01-01 00:00:00 +0000
+++ l10n_ch_dta_base_transaction_id/__openerp__.py	2014-03-21 07:56:44 +0000
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2014 Camptocamp SA
+#
+#    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/>.
+#
+##############################################################################
+
+{'name' : 'Swiss Localization Bank Payment File (DTA) - Transaction ID Compatibility',
+ 'version' : '1.0',
+ 'author' : 'Camptocamp',
+ 'maintainer': 'Camptocamp',
+ 'license': 'AGPL-3',
+ 'category': 'Hidden',
+ 'depends' : ['l10n_ch_dta',
+              'base_transaction_id',  # lp:banking-addons/bank-statement-reconcile-7.0 
+              ],
+ 'description': """
+Swiss Localization Bank Payment File (DTA) - Transaction ID Compatibility
+=========================================================================
+
+Link module between the Swiss localization Payment File (DTA) module
+(l10n_ch_dta) and the module adding a transaction ID
+field (base_transaction_id).
+
+When an invoice has a transaction ID, the DTA is exported with this ID
+as reference.
+
+""",
+ 'website': 'http://www.camptocamp.com',
+ 'data': [],
+ 'tests': [],
+ 'installable': True,
+ 'auto_install': True,
+}

=== added directory 'l10n_ch_dta_base_transaction_id/wizard'
=== added file 'l10n_ch_dta_base_transaction_id/wizard/__init__.py'
--- l10n_ch_dta_base_transaction_id/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_ch_dta_base_transaction_id/wizard/__init__.py	2014-03-21 07:56:44 +0000
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import create_dta

=== added file 'l10n_ch_dta_base_transaction_id/wizard/create_dta.py'
--- l10n_ch_dta_base_transaction_id/wizard/create_dta.py	1970-01-01 00:00:00 +0000
+++ l10n_ch_dta_base_transaction_id/wizard/create_dta.py	2014-03-21 07:56:44 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2014 Camptocamp SA
+#
+#    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.osv import orm
+
+
+class DTAFileGenerator(orm.TransientModel):
+    _inherit = "create.dta.wizard"
+
+    def _set_bank_data(self, cr, uid, data, pline, elec_context,
+                       seq, context=None):
+        super(DTAFileGenerator, self).\
+            _set_bank_data(cr, uid, data, pline,
+                           elec_context, seq, context=context)
+        if pline.move_line_id.transaction_ref:
+            elec_context['reference'] = pline.move_line_id.transaction_ref

=== modified file 'l10n_ch_payment_slip/invoice.py'
--- l10n_ch_payment_slip/invoice.py	2013-09-20 08:59:37 +0000
+++ l10n_ch_payment_slip/invoice.py	2014-03-21 07:56:44 +0000
@@ -33,14 +33,13 @@
         'transaction_ref': fields.char('Transaction Ref.', size=128),
     }
 
-    def init(self, cr):
-        cr.execute('UPDATE account_move_line SET transaction_ref = ref'
-                   '  WHERE transaction_ref IS NULL'
-                   '   AND ref IS NOT NULL')
-        return True
-
     def get_bvr_ref(self, cursor, uid, move_line_id, context=None):
-        """Retrieve ESR/BVR reference from move line in order to print it"""
+        """Retrieve ESR/BVR reference from move line in order to print it
+
+        Returns False when no BVR reference should be generated.  No
+        reference is generated when a transaction reference already
+        exists for the line (likely been generated by a payment service).
+        """
         res = ''
         if isinstance(move_line_id, (tuple, list)):
             assert len(move_line_id) == 1, "Only 1 ID expected"
@@ -55,7 +54,13 @@
         move_number = ''
         if move_line.invoice.number:
             move_number = self._compile_get_ref.sub('', str(move_line.invoice.number) + str(move_line_id))
-        return mod10r(res + move_number.rjust(26 - len(res), '0'))
+        reference = mod10r(res + move_number.rjust(26 - len(res), '0'))
+        if (move_line.transaction_ref and
+                move_line.transaction_ref != reference):
+            # the line has already a transaction id and it is not
+            # a BVR reference
+            return ''
+        return reference
 
 
 class AccountInvoice(Model):
@@ -102,22 +107,35 @@
                                          store=True, readonly=True)
     }
 
+    def _get_bvr_ref(self, cr, uid, invoice, context=None):
+        """Retrieve ESR/BVR reference form invoice in order to print it
+
+        Receive a browse record so it can be overloaded without rebrowsing
+        the invoice.
+        """
+        res = ''
+        ## We check if the type is bvr, if not we return false
+        if invoice.partner_bank_id.state != 'bvr':
+            return ''
+        ##
+        if invoice.partner_bank_id.bvr_adherent_num:
+            res = invoice.partner_bank_id.bvr_adherent_num
+        invoice_number = ''
+        if invoice.number:
+            invoice_number = self._compile_get_ref.sub('', invoice.number)
+        return mod10r(res + invoice_number.rjust(26 - len(res), '0'))
+
     def get_bvr_ref(self, cursor, uid, inv_id, context=None):
-        """Retrieve ESR/BVR reference form invoice in order to print it"""
-        res = ''
-        if isinstance(inv_id, list):
+        """Retrieve ESR/BVR reference form invoice in order to print it
+
+        Returns False when no BVR reference should be generated.  No
+        reference is generated when the invoice is not a BVR invoice.
+        """
+        if isinstance(inv_id, (list, tuple)):
+            assert len(inv_id) == 1, "1 ID expected, got %s" % inv_id
             inv_id = inv_id[0]
         inv = self.browse(cursor, uid, inv_id, context=context)
-        ## We check if the type is bvr, if not we return false
-        if inv.partner_bank_id.state != 'bvr':
-            return ''
-        ##
-        if inv.partner_bank_id.bvr_adherent_num:
-            res = inv.partner_bank_id.bvr_adherent_num
-        invoice_number = ''
-        if inv.number:
-            invoice_number = self._compile_get_ref.sub('', inv.number)
-        return mod10r(res + invoice_number.rjust(26 - len(res), '0'))
+        return self._get_bvr_ref(cursor, uid, inv, context=context)
 
     def _space(self, nbr, nbrspc=5):
         """Spaces * 5.
@@ -136,37 +154,54 @@
                    (ref, move_id))
         return True
 
+    def _action_bvr_number_move_line(self, cr, uid, invoice, move_line,
+                                     ref, context=None):
+        if not ref:
+            return
+        cr.execute('UPDATE account_move_line SET transaction_ref=%s'
+                   '  WHERE id=%s', (ref, move_line.id))
+        self._update_ref_on_account_analytic_line(cr, uid, ref,
+                                                  move_line.move_id.id)
+
     def action_number(self, cr, uid, ids, context=None):
+        """ Copy the BVR/ESR 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 suppliers invoices: the BVR reference is stored in the reference
+        field of the invoice.
+
+        """
         res = super(AccountInvoice, self).action_number(cr, uid, ids, context=context)
         move_line_obj = self.pool.get('account.move.line')
-        account_obj = self.pool.get('account.account')
-        tier_account_id = account_obj.search(cr, uid, [('type', 'in', ['receivable', 'payable'])])
 
         for inv in self.browse(cr, uid, ids, context=context):
-            if inv.type != 'out_invoice' and inv.partner_bank_id.state != 'bvr':
+            move_line_ids = move_line_obj.search(
+                cr, uid,
+                [('move_id', '=', inv.move_id.id),
+                 ('account_id', '=', inv.account_id.id)],
+                context=context)
+            if not move_line_ids:
                 continue
-            move_lines = move_line_obj.search(cr, uid, [('move_id', '=', inv.move_id.id),
-                                                        ('account_id', 'in', tier_account_id)])
-            # We keep this branch for compatibility with single BVR report.
-            # This should be cleaned when porting to V8
-            if move_lines:
-                if len(move_lines) == 1:
-                    ref = inv.get_bvr_ref()
-                    move_id = inv.move_id
-                    if move_id:
-                        cr.execute('UPDATE account_move_line SET transaction_ref=%s'
-                                   '  WHERE move_id=%s',
-                                   (ref, move_id.id))
-                        self._update_ref_on_account_analytic_line(cr, uid, ref, move_id.id)
-                else:
-                    for move_line in move_line_obj.browse(cr, uid, move_lines, context=context):
+            move_lines = move_line_obj.browse(cr, uid, move_line_ids,
+                                              context=context)
+            for move_line in move_lines:
+                if inv.type in ('out_invoice', 'out_refund'):
+                    if len(move_lines) == 1:
+                        # We keep this branch for compatibility with single
+                        # BVR report.
+                        # This should be cleaned when porting to V8
+                        ref = inv.get_bvr_ref()
+                    else:
                         ref = move_line.get_bvr_ref()
-                        if ref:
-                            cr.execute('UPDATE account_move_line SET transaction_ref=%s'
-                                       '  WHERE id=%s',
-                                       (ref, move_line.id))
-                            self._update_ref_on_account_analytic_line(cr, uid, ref,
-                                                                      move_line.move_id.id)
+                elif inv.reference_type == 'bvr' and inv.reference:
+                    ref = inv.reference
+                else:
+                    ref = False
+                self._action_bvr_number_move_line(cr, uid, inv,
+                                                  move_line, ref,
+                                                  context=context)
         return res
 
     def copy(self, cursor, uid, inv_id, default=None, context=None):

=== modified file 'l10n_ch_payment_slip/wizard/bvr_import.py'
--- l10n_ch_payment_slip/wizard/bvr_import.py	2013-08-14 14:32:54 +0000
+++ l10n_ch_payment_slip/wizard/bvr_import.py	2014-03-21 07:56:44 +0000
@@ -181,6 +181,49 @@
                                  _('The properties account payable account receivable are not set'))
         return account_id
 
+    def _prepare_line_vals(self, cursor, uid, statement, record,
+                           voucher_enabled, context=None):
+        # Remove the 11 first char because it can be adherent number
+        # TODO check if 11 is the right number
+        move_line_obj = self.pool.get('account.move.line')
+        reference = record['reference']
+        values = {'name': '/',
+                  'date': record['date'],
+                  'amount': record['amount'],
+                  'ref': reference,
+                  'type': (record['amount'] >= 0 and 'customer') or 'supplier',
+                  'statement_id': statement.id,
+                  }
+        line_ids = move_line_obj.search(cursor, uid,
+                                        [('ref', '=', reference),
+                                         ('reconcile_id', '=', False),
+                                         ('account_id.type', 'in', ['receivable', 'payable']),
+                                         ('journal_id.type', '=', 'sale')],
+                                        order='date desc', context=context)
+        #for multiple payments
+        if not line_ids:
+            line_ids = move_line_obj.search(cursor, uid,
+                                            [('transaction_ref', '=', reference),
+                                             ('reconcile_id', '=', False),
+                                             ('account_id.type', 'in', ['receivable', 'payable']),
+                                             ('journal_id.type', '=', 'sale')],
+                                            order='date desc', context=context)
+        if not line_ids:
+            line_ids = self._reconstruct_invoice_ref(cursor, uid, reference, None)
+        if line_ids and voucher_enabled:
+            values['voucher_id'] = self._create_voucher_from_record(cursor, uid, record,
+                                                                    statement, line_ids,
+                                                                    context=context)
+        account_id = self._get_account(cursor, uid, line_ids,
+                                       record, context=context)
+        values['account_id'] = account_id
+        if line_ids:
+            line = move_line_obj.browse(cursor, uid, line_ids[0])
+            partner_id = line.partner_id.id
+            values['name'] = line.invoice and (_('Inv. no ') + line.invoice.number) or values['name']
+            values['partner_id'] = partner_id
+        return values
+
     def import_v11(self, cursor, uid, ids, data, context=None):
         """Import v11 file and transfor it into statement lines"""
         if context is None: context = {}
@@ -196,7 +239,6 @@
             if para.lower() not in ['0', 'false']: # if voucher is disabled
                 voucher_enabled = False
         statement_line_obj = self.pool.get('account.bank.statement.line')
-        move_line_obj = self.pool.get('account.move.line')
         attachment_obj = self.pool.get('ir.attachment')
         statement_obj = self.pool.get('account.bank.statement')
         file = data['form']['file']
@@ -207,49 +249,11 @@
         lines = base64.decodestring(file).split("\n")
         records = self._parse_lines(cursor, uid, lines, context=context)
 
-        if context is None:
-            context = {}
-
         statement = statement_obj.browse(cursor, uid, statement_id, context=context)
         for record in records:
-            # Remove the 11 first char because it can be adherent number
-            # TODO check if 11 is the right number
-            reference = record['reference']
-            values = {'name': reference,
-                      'date': record['date'],
-                      'amount': record['amount'],
-                      'ref': reference,
-                      'type': (record['amount'] >= 0 and 'customer') or 'supplier',
-                      'statement_id': statement_id,
-                      }
-            line_ids = move_line_obj.search(cursor, uid,
-                                            [('ref', '=', reference),
-                                             ('reconcile_id', '=', False),
-                                             ('account_id.type', 'in', ['receivable', 'payable']),
-                                             ('journal_id.type', '=', 'sale')],
-                                            order='date desc', context=context)
-            #for multiple payments
-            if not line_ids:
-                line_ids = move_line_obj.search(cursor, uid,
-                                                [('transaction_ref', '=', reference),
-                                                ('reconcile_id', '=', False),
-                                                ('account_id.type', 'in', ['receivable', 'payable']),
-                                                ('journal_id.type', '=', 'sale')],
-                                                order='date desc', context=context)
-            if not line_ids:
-                line_ids = self._reconstruct_invoice_ref(cursor, uid, reference, None)
-            if line_ids and voucher_enabled:
-                values['voucher_id'] = self._create_voucher_from_record(cursor, uid, record,
-                                                                        statement, line_ids,
-                                                                        context=context)
-            account_id = self._get_account(cursor, uid, line_ids,
-                                           record, context=context)
-            values['account_id'] = account_id
-            if line_ids:
-                line = move_line_obj.browse(cursor, uid, line_ids[0])
-                partner_id = line.partner_id.id
-                values['name'] = line.invoice and (_('Inv. no ') + line.invoice.number) or values['name']
-                values['partner_id'] = partner_id
+            values = self._prepare_line_vals(cursor, uid, statement,
+                                             record, voucher_enabled,
+                                             context=context)
             statement_line_obj.create(cursor, uid, values, context=context)
         attachment_obj.create(cursor, uid,
                               {'name': 'BVR %s' % time.strftime("%Y-%m-%d_%H:%M:%S", time.gmtime()),

=== added directory 'l10n_ch_payment_slip_account_statement_base_completion'
=== added file 'l10n_ch_payment_slip_account_statement_base_completion/__init__.py'
--- l10n_ch_payment_slip_account_statement_base_completion/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_ch_payment_slip_account_statement_base_completion/__init__.py	2014-03-21 07:56:44 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2014 Camptocamp SA
+#
+#    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 . import wizard
+from . import statement

=== added file 'l10n_ch_payment_slip_account_statement_base_completion/__openerp__.py'
--- l10n_ch_payment_slip_account_statement_base_completion/__openerp__.py	1970-01-01 00:00:00 +0000
+++ l10n_ch_payment_slip_account_statement_base_completion/__openerp__.py	2014-03-21 07:56:44 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2014 Camptocamp SA
+#
+#    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/>.
+#
+##############################################################################
+
+{'name' : 'Swiss Localization BVR/ESR - Bank statement Completion',
+ 'version' : '1.0',
+ 'author' : 'Camptocamp',
+ 'maintainer': 'Camptocamp',
+ 'license': 'AGPL-3',
+ 'category': 'Hidden',
+ 'depends' : ['l10n_ch_payment_slip',
+              'account_statement_base_completion',  # lp:banking-addons/bank-statement-reconcile-7.0 
+              ],
+ 'description': """
+Swiss Localization BVR/ESR - Bank statement Completion
+======================================================
+
+Link module between the Swiss localization BVR/ESR module
+(l10n_ch_payment_slip) and the module adding a transaction ID
+field in the bank statement (account_statement_base_completion).
+
+It adds a completion rule to search the partner from the invoice
+using the BVR/ESR reference.
+
+When importing a BVR/ESR, the transaction ID is also copied to the
+transaction id field of the bank statement.
+
+ """,
+ 'website': 'http://www.camptocamp.com',
+ 'data': ['data.xml',
+          ],
+ 'tests': [],
+ 'installable': True,
+ 'auto_install': True,
+}

=== added file 'l10n_ch_payment_slip_account_statement_base_completion/data.xml'
--- l10n_ch_payment_slip_account_statement_base_completion/data.xml	1970-01-01 00:00:00 +0000
+++ l10n_ch_payment_slip_account_statement_base_completion/data.xml	2014-03-21 07:56:44 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data noupdate="1">
+
+    <record id="bank_statement_completion_rule_bvr_invoice" model="account.statement.completion.rule">
+      <field name="name">Match from Invoice using BVR/ESR Reference</field>
+      <field name="sequence">40</field>
+      <field name="function_to_call">get_from_bvr_reference_and_invoice</field>
+    </record>
+
+  </data>
+</openerp>

=== added file 'l10n_ch_payment_slip_account_statement_base_completion/statement.py'
--- l10n_ch_payment_slip_account_statement_base_completion/statement.py	1970-01-01 00:00:00 +0000
+++ l10n_ch_payment_slip_account_statement_base_completion/statement.py	2014-03-21 07:56:44 +0000
@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2014 Camptocamp SA
+#
+#    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.tools.translate import _
+from openerp.osv import orm, fields
+from openerp.addons.account_statement_base_completion.statement import (
+    ErrorTooManyPartner
+)
+
+
+class account_statement_completion_rule(orm.Model):
+    """ Add a rule based on BVR Reference """
+    _inherit = "account.statement.completion.rule"
+
+    def _get_functions(self, cr, uid, context=None):
+        res = super(account_statement_completion_rule, self).\
+            _get_functions(cr, uid, context=context)
+        res.append(('get_from_bvr_reference_and_invoice',
+                    'Match Invoice using BVR/ESR Reference'))
+        return res
+
+    _columns = {
+        'function_to_call': fields.selection(_get_functions, 'Method'),
+    }
+
+    def get_from_bvr_reference_and_invoice(self, cr, uid, st_line, context=None):
+        """
+        Match the partner based on the BVR reference field of the invoice.
+        Then, call the generic st_line method to complete other values.
+
+        In that case, we always fulfill the reference of the line with
+        the invoice name.
+
+        :param dict st_line: read of the concerned account.bank.statement.line
+        :return:
+            A dict of value that can be passed directly to the write method of
+            the statement line or {}
+           {'partner_id': value,
+            'account_id' : value,
+            ...}
+            """
+        st_obj = self.pool.get('account.bank.statement.line')
+        res = {}
+        invoice_obj = self.pool.get('account.invoice')
+        # For customer invoices, search in bvr_reference that is as list
+        # of references separated by semicolons and formatted with
+        # spaces inside them.
+        # For supplier invoices, search in 'reference'
+        query = ("SELECT id FROM account_invoice "
+                 "WHERE company_id = %s "
+                 "AND (%s = ANY (string_to_array( "
+                 "                 replace(bvr_reference, ' ', ''), "
+                 "               ';')) "
+                 "     AND type IN ('out_invoice', 'out_refund') "
+                 "     OR type IN ('in_invoice', 'in_refund') "
+                 "     AND reference_type = 'bvr' AND reference = %s "
+                 ")")
+        cr.execute(query, (st_line['company_id'][0],
+                           st_line['transaction_id'],
+                           st_line['transaction_id']))
+        rows = cr.fetchall()
+        invoice_ids = [row[0] for row in rows]
+        if len(invoice_ids) > 1:
+            raise ErrorTooManyPartner(
+                _('Line named "%s" (Ref:%s) was matched by more than '
+                  'one partner.') % (st_line['name'], st_line['ref']))
+        elif len(invoice_ids) == 1:
+            invoice = invoice_obj.browse(cr, uid, invoice_ids[0],
+                                         context=context)
+            res['partner_id'] = invoice.partner_id.id
+            # we want the move to have the same ref than the found
+            # invoice's move, thus it will be easier to link them for the
+            # accountants
+            if invoice.move_id:
+                res['ref'] = invoice.move_id.ref
+            st_vals = st_obj.get_values_for_line(
+                cr, uid,
+                profile_id=st_line['profile_id'],
+                master_account_id=st_line['master_account_id'],
+                partner_id=res.get('partner_id', False),
+                line_type=st_line['type'],
+                amount=st_line['amount'] if st_line['amount'] else 0.0,
+                context=context)
+            res.update(st_vals)
+        return res

=== added directory 'l10n_ch_payment_slip_account_statement_base_completion/wizard'
=== added file 'l10n_ch_payment_slip_account_statement_base_completion/wizard/__init__.py'
--- l10n_ch_payment_slip_account_statement_base_completion/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_ch_payment_slip_account_statement_base_completion/wizard/__init__.py	2014-03-21 07:56:44 +0000
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import bvr_import

=== added file 'l10n_ch_payment_slip_account_statement_base_completion/wizard/bvr_import.py'
--- l10n_ch_payment_slip_account_statement_base_completion/wizard/bvr_import.py	1970-01-01 00:00:00 +0000
+++ l10n_ch_payment_slip_account_statement_base_completion/wizard/bvr_import.py	2014-03-21 07:56:44 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2014 Camptocamp SA
+#
+#    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.osv import orm
+
+
+class BvrImporterWizard(orm.TransientModel):
+    _inherit = 'bvr.import.wizard'
+
+    def _prepare_line_vals(self, cursor, uid, statement, record,
+                           voucher_enabled, context=None):
+        record = super(BvrImporterWizard, self).\
+            _prepare_line_vals(cursor, uid, statement, record,
+                               voucher_enabled, context=context)
+        record['transaction_id'] = record['ref']
+        return record

=== added directory 'l10n_ch_payment_slip_base_transaction_id'
=== added file 'l10n_ch_payment_slip_base_transaction_id/__init__.py'
--- l10n_ch_payment_slip_base_transaction_id/__init__.py	1970-01-01 00:00:00 +0000
+++ l10n_ch_payment_slip_base_transaction_id/__init__.py	2014-03-21 07:56:44 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2014 Camptocamp SA
+#
+#    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 . import invoice

=== added file 'l10n_ch_payment_slip_base_transaction_id/__openerp__.py'
--- l10n_ch_payment_slip_base_transaction_id/__openerp__.py	1970-01-01 00:00:00 +0000
+++ l10n_ch_payment_slip_base_transaction_id/__openerp__.py	2014-03-21 07:56:44 +0000
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2014 Camptocamp SA
+#
+#    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/>.
+#
+##############################################################################
+
+{'name' : 'Swiss Localization BVR/ESR - Transaction ID Compatibility',
+ 'version' : '1.0',
+ 'author' : 'Camptocamp',
+ 'maintainer': 'Camptocamp',
+ 'license': 'AGPL-3',
+ 'category': 'Hidden',
+ 'depends' : ['l10n_ch_payment_slip',
+              'base_transaction_id',  # lp:banking-addons/bank-statement-reconcile-7.0 
+              ],
+ 'description': """
+Swiss Localization BVR/ESR - Transaction ID Compatibility
+==========================================================
+
+Link module between the Swiss localization BVR/ESR module
+(l10n_ch_payment_slip) and the module adding a transaction ID
+field (base_transaction_id).
+
+When an invoice has a transaction ID, no BVR reference should be generated
+because the reconciliation should be done with the transaction ID, not
+a new reference.
+ """,
+ 'website': 'http://www.camptocamp.com',
+ 'data': [],
+ 'tests': [],
+ 'installable': True,
+ 'auto_install': True,
+}

=== added file 'l10n_ch_payment_slip_base_transaction_id/invoice.py'
--- l10n_ch_payment_slip_base_transaction_id/invoice.py	1970-01-01 00:00:00 +0000
+++ l10n_ch_payment_slip_base_transaction_id/invoice.py	2014-03-21 07:56:44 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2014 Camptocamp SA
+#
+#    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.osv import orm
+
+
+class account_invoice(orm.Model):
+    _inherit = 'account.invoice'
+
+    def _get_bvr_ref(self, cr, uid, invoice, context=None):
+        """Retrieve ESR/BVR reference form invoice in order to print it
+
+        Returns False when no BVR reference should be generated.  No
+        reference is generated when a transaction ID already exists on
+        the invoice (likely generated by a payment service so BVR ref not
+        used).
+        """
+        if invoice.transaction_id:
+            return ''
+        return super(account_invoice, self)._get_bvr_ref(cr, uid, invoice,
+                                                         context=context)