Merge lp:~banking-addons-drivers/banking-addons/direct-debit-refactoring-fosdem into lp:banking-addons

[Stéphane Bidoul (Acsone)]

[IMP] direct debit refactoring for less dependencies - Acsone/Akretion sprint at Fosdem 2014

Refactoring of direct debit to pull less dependencies.

Result of a sprint with Akexis de Lattre in a corridor at Fosdem 2014.

In a nutshell, this MP moves the hooks that are necessary for account_direct_debit from account_banking_payment to account_banking_payment_export, resulting in a leaner dependency graph [1].

account_banking_payment (and thus account_banking core) is therefore not necessary anymore for doing direct debit.
account_banking_payment can now be seen as providing two essential functions:
1/ adding the notion of transfer account on payment modes (marking the invoices paid as soon as the payment order is sent)
2/ bridging with the bank statement reconciliation features of account_banking core

IMO, the next step in the refactoring process would be to move 1/ to a stand-alone module.

Other things in this branch:
- removing auto_install=True that we found unnecessary and potentially risky
- demo data by Alexis
- a trivial bug fix
- setting noupdate=1 for the SEPA payment mode types
- allow payment of customer refunds lp:1275478

[1] http://t.co/sWjVgAZdO2

[Holger Brunn (Therp) (hbrunn)]

I was doubting about line2bank's signature change, but that seems fine

review: Approve (code review)

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

space lacking between ',' and '0' line 220, but LGTM

review: Approve

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks, looks really good.

About the auto_install values: I think the one in line 103 was a copy/paste error when account_banking_payment_export was split off from account_banking_payment. However, the one in account_banking_payment was always there on purpose as it made sense to install the payment part of account_banking when both account_banking and account_payment were installed. I think it still makes sense with the new dependencies account_banking and account_banking_payment_export, so I'd like to keep the one in line 36.

review: Needs Fixing

[Stefan Rijnhart (Opener) (stefan-opener)]

Oh, almost missed the files that you move from account_banking_payment to account_direct_debit. This includes the definition of the fields that are used in the integration that the former module accomplishes between the payment order and invoice workflows, and I'm afraid that this causes a severe breakage. If I now have account_banking_payment installed (but not account_direct_debit) I cannot even select invoices on a payment order because "Field 'payment_term_ids' does not exist in object 'browse_record(payment.mode, 1)". And that is just the start.

Any idea how to solve this?

review: Needs Fixing

[lp:~banking-addons-drivers/banking-addons/direct-debit-refactoring-fosdem]

240. By Stéphane Bidoul (Acsone) on 2014-02-16

put back auto_install=True in account_banking_payment

https://code.launchpad.net/~banking-addons-drivers/banking-addons/direct-debit-refactoring-fosdem/+merge/204391/comments/483578

241. By Stéphane Bidoul (Acsone) on 2014-02-16

[MRG] merge Alexis' contribution about payment of customer refunds

Unmerged revisions

241. By Stéphane Bidoul (Acsone) on 2014-02-16

[MRG] merge Alexis' contribution about payment of customer refunds

240. By Stéphane Bidoul (Acsone) on 2014-02-16

put back auto_install=True in account_banking_payment

https://code.launchpad.net/~banking-addons-drivers/banking-addons/direct-debit-refactoring-fosdem/+merge/204391/comments/483578

239. By Alexis de Lattre on 2014-02-02

Add demo data.
Fix a noupdate="0" to noupdate="1"

238. By Alexis de Lattre on 2014-02-02

FIX crash when adding invoice lines in SEPA Credit Transfer. This bug was linked to the removal of account_banking_payment_export/model/payment_order_create.py in commit revno 230.

237. By Stéphane Bidoul (Acsone) on 2014-02-01

remove auto_install

236. By Stéphane Bidoul (Acsone) on 2014-02-01

[IMP] _fix_payment_mode_id is gone

235. By Stéphane Bidoul (Acsone) on 2014-02-01

[IMP] copyright and documentation

234. By Stéphane Bidoul (Acsone) on 2014-02-01

[IMP] documentation

233. By Stéphane Bidoul (Acsone) on 2014-02-01

[FIX] move SEPA direct debit menu entries to a menu that does not depend on the core account_banking

232. By Stéphane Bidoul (Acsone) on 2014-02-01

[FIX] trivial bug fix

