From 059e8d442041a60d0718146b21d14a4ebccaf60e Mon Sep 17 00:00:00 2001
From: OpenERP instance user <oersmldev6@midgard.therp.nl>
Date: Wed, 21 Dec 2011 14:06:26 +0100
Subject: [PATCH] [ADD] field 'residual' in bank statement line trees [RFR]
 field 'match_type' on bank statement lines is now a related field [FIX] bug:
 invoices with state 'debid denied' are selected for new nebit orders [ADD]
 filter button on invoices search view for state 'debit denied' [FIX] invoice
 workflow does not allow reopening of invoices in state debit denied [FIX]
 match wizard does not show payment line but move line for storno type matches

---
 account_banking/__openerp__.py                |  2 +-
 account_banking/account_banking_view.xml      |  2 ++
 account_banking/bank_import_transaction.py    | 18 ++++++++----
 .../wizard/banking_transaction_wizard.py      |  2 +-
 .../wizard/banking_transaction_wizard.xml     |  4 +--
 account_direct_debit/__openerp__.py           |  2 +-
 .../model/account_move_line.py                | 28 +++++++++++++++++--
 account_direct_debit/model/account_payment.py |  5 +++-
 account_direct_debit/view/account_invoice.xml | 11 ++++++++
 .../workflow/account_invoice.xml              |  4 +--
 10 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/account_banking/__openerp__.py b/account_banking/__openerp__.py
index ffa6dfe06..17ffb796c 100644
--- a/account_banking/__openerp__.py
+++ b/account_banking/__openerp__.py
@@ -27,7 +27,7 @@
 ##############################################################################
 {
     'name': 'Account Banking',
-    'version': '0.1.89',
+    'version': '0.1.90',
     'license': 'GPL-3',
     'author': 'EduSense BV / Therp BV / Smile',
     'website': 'https://launchpad.net/banking-addons',
diff --git a/account_banking/account_banking_view.xml b/account_banking/account_banking_view.xml
index c6a533a65..0be3d8936 100644
--- a/account_banking/account_banking_view.xml
+++ b/account_banking/account_banking_view.xml
@@ -267,6 +267,7 @@
                     </xpath>
                     <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='amount']" position="after">
                         <field name="match_type"/>
+                        <field name="residual"/>
                         <button name="match_wizard" states="draft"
                                 string="Match"
                                 icon="terp-gtk-jump-to-ltr"
@@ -482,6 +483,7 @@
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                     <field name="amount"/>
                         <field name="match_type"/>
+                        <field name="residual"/>
                         <button name="match_wizard" states="draft"
                                 string="Match"
                                 icon="terp-gtk-jump-to-ltr"
diff --git a/account_banking/bank_import_transaction.py b/account_banking/bank_import_transaction.py
index d79e492d4..34647cb75 100644
--- a/account_banking/bank_import_transaction.py
+++ b/account_banking/bank_import_transaction.py
@@ -1334,7 +1334,7 @@ class banking_import_transaction(osv.osv):
                 values['partner_id'] = move_info['partner_id']
                 values['partner_bank_id'] = move_info['partner_bank_id']
                 values['type'] = move_info['type']
-                values['match_type'] = move_info['match_type']
+                # values['match_type'] = move_info['match_type']
             else:
                 values['partner_id'] = values['partner_bank_id'] = False
             if not values['partner_id'] and partner_ids and len(partner_ids) == 1:
@@ -1421,7 +1421,8 @@ class banking_import_transaction(osv.osv):
         res = dict([(x, False) for x in ids])
         move_line_obj = self.pool.get('account.move.line')
         for transaction in self.browse(cr, uid, ids, context):
