Merge lp:~therp-nl/banking-addons/ba7.0-manual_multi_match into lp:banking-addons

[Stefan Rijnhart (Opener)]

[IMP] Allow multiple entries when manually selecting invoices or entries

Reconcile multiple manually selected entries by splitting up the bank statement line.

Forward port of https://code.launchpad.net/~therp-nl/banking-addons/6.1-match_multiple_invoices_split/+merge/159348 by Holger Brunn but for 7.0

[lp:~therp-nl/banking-addons/ba7.0-manual_multi_match]

203. By Stefan Rijnhart (Opener) on 2013-05-03

[FIX] Update the split off statement line's transaction id

204. By Stefan Rijnhart (Opener) on 2013-05-31

[FIX] Calculation of residual in the case of split transactions
[FIX] Transaction amount when credit amounts are split
[FIX] Restore bank account's partner when disabling match

[Holger Brunn (Therp) (hbrunn)]

review: Approve

[lp:~therp-nl/banking-addons/ba7.0-manual_multi_match]

205. By Stefan Rijnhart (Opener) on 2013-06-05

[FIX] Index error

=== modified file 'account_banking/banking_import_transaction.py'
--- account_banking/banking_import_transaction.py	2013-06-03 09:39:56 +0000
+++ account_banking/banking_import_transaction.py	2013-06-05 08:37:47 +0000
@@ -1196,7 +1196,7 @@
                 not(transaction.move_currency_amount is False)):
                 res[transaction.id] = (
                     transaction.move_currency_amount -
-                    transaction.transferred_amount
+                    transaction.statement_line_id.amount
                     )
         return res
         
@@ -1739,10 +1739,14 @@
                     (statement_line_data['name'] or '') + _(' (split)'))
             statement_line_data['import_transaction_id'] = transaction_id
             statement_line_data['parent_id'] = this.id
+            statement_line_id = self.create(
+                cr, uid, statement_line_data, context=context)
 
-            child_statement_ids.append(
-                    self.create(cr, uid, statement_line_data,
-                        context=context))
+            child_statement_ids.append(statement_line_id)
+            transaction_pool.write(
+                cr, uid, transaction_id, {
+                    'statement_line_id': statement_line_id,
+                    }, context=context)
             this.write({'amount': this.amount - amount})
 
         return child_statement_ids

=== modified file 'account_banking/static/src/js/account_banking.js'
--- account_banking/static/src/js/account_banking.js	2013-04-24 14:36:15 +0000
+++ account_banking/static/src/js/account_banking.js	2013-06-05 08:37:47 +0000
@@ -2,27 +2,17 @@
 #
 #    Copyright (C) 2013 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.
+#    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 General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    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/>.
 #
 ############################################################################*/

=== modified file 'account_banking/wizard/banking_transaction_wizard.py'
--- account_banking/wizard/banking_transaction_wizard.py	2013-05-01 14:25:04 +0000
+++ account_banking/wizard/banking_transaction_wizard.py	2013-06-05 08:37:47 +0000
@@ -96,8 +96,6 @@
         # The following fields get never written
         # they are just triggers for manual matching
         # which populates regular fields on the transaction
-        manual_invoice_id = vals.pop('manual_invoice_id', False)
-        manual_move_line_id = vals.pop('manual_move_line_id', False)
         manual_invoice_ids = vals.pop('manual_invoice_ids', [])
         manual_move_line_ids = vals.pop('manual_move_line_ids', [])
 
@@ -171,17 +169,17 @@
                             _("No entry found for the selected invoice. " +
                               "Try manual reconciliation."))
 
-        if manual_move_line_id or manual_invoice_id \
-                or manual_move_line_ids or manual_invoice_ids:
+        if manual_move_line_ids or manual_invoice_ids:
             move_line_obj = self.pool.get('account.move.line')
             invoice_obj = self.pool.get('account.invoice')
             statement_line_obj = self.pool.get('account.bank.statement.line')