=== modified file 'account_banking_pain_base/banking_export_pain.py'
--- account_banking_pain_base/banking_export_pain.py	2014-01-13 12:41:25 +0000
+++ account_banking_pain_base/banking_export_pain.py	2014-02-16 13:21:01 +0000
@@ -295,7 +295,7 @@
             party_agent_bic = etree.SubElement(
                 party_agent_institution, gen_args.get('bic_xml_tag'))
             party_agent_bic.text = bic
-        except except_orm:
+        except orm.except_orm:
             if order == 'C':
                 if iban[0:2] != gen_args['initiating_party_country_code']:
                     raise orm.except_orm(
 
=== modified file 'account_banking_payment/__openerp__.py'
--- account_banking_payment/__openerp__.py	2013-11-07 22:22:19 +0000
+++ account_banking_payment/__openerp__.py	2014-02-16 13:21:01 +0000
@@ -37,13 +37,10 @@
     'data': [
         'view/account_payment.xml',
         'view/banking_transaction_wizard.xml',
-        'view/payment_mode.xml',
-        'view/payment_mode_type.xml',
-        'view/payment_order_create_view.xml',
         'workflow/account_payment.xml',
     ],
     'description': '''
-    This addon adds payment infrastructure to the Banking Addons.
+    This addon adds payment reconciliation infrastructure to the Banking Addons.
 
     * Extends payments for digital banking:
       + Adapted workflow in payments to reflect banking operations
 
=== modified file 'account_banking_payment/model/__init__.py'
--- account_banking_payment/model/__init__.py	2013-11-13 20:53:00 +0000
+++ account_banking_payment/model/__init__.py	2014-02-16 13:21:01 +0000
@@ -1,8 +1,5 @@
 import account_payment
 import payment_line
-import payment_mode_type
-import payment_mode
-import payment_order_create
 import banking_import_transaction
 import banking_transaction_wizard
 import banking_import_line
 
=== modified file 'account_banking_payment/model/account_payment.py'
--- account_banking_payment/model/account_payment.py	2013-11-07 22:22:19 +0000
+++ account_banking_payment/model/account_payment.py	2014-02-16 13:21:01 +0000
@@ -104,18 +104,9 @@
                   "execution."
                  )
             ),
-        'payment_order_type': fields.selection(
-            [('payment', 'Payment'),('debit', 'Direct debit')],
-            'Payment order type', required=True,
-            readonly=True, states={'draft': [('readonly', False)]},
-            ),
         'date_sent': fields.date('Send date', readonly=True),
     }
 
-    _defaults = {
-        'payment_order_type': 'payment',
-        }
-
     def _write_payment_lines(self, cr, uid, ids, **kwargs):
         '''
         ORM method for setting attributes of corresponding payment.line objects.
 
=== modified file 'account_banking_payment_export/__openerp__.py'
--- account_banking_payment_export/__openerp__.py	2013-09-11 21:04:40 +0000
+++ account_banking_payment_export/__openerp__.py	2014-02-16 13:21:01 +0000
@@ -3,7 +3,8 @@
 #
 #    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
 #              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
-#            
+#              (C) 2013 - 2014 ACSONE SA (<http://acsone.eu>).
+#
 #    All other contributions are (C) by their respective contributors
 #
 #    All Rights Reserved
@@ -52,6 +53,7 @@
         'data/payment_mode_type.xml',
         'security/ir.model.access.csv',
     ],
+    'demo': ['demo/banking_demo.xml'],
     'description': '''
         Infrastructure to export payment orders.
 
@@ -63,7 +65,7 @@
         * a better implementation of payment_mode.suitable_bank_types() based on payment.mode.type
         * the "make payment" button launches a wizard depending on the payment.mode.type
         * a manual payment mode type is provided as an example, with a default "do nothing" wizard
+        * a couple of improvements the the payment order creation wizard
     ''',
-    'auto_install': True,
     'installable': True,
 }
 