-            if (transaction.match_type in 
+            if (transaction.statement_line_id.state == 'draft'
+                and transaction.match_type in 
                 [('invoice'), ('move'), ('manual')]):
                 rec_moves = (
                     transaction.move_line_id.reconcile_id and 
@@ -1580,11 +1581,16 @@ class account_bank_statement_line(osv.osv):
         'duplicate': fields.related(
             'import_transaction_id', 'duplicate', type='boolean',
             string='Possible duplicate import'),
-        'match_type': fields.selection(
-            [('manual', 'Manual'), ('move','Move'), ('invoice', 'Invoice'),
+        'match_type': fields.related(
+            'import_transaction_id', 'match_type', type='selection',
+            selection=[('manual', 'Manual'), ('move','Move'), ('invoice', 'Invoice'),
              ('payment', 'Payment'), ('payment_order', 'Payment order'),
-             ('storno', 'Storno'),
-             ], 'Match type', readonly=True),
+             ('storno', 'Storno')], string='Match type', readonly=True,
+            ),
+        'residual': fields.related(
+            'import_transaction_id', 'residual', type='float',
+            string='Residual', readonly=True,
+            ),
         'state': fields.selection(
             [('draft', 'Draft'), ('confirmed', 'Confirmed')], 'State',
             readonly=True, required=True),
diff --git a/account_banking/wizard/banking_transaction_wizard.py b/account_banking/wizard/banking_transaction_wizard.py
index f3f0a669a..cdf890153 100644
--- a/account_banking/wizard/banking_transaction_wizard.py
+++ b/account_banking/wizard/banking_transaction_wizard.py
@@ -254,7 +254,7 @@ class banking_transaction_wizard(osv.osv_memory):
             string='Write-off journal'),
         'payment_line_id': fields.related(
             'import_transaction_id', 'payment_line_id', string="Matching payment or storno", 
-            type='many2one', relation='payment.line'),
+            type='many2one', relation='payment.line', readonly=True),
         'payment_order_ids': fields.related(
             'import_transaction_id', 'payment_order_ids', string="Matching payment orders", 
             type='many2many', relation='payment.order'),
diff --git a/account_banking/wizard/banking_transaction_wizard.xml b/account_banking/wizard/banking_transaction_wizard.xml
index e8d392850..5874329e4 100644
--- a/account_banking/wizard/banking_transaction_wizard.xml
+++ b/account_banking/wizard/banking_transaction_wizard.xml
@@ -38,7 +38,7 @@
                                 <label colspan="2" string="Multiple matches were found for this bank transfer. You must pick one of the matches or select a match manually below." />
                             </group>
                             <field name='payment_line_id'
-                                   attrs="{'invisible': [('match_type', 'not in', [('payment', 'storno')])]}"
+                                   attrs="{'invisible': [('match_type', '!=', 'storno'),('match_type', '!=', 'payment')]}"
                                    />
                             <group attrs="{'readonly': [('match_multi', '!=' True)]}">
                                 <!-- show if we have an invoice type match (but the user may need to select from multiple options)
@@ -51,7 +51,7 @@
                                 <!-- show if we have a move type match or a manual match without an invoice_id
                                 -->
                                 <field name='move_line_id'
-                                       attrs="{'readonly': [('match_multi', '=', False)], 'invisible': ['|',('match_type', '!=', 'move'),('match_type', '=', 'manual'),('invoice_id', '!=', False)]}"
+                                       attrs="{'readonly': [('match_multi', '=', False)], 'invisible': [('match_type', '!=', 'move'),('invoice_id', '=', False)]}"
                                        domain="[('id', 'in', move_line_ids[0][2])]"
                                        />
                                 <field name='payment_order_id'
