Merge lp:~therp-nl/banking-addons/6.0-iban-preserve-domestic into lp:~therp-nl/banking-addons/6.0-interactive-matching-and-debit-orders

[Stefan Rijnhart (Opener)]

=== modified file 'account_banking/wizard/bank_import.py'
--- account_banking/wizard/bank_import.py	2012-02-11 12:26:53 +0000
+++ account_banking/wizard/bank_import.py	2012-02-18 14:34:19 +0000
@@ -290,8 +290,63 @@
             
             results.stat_loaded_cnt += 1
 
+<<<<<<< TREE
         import_transaction_obj.match(cursor, uid, transaction_ids, results=results, context=context)
             
+=======
+        #recompute statement end_balance for validation
+        statement_obj.button_dummy(
+            cursor, uid, imported_statement_ids, context=context)
+
+        if payment_lines:
+            # As payments lines are treated as individual transactions, the
+            # batch as a whole is only marked as 'done' when all payment lines
+            # have been reconciled.
+            cursor.execute(
+                "SELECT DISTINCT o.id "
+                "FROM payment_order o, payment_line l "
+                "WHERE o.state = 'sent' "
+                  "AND o.id = l.order_id "
+                  "AND o.id NOT IN ("
+                    "SELECT DISTINCT order_id AS id "
+                    "FROM payment_line "
+                    "WHERE date_done IS NULL "
+                      "AND id IN (%s)"
+                   ")" % (','.join([str(x) for x in payment_line_ids]))
+            )
+            order_ids = [x[0] for x in cursor.fetchall()]
+            if order_ids:
+                # Use workflow logics for the orders. Recode logic from
+                # account_payment, in order to increase efficiency.
+                payment_order_obj.set_done(cursor, uid, order_ids,
+                                        {'state': 'done'}
+                                       )
+                wf_service = netsvc.LocalService('workflow')
+                for id in order_ids:
+                    wf_service.trg_validate(uid, 'payment.order', id, 'done',
+                                            cursor
+                                           )
+
+            # Original code. Didn't take workflow logistics into account...
+            #
+            #cursor.execute(
+            #    "UPDATE payment_order o "
+            #    "SET state = 'done', "
+            #        "date_done = '%s' "
+            #    "FROM payment_line l "
+            #    "WHERE o.state = 'sent' "
+            #      "AND o.id = l.order_id "
+            #      "AND l.id NOT IN ("
+            #        "SELECT DISTINCT id FROM payment_line "
+            #        "WHERE date_done IS NULL "
+            #          "AND id IN (%s)"
+            #       ")" % (
+            #           time.strftime('%Y-%m-%d'),
+            #           ','.join([str(x) for x in payment_line_ids])
+            #       )
+            #)
+
+>>>>>>> MERGE-SOURCE
         report = [
             '%s: %s' % (_('Total number of statements'),
                         results.stat_skipped_cnt + results.stat_loaded_cnt),

=== added directory 'account_iban_preserve_domestic'
=== added file 'account_iban_preserve_domestic/__init__.py'
--- account_iban_preserve_domestic/__init__.py	1970-01-01 00:00:00 +0000
+++ account_iban_preserve_domestic/__init__.py	2012-02-18 14:34:19 +0000
@@ -0,0 +1,1 @@
+import res_partner_bank

=== added file 'account_iban_preserve_domestic/__openerp__.py'
--- account_iban_preserve_domestic/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_iban_preserve_domestic/__openerp__.py	2012-02-18 14:34:19 +0000
@@ -0,0 +1,57 @@
+##############################################################################
+#
+#    Copyright (C) 2012 Therp BV (<http://therp.nl>).
+#            
+#    All other contributions are (C) by their respective contributors
+#
+#    All Rights Reserved
+#
+#    WARNING: This program as such is intended to be used by professional
+#    programmers who take the whole responsability of assessing all potential
+#    consequences resulting from its eventual inadequacies and bugs
+#    End users who are looking for a ready-to-use solution with commercial
+#    garantees and support are strongly adviced to contract EduSense BV
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Preserve domestic bank account number',
+    'version': '0.1',
+    'license': 'GPL-3',
+    'author': 'Therp BV',
+    'website': 'https://launchpad.net/banking-addons',
+    'category': 'Banking addons',
+    'depends': ['base_iban'],
+    'init_xml': [],
+    'update_xml': [],
+    'demo_xml': [],
+    'description': '''
+This module is compatible with OpenERP 6.0.
+
+The IBAN module in OpenERP 6.1 registers the IBAN
+on the same field as the domestic account number, 
+instead of keeping both on separate fields as is the
+case in 6.0. That means that an upgrade to OpenERP 6.1
+makes you lose this information. If you want to keep
+the domestic account number in addition to the IBAN,
+install this module prior to the upgrade to OpenERP 6.1. 
+
+Do *not* install this version of the module on OpenERP 6.1.
+A dedicated module for OpenERP 6.1 will be available that
+allows you to access the domestic account number.
+    ''',
+    'active': False,
+    'installable': True,
+}

=== added file 'account_iban_preserve_domestic/res_partner_bank.py'
--- account_iban_preserve_domestic/res_partner_bank.py	1970-01-01 00:00:00 +0000
+++ account_iban_preserve_domestic/res_partner_bank.py	2012-02-18 14:34:19 +0000
@@ -0,0 +1,29 @@
+from osv import fields,osv
+class res_partner_bank(osv.osv):
+    '''Bank Accounts'''
+    _inherit = "res.partner.bank"
+
+    def _get_domestic(self, cr, uid, ids, prop, unknow_none, context=None):
+        import pdb
+        pdb.set_trace()
+        res = dict(
+            [(x['id'], x['acc_number'])
+             for x in self.read(cr, uid, ids, ['acc_number'], context=context)
+             ]
+            )
+        return res
+
+    _columns = {
+        'acc_number_domestic': fields.function(
+            _get_domestic, method=True, type="char",
+            size=64, string='Domestic Account Number',
+            store = {
+                'res.partner.bank':(
+                    lambda self,cr,uid,ids,c={}:ids, 
+                    ['acc_number'], 10),
+                },
+            ),
+        }
+
+res_partner_bank()
+