=== added directory 'account_banking_payment_export/demo'
=== added file 'account_banking_payment_export/demo/banking_demo.xml'
--- account_banking_payment_export/demo/banking_demo.xml	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/demo/banking_demo.xml	2014-02-16 13:21:01 +0000
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<openerp>
+<data noupdate="1">
+
+<record id="bank_fortuneo" model="res.bank">
+    <field name="name">Fortuneo Banque</field>
+    <field name="bic">FTNOFRP1XXX</field>
+    <field name="street">26 avenue des Champs Elysées</field>
+    <field name="zip">75008</field>
+    <field name="city">Paris</field>
+    <field name="country" ref="base.fr"/>
+</record>
+
+<record id="bank_la_banque_postale" model="res.bank">
+    <field name="name">La Banque Postale</field>
+    <field name="bic">PSSTFRPPXXX</field>
+    <field name="street">115 rue de Sèvres</field>
+    <field name="zip">75007</field>
+    <field name="city">Paris</field>
+    <field name="country" ref="base.fr"/>
+</record>
+
+<record id="main_company_iban" model="res.partner.bank">
+    <field name="acc_number">FR76 4242 4242 4242 4242 4242 424</field>
+    <field name="state">iban</field>
+    <field name="bank" ref="bank_la_banque_postale"/>
+    <field name="partner_id" ref="base.main_partner" />
+    <field name="bank_name">La Banque Postale</field>
+    <field name="bank_bic">PSSTFRPPXXX</field>
+</record>
+
+<record id="res_partner_12_iban" model="res.partner.bank">
+    <field name="acc_number">FR66 1212 1212 1212 1212 1212 121</field>
+    <field name="state">iban</field>
+    <field name="bank" ref="bank_fortuneo"/>
+    <field name="partner_id" ref="base.res_partner_12" />
+    <field name="bank_name">Fortuneo Banque</field>
+    <field name="bank_bic">FTNOFRP1XXX</field>
+</record>
+
+</data>
+</openerp>
 
=== modified file 'account_banking_payment_export/model/__init__.py'
--- account_banking_payment_export/model/__init__.py	2013-09-23 17:21:51 +0000
+++ account_banking_payment_export/model/__init__.py	2014-02-16 13:21:01 +0000
@@ -1,5 +1,6 @@
+from . import account_move_line
 from . import account_payment
 from . import bank_payment_manual
 from . import payment_mode
 from . import payment_mode_type
-from . import payment_order_create
 \ No newline at end of file
+from . import payment_order_create
 
=== added file 'account_banking_payment_export/model/account_move_line.py'
--- account_banking_payment_export/model/account_move_line.py	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/model/account_move_line.py	2014-02-16 13:21:01 +0000
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2004-2014 OpenERP S.A. (http://www.openerp.com/)
+#              (C) 2014 Akretion (http://www.akretion.com/)
+#
+#    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, fields
+from operator import itemgetter
+
+
+# All the code below aims at fixing one small issue in _to_pay_search()
+# But _to_pay_search() is the search function of the field 'amount_to_pay'
+# which is a field.function and these functions are not inheritable in OpenERP.
+# So we have to inherit the field 'amount_to_pay' and duplicate the related
+# functions
+# If the patch that I proposed in this bug report
+# https://bugs.launchpad.net/openobject-addons/+bug/1275478
+# is integrated in addons/account_payment, then we will be able to remove this
+# file.         -- Alexis de Lattre
+class account_move_line(orm.Model):
+    _inherit = 'account.move.line'
+
+    def amount_to_pay(self, cr, uid, ids, name, arg=None, context=None):
+        """ Return the amount still to pay regarding all the payemnt orders
+        (excepting cancelled orders)"""
+        if not ids:
+            return {}
+        cr.execute("""SELECT ml.id,
+                    CASE WHEN ml.amount_currency < 0
+                        THEN - ml.amount_currency
+                        ELSE ml.credit
+                    END -
+                    (SELECT coalesce(sum(amount_currency),0)
+                        FROM payment_line pl
+                            INNER JOIN payment_order po
+                                ON (pl.order_id = po.id)
+                        WHERE move_line_id = ml.id
+                        AND po.state != 'cancel') AS amount
+                    FROM account_move_line ml
+                    WHERE id IN %s""", (tuple(ids),))
+        r = dict(cr.fetchall())
+        return r
+
+    def _to_pay_search(self, cr, uid, obj, name, args, context=None):
+        if not args:
+            return []
+        line_obj = self.pool.get('account.move.line')
+        query = line_obj._query_get(cr, uid, context={})
+        where = ' and '.join(map(lambda x: '''(SELECT
+        CASE WHEN l.amount_currency < 0
+            THEN - l.amount_currency
+            ELSE l.credit
+        END - coalesce(sum(pl.amount_currency), 0)
+        FROM payment_line pl
+        INNER JOIN payment_order po ON (pl.order_id = po.id)
+        WHERE move_line_id = l.id
+        AND po.state != 'cancel'
+        ) %(operator)s %%s ''' % {'operator': x[1]}, args))
+        sql_args = tuple(map(itemgetter(2), args))
+
+        cr.execute(('''SELECT id
+            FROM account_move_line l
+            WHERE account_id IN (select id
+                FROM account_account
+                WHERE type in %s AND active)
+            AND reconcile_id IS null
+            AND credit > 0
+            AND ''' + where + ' and ' + query),
+            (('payable', 'receivable'),)+sql_args )
+        # The patch we have compared to the original function in
+        # addons/account_payment is just above :
+        # original code : type = 'payable'
+        # fixed code :    type in ('payable', 'receivable')
+
+        res = cr.fetchall()
+        if not res:
+            return [('id', '=', '0')]
+        return [('id', 'in', map(lambda x:x[0], res))]
+
+    _columns = {
+        'amount_to_pay': fields.function(amount_to_pay,
+            type='float', string='Amount to pay', fnct_search=_to_pay_search),
+    }
 
=== renamed file 'account_banking_payment/model/payment_order_create.py' => 'account_banking_payment_export/model/payment_order_create.py'
--- account_banking_payment/model/payment_order_create.py	2013-12-05 09:18:43 +0000
+++ account_banking_payment_export/model/payment_order_create.py	2014-02-16 13:21:01 +0000
@@ -34,7 +34,7 @@
             self, cr, uid, payment_order, domain, context=None):
         if payment_order.payment_order_type == 'payment':
             domain += [
-                ('account_id.type', '=', 'payable'),
+                ('account_id.type', 'in', ('payable', 'receivable')),
                 ('amount_to_pay', '>', 0)
                 ]
         return True
 