-            manual_invoice_ids = (
-                    ([manual_invoice_id] if manual_invoice_id else []) +
+            # Rewrite *2many directive notation
+            if manual_invoice_ids:
+                manual_invoice_ids = (
                     [i[1] for i in manual_invoice_ids if i[0]==4] +
                     [j for i in manual_invoice_ids if i[0]==6 for j in i[2]])
-            manual_move_line_ids = (
-                    ([manual_move_line_id] if manual_move_line_id else []) +
+            if manual_move_line_ids:
+                manual_move_line_ids = (
                     [i[1] for i in manual_move_line_ids if i[0]==4] +
                     [j for i in manual_move_line_ids if i[0]==6 for j in i[2]])
             for wiz in self.browse(cr, uid, ids, context=context):
@@ -228,7 +226,7 @@
 
                     if len(todo) > 0:
                         statement_line_id = wiz.statement_line_id.split_off(
-                                move_line.credit or move_line.debit)[0]
+                                move_line.debit or -move_line.credit)[0]
                         transaction_id = statement_line_obj.browse(
                                 cr,
                                 uid,
@@ -292,7 +290,12 @@
                     account_id = setting.default_debit_account_id and setting.default_debit_account_id.id
                 statement_pool.write(cr, uid, wiz.statement_line_id.id, {'account_id':account_id})
             
-            wiz.write({'partner_id': False})
+            # Restore partner id from the bank account or else reset
+            partner_id = False
+            if (wiz.statement_line_id.partner_bank_id and
+                    wiz.statement_line_id.partner_bank_id.partner_id):
+                partner_id = wiz.statement_line_id.partner_bank_id.partner_id.id
+            wiz.write({'partner_id': partner_id})
 
             if wiz.statement_line_id:
                 #delete splits causing an unsplit if this is a split
@@ -391,22 +394,15 @@
         'match_type': fields.related(
             'import_transaction_id', 'match_type', 
             type="char", size=16, string='Match type', readonly=True),
-        'manual_invoice_id': fields.many2one(
-            'account.invoice', 'Match this invoice',
-            domain=[('reconciled', '=', False)]),
-        'manual_move_line_id': fields.many2one(
-            'account.move.line', 'Or match this entry',
-            domain=[('account_id.reconcile', '=', True),
-                    ('reconcile_id', '=', False)]),
         'manual_invoice_ids': fields.many2many(
             'account.invoice',
             'banking_transaction_wizard_account_invoice_rel',
-            'wizard_id', 'invoice_id', string='Match following invoices',
+            'wizard_id', 'invoice_id', string='Match one or more invoices',
             domain=[('reconciled', '=', False)]),
         'manual_move_line_ids': fields.many2many(
             'account.move.line',
             'banking_transaction_wizard_account_move_line_rel',
-            'wizard_id', 'move_line_id',   string='Or match this entries',
+            'wizard_id', 'move_line_id', string='Or match one or more entries',
             domain=[('account_id.reconcile', '=', True),
                     ('reconcile_id', '=', False)]),
         'payment_option': fields.related('import_transaction_id','payment_option', string='Payment Difference', type='selection', required=True,

=== modified file 'account_banking/wizard/banking_transaction_wizard.xml'
--- account_banking/wizard/banking_transaction_wizard.xml	2013-04-24 14:36:15 +0000
+++ account_banking/wizard/banking_transaction_wizard.xml	2013-06-05 08:37:47 +0000
@@ -82,35 +82,9 @@
                                         name="trigger_match"
                                         type="object"
                                         string="Match again"/>
-                                <!-- Manual selection -->
                             </page>
+                            <!-- Manual selection -->
                             <page string="Manual match">
-                                <field name="manual_invoice_id"
-                                       context="{'search_default_partner_id': partner_id}"
-                                       />
-                                <!-- 
-                                     Specify alternative tree_view_ref as a
-                                     workaround for lp:1073521 in OpenERP 6.1
-                                     Need to also define 'view_mode' to prevent
-                                     an instant editable tree view
-                                     reconstruction by account.move.line's
-                                     fields_view_get().
-                                     Both are not needed in OpenERP 6.0 or 7.0.
-                                -->
-                                <field name="manual_move_line_id"
-                                       context="{
-                                                    'search_default_partner_id': partner_id,
-                                                    'tree_view_ref': 'account.view_move_line_tax_tree',
-                                                    'view_mode': 'yes'
-                                                }"
-                                       />
-                                <newline/>
-                                <button colspan="1"
-                                        name="trigger_write"
-                                        type="object"
-                                        string="Match"/>
-                            </page>
-                            <page string="Multiple manual matches" attrs="{'invisible': ['|', ('match_type', '!=', False), ('statement_line_parent_id', '!=', False)]}">
                                 <field name="manual_invoice_ids" colspan="4"
                                        context="{'search_default_partner_id': partner_id}"
                                        />
@@ -146,7 +120,7 @@
                         </notebook>
                         <group colspan="2">
                             <separator/>
-                            <button icon="gtk-ok" string="Done" special="cancel"/>
+                            <button icon="gtk-ok" string="Close" special="cancel"/>
                         </group>
                     </group>
                 </form>