diff --git a/account_direct_debit/__openerp__.py b/account_direct_debit/__openerp__.py
index 2e55e56b6..cf158cd9b 100644
--- a/account_direct_debit/__openerp__.py
+++ b/account_direct_debit/__openerp__.py
@@ -26,7 +26,7 @@
 ##############################################################################
 {
     'name': 'Direct Debit',
-    'version': '6.0.1.89',
+    'version': '6.0.1.90',
     'license': 'GPL-3',
     'author': 'Therp BV / Smile',
     'website': 'https://launchpad.net/banking-addons',
diff --git a/account_direct_debit/model/account_move_line.py b/account_direct_debit/model/account_move_line.py
index a05af30c9..f93c8a077 100644
--- a/account_direct_debit/model/account_move_line.py
+++ b/account_direct_debit/model/account_move_line.py
@@ -96,8 +96,27 @@ class account_move_line(osv.osv):
         invoice_ids = invoice_obj.search(
             cr, uid, [('payment_term', args[0][1], args[0][2])],
             context=context)
-        operator = (args[0][1] not in ['in', '=', '==', 'like', 'ilike']
-                    and 'not in' or 'in')
+        operator = 'in' # (args[0][1] not in ['in', '=', '==', 'like', 'ilike']
+                        # and 'not in' or 'in')
+        if not invoice_ids:
+            return [('id', operator, [])]
+        cr.execute('SELECT l.id ' \
+                'FROM account_move_line l, account_invoice i ' \
+                'WHERE l.move_id = i.move_id AND i.id in %s', (tuple(invoice_ids),))
+        res = cr.fetchall()
+        if not res:
+            return [('id', '=', False)]
+        return [('id', operator, [x[0] for x in res])]
+
+    def _invoice_state_search(self, cr, uid, obj, name, args, context=None):
+        if not args:
+            return []
+        invoice_obj = self.pool.get('account.invoice')
+        invoice_ids = invoice_obj.search(
+            cr, uid, [('state', args[0][1], args[0][2])],
+            context=context)
+        operator = 'in' # (args[0][1] not in ['in', '=', '==', 'like', 'ilike']
+                        # and 'not in' or 'in')
         if not invoice_ids:
             return [('id', operator, [])]
         cr.execute('SELECT l.id ' \
@@ -118,6 +137,11 @@ class account_move_line(osv.osv):
             string='Select by invoice payment term',
             type='many2one', relation='account.payment.term',
             fnct_search=_invoice_payment_term_id_search),
+        'invoice_state': fields.function(
+            _dummy, method=True,
+            string='Select by invoice state',
+            type='char', size=24,
+            fnct_search=_invoice_state_search),
         }
 
 account_move_line()
diff --git a/account_direct_debit/model/account_payment.py b/account_direct_debit/model/account_payment.py
index c5c01949d..7114081fa 100644
--- a/account_direct_debit/model/account_payment.py
+++ b/account_direct_debit/model/account_payment.py
@@ -12,7 +12,9 @@ class payment_mode(osv.osv):
             domain=[('type', '=', 'other'),
                     ('reconcile', '=', True)],
             help=('Pay off lines in sent orders with a ' +
-                  'move on this account. For debit type modes only'),
+                  'move on this account. For debit type modes only. ' +
+                  'You can only select accounts of type regular that ' +
+                  'are marked for reconciliation'),
             ),
         'transfer_journal_id': fields.many2one(
             'account.journal', 'Transfer journal',
@@ -436,6 +438,7 @@ class payment_order_create(osv.osv_memory):
             domain = [
                 ('reconcile_id', '=', False),
                 ('account_id.type', '=', 'receivable'),
+                ('invoice_state', '!=', 'debit_denied'),
                 ('amount_to_receive', '>', 0),
                 ]
         else:
diff --git a/account_direct_debit/view/account_invoice.xml b/account_direct_debit/view/account_invoice.xml
index 1cae3023b..8429adb68 100644
--- a/account_direct_debit/view/account_invoice.xml
+++ b/account_direct_debit/view/account_invoice.xml
@@ -31,5 +31,16 @@
                </data>
             </field>
         </record>
+        <record id="view_account_invoice_filter" model="ir.ui.view">
+            <field name="name">account.invoice.select direct debit</field>
+            <field name="model">account.invoice</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="account.view_account_invoice_filter"/>
+            <field name="arch" type="xml">
+                <filter name="invoices" position="after">
+                    <filter name="debit_denied" icon="terp-dolar_ok!" string="Debit denied" domain="[('state','=','debit_denied')]" help="Show only invoices with state Debit denied"/>
+                </filter>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/account_direct_debit/workflow/account_invoice.xml b/account_direct_debit/workflow/account_invoice.xml
index 9d5ea20f6..d2588d8c1 100644
--- a/account_direct_debit/workflow/account_invoice.xml
+++ b/account_direct_debit/workflow/account_invoice.xml
@@ -20,8 +20,8 @@
         </record>
         <record id="debit_denied_to_open" model="workflow.transition">
             <field name="act_from" ref="act_debit_denied"/>
-            <field name="act_to" ref="account.act_open_test"/>
-            <field name="signal">open_test</field>
+            <field name="act_to" ref="account.act_open"/>
+            <field name="signal">invoice_open</field>
         </record>
     </data>
 </openerp>