=== removed file 'account_banking_payment_export/model/payment_order_create.py'
--- account_banking_payment_export/model/payment_order_create.py	2013-09-12 07:06:09 +0000
+++ account_banking_payment_export/model/payment_order_create.py	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013 ACSONE SA/NV (<http://acsone.eu>);.
-#            
-#    All other contributions are (C) by their respective contributors
-#
-#    All Rights Reserved
-#
-#    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 payment_order_create(orm.TransientModel):
-    _inherit = 'payment.order.create'
-
-    def create_payment(self, cr, uid, ids, context=None):
-        '''This method adapts the core create_payment() 
-        to pass the payment mode to line2bank() through the context,
-        so it is in turn propagated to suitable_bank_types().
-        
-        This is necessary because the core does not propagate the payment mode to line2bank: t = None in
-        http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/view/head:/account_payment/wizard/account_payment_order.py#L72
-        
-        Hack idea courtesy Stefan Rijnhart.
-        '''
-        if context is None:
-            context = {}
-        order_obj = self.pool.get('payment.order')
-        payment = order_obj.browse(cr, uid, context['active_id'], context=context)
-        context['_fix_payment_mode_id'] = payment.mode.id
-        return super(payment_order_create, self).create_payment(cr, uid, ids, context=context)
-    
-
-class account_move_line(orm.Model):
-    _inherit = 'account.move.line'
-    
-    def line2bank(self, cr, uid, ids, payment_mode_id=None, context=None):
-        '''Obtain payment_type from context, see create_payment above'''
-        if context is None:
-            context = {}
-        payment_mode_id = payment_mode_id or context.get('_fix_payment_mode_id')
-        return super(account_move_line, self).line2bank(cr, uid, ids, payment_mode_id, context=context)
-
 
=== modified file 'account_banking_sepa_credit_transfer/__openerp__.py'
--- account_banking_sepa_credit_transfer/__openerp__.py	2013-11-21 23:41:32 +0000
+++ account_banking_sepa_credit_transfer/__openerp__.py	2014-02-16 13:21:01 +0000
@@ -36,6 +36,7 @@
         'data/payment_type_sepa_sct.xml',
         'security/ir.model.access.csv',
     ],
