banking-addons-team team mailing list archive

["Stefan Rijnhart \(Therp\)" <stefan@xxxxxxxx>]

Stefan Rijnhart (Therp) has proposed merging lp:~therp-nl/banking-addons/ba70-remove_leftover_manual_move_line_id into lp:banking-addons/banking-addons-70.

Requested reviews:
  Banking Addons Core Editors (banking-addons-team)

For more details, see:
https://code.launchpad.net/~therp-nl/banking-addons/ba70-remove_leftover_manual_move_line_id/+merge/176786
-- 
https://code.launchpad.net/~therp-nl/banking-addons/ba70-remove_leftover_manual_move_line_id/+merge/176786
Your team Banking Addons Core Editors is requested to review the proposed merge of lp:~therp-nl/banking-addons/ba70-remove_leftover_manual_move_line_id into lp:banking-addons/banking-addons-70.

=== modified file 'account_banking/banking_import_transaction.py'
--- account_banking/banking_import_transaction.py	2013-06-26 21:14:41 +0000
+++ account_banking/banking_import_transaction.py	2013-07-24 21:14:26 +0000
@@ -1211,8 +1211,6 @@
                     'match_type',
                     'move_line_id', 
                     'invoice_id', 
-                    'manual_invoice_id', 
-                    'manual_move_line_id',
                     ]] +
                      [(x, [(6, 0, [])]) for x in [
                         'move_line_ids',

=== modified file 'account_banking/wizard/banking_transaction_wizard.py'
--- account_banking/wizard/banking_transaction_wizard.py	2013-06-26 21:14:41 +0000
+++ account_banking/wizard/banking_transaction_wizard.py	2013-07-24 21:14:26 +0000
@@ -363,13 +363,6 @@
                 ('payment_order_manual', 'Payment order (manual)'),
                 ], 
             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',

=== modified file 'account_banking_payment/view/banking_transaction_wizard.xml'
--- account_banking_payment/view/banking_transaction_wizard.xml	2013-05-29 22:26:36 +0000
+++ account_banking_payment/view/banking_transaction_wizard.xml	2013-07-24 21:14:26 +0000
@@ -26,7 +26,7 @@
                            domain="[('id', 'in', payment_order_ids[0][2])]"
                            />
                 </field>
-                <field name="manual_move_line_id" position="after">
+                <field name="manual_move_line_ids" position="after">
                     <field name="manual_payment_line_id"/>
                     <field name="manual_payment_order_id"/>
                 </field>