+    'demo': ['sepa_credit_transfer_demo.xml'],
     'description': '''
 Module to export payment orders in SEPA XML file format.
 
 
=== added file 'account_banking_sepa_credit_transfer/sepa_credit_transfer_demo.xml'
--- account_banking_sepa_credit_transfer/sepa_credit_transfer_demo.xml	1970-01-01 00:00:00 +0000
+++ account_banking_sepa_credit_transfer/sepa_credit_transfer_demo.xml	2014-02-16 13:21:01 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<openerp>
+<data noupdate="1">
+
+<record id="sepa_credit_transfer_mode" model="payment.mode">
+    <field name="name">SEPA Credit Transfer La Banque Postale</field>
+    <field name="journal" ref="account.bank_journal"/>
+    <field name="bank_id" ref="account_banking_payment_export.main_company_iban"/>
+    <field name="company_id" ref="base.main_company"/>
+    <field name="type" ref="export_sepa_sct_001_001_03"/>
+</record>
+
+</data>
+</openerp>
 
=== modified file 'account_banking_sepa_direct_debit/__openerp__.py'
--- account_banking_sepa_direct_debit/__openerp__.py	2013-12-15 23:46:50 +0000
+++ account_banking_sepa_direct_debit/__openerp__.py	2014-02-16 13:21:01 +0000
@@ -44,6 +44,7 @@
         'data/mandate_reference_sequence.xml',
         'security/ir.model.access.csv',
     ],
+    'demo': ['sepa_direct_debit_demo.xml'],
     'description': '''
 Module to export direct debit payment orders in SEPA XML file format.
 
 
=== modified file 'account_banking_sepa_direct_debit/data/payment_type_sdd.xml'
--- account_banking_sepa_direct_debit/data/payment_type_sdd.xml	2013-11-07 11:57:26 +0000
+++ account_banking_sepa_direct_debit/data/payment_type_sdd.xml	2014-02-16 13:21:01 +0000
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="0"> <!--  TODO : put to 1 when dev of the module is finished -->
-
-
-<!-- TODO In the suitable_bank_types field, we should add l10n_fr_rib via a small stupid module -->
+<data noupdate="1">
+
+
 <record id="export_sdd_008_001_02" model="payment.mode.type">
     <field name="name">SEPA Direct Debit v02 (recommended)</field>
     <field name="code">pain.008.001.02</field>
@@ -32,6 +31,5 @@
 </record>
 
 
-
 </data>
 </openerp>
 
=== modified file 'account_banking_sepa_direct_debit/sdd_mandate_view.xml'
--- account_banking_sepa_direct_debit/sdd_mandate_view.xml	2013-12-15 23:46:50 +0000
+++ account_banking_sepa_direct_debit/sdd_mandate_view.xml	2014-02-16 13:21:01 +0000
@@ -97,7 +97,7 @@
 </record>
 
 <menuitem id="sdd_mandate_menu"
-          parent="account_banking.menu_finance_banking_settings"
+          parent="account_payment.menu_main_payment"
           action="sdd_mandate_action"
           sequence="20"
           />
 
=== added file 'account_banking_sepa_direct_debit/sepa_direct_debit_demo.xml'
--- account_banking_sepa_direct_debit/sepa_direct_debit_demo.xml	1970-01-01 00:00:00 +0000
+++ account_banking_sepa_direct_debit/sepa_direct_debit_demo.xml	2014-02-16 13:21:01 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<openerp>
+<data noupdate="1">
+
+<record id="sepa_direct_debit_mode" model="payment.mode">
+    <field name="name">SEPA Direct Debit La Banque Postale</field>
+    <field name="journal" ref="account.bank_journal"/>
+    <field name="bank_id" ref="account_banking_payment_export.main_company_iban"/>
+    <field name="company_id" ref="base.main_company"/>
+    <field name="type" ref="export_sdd_008_001_02"/>
+</record>
+
+<record id="base.main_company" model="res.company">
+    <field name="sepa_creditor_identifier">FR78ZZZ424242</field>
+</record>
+
+<record id="res_partner_12_mandate" model="sdd.mandate">
+    <field name="partner_bank_id" ref="account_banking_payment_export.res_partner_12_iban"/>
+    <field name="type">recurrent</field>
+    <field name="recurrent_sequence_type">first</field>
+    <field name="signature_date">2014-02-01</field>
+    <field name="state">valid</field>
+</record>
+
+</data>
+</openerp>
 
=== modified file 'account_banking_tests/__openerp__.py'
--- account_banking_tests/__openerp__.py	2013-09-26 12:51:39 +0000
+++ account_banking_tests/__openerp__.py	2014-02-16 13:21:01 +0000
@@ -37,6 +37,5 @@
 run the tests manually, you don't even have to install this module,
 only its dependencies.
     ''',
-    'auto_install': False,
     'installable': True,
 }
 
=== modified file 'account_direct_debit/__openerp__.py'
--- account_direct_debit/__openerp__.py	2013-09-13 09:26:06 +0000
+++ account_direct_debit/__openerp__.py	2014-02-16 13:21:01 +0000
@@ -25,10 +25,13 @@
     'author': ['Therp BV', 'Smile'],
     'website': 'https://launchpad.net/banking-addons',
     'category': 'Banking addons',
-    'depends': ['account_banking_payment'],
+    'depends': ['account_banking_payment_export'],
     'data': [
         'view/account_payment.xml',
         'view/account_invoice.xml',
+        'view/payment_mode.xml',
+        'view/payment_mode_type.xml',
+        'view/payment_order_create_view.xml',
         'workflow/account_invoice.xml',
         'data/account_payment_term.xml',
     ],
 
=== modified file 'account_direct_debit/model/__init__.py'
--- account_direct_debit/model/__init__.py	2013-05-28 13:37:47 +0000
+++ account_direct_debit/model/__init__.py	2014-02-16 13:21:01 +0000
@@ -2,4 +2,6 @@
 import payment_line
 import account_move_line
 import account_invoice
+import payment_mode_type
+import payment_mode
 import payment_order_create
 
=== modified file 'account_direct_debit/model/account_move_line.py'
--- account_direct_debit/model/account_move_line.py	2013-11-07 22:22:19 +0000
+++ account_direct_debit/model/account_move_line.py	2014-02-16 13:21:01 +0000
@@ -27,7 +27,7 @@
     _inherit = "account.move.line"
 
     def amount_to_receive(self, cr, uid, ids, name, arg={}, context=None):
-        """ 
+        """
         Return the amount still to receive regarding all the debit orders
         (excepting canceled orders).
         This is the reverse from amount_to_pay() in
@@ -87,7 +87,7 @@
             return [('id', '=', '0')]
         return [('id', 'in', map(lambda x:x[0], res))]
 
-    def line2bank(self, cr, uid, ids, payment_mode_id=None, context=None):
+    def line2bank(self, cr, uid, ids, payment_mode_id, context=None):
         '''I have to inherit this function for direct debits to fix the
         following issue : if the customer invoice has a value for
         'partner_bank_id', then it will take this partner_bank_id
@@ -98,8 +98,6 @@
         if context is None:
             context = {}
         pay_mode_obj = self.pool['payment.mode']
-        payment_mode_id = (
-            payment_mode_id or context.get('_fix_payment_mode_id'))
         if payment_mode_id:
             pay_mode = pay_mode_obj.browse(
                 cr, uid, payment_mode_id, context=context)
@@ -116,7 +114,7 @@
                                 break
                 return line2bank
         return super(account_move_line, self).line2bank(
-            cr, uid, ids, payment_mode_id=payment_mode_id, context=context)
+            cr, uid, ids, payment_mode_id, context=context)
 
     _columns = {
         'amount_to_receive': fields.function(
 
=== modified file 'account_direct_debit/model/account_payment.py'
--- account_direct_debit/model/account_payment.py	2013-11-20 23:24:56 +0000
+++ account_direct_debit/model/account_payment.py	2014-02-16 13:21:01 +0000
@@ -19,3 +19,15 @@
                         return False
         return super(payment_order, self).test_undo_done(
             cr, uid, ids, context=context)
+        
+    _columns = {
+        'payment_order_type': fields.selection(
+            [('payment', 'Payment'),('debit', 'Direct debit')],
+            'Payment order type', required=True,
+            readonly=True, states={'draft': [('readonly', False)]},
+            ),
+    }
+
+    _defaults = {
+        'payment_order_type': 'payment',
+    }
 
=== renamed file 'account_banking_payment/model/payment_mode.py' => 'account_direct_debit/model/payment_mode.py'
=== renamed file 'account_banking_payment/model/payment_mode_type.py' => 'account_direct_debit/model/payment_mode_type.py'
=== renamed file 'account_banking_payment/view/payment_mode.xml' => 'account_direct_debit/view/payment_mode.xml'
=== renamed file 'account_banking_payment/view/payment_mode_type.xml' => 'account_direct_debit/view/payment_mode_type.xml'
=== renamed file 'account_banking_payment/view/payment_order_create_view.xml' => 'account_direct_debit/view/payment_order_create_view.xml'