Merge lp:~acsone-openerp/banking-addons/ba-70-payment-export-refactoring into lp:banking-addons

[Stéphane Bidoul (Acsone)]

[MRG] account_banking_payment_export

Refactoring of account_banking_payment to provide payment export infrastructure independently of bank statement reconciliation features.

Refactoring of account_banking_payment into
- account_banking_payment_export (export wizard hook, payment mode types, suitable bank types, etc)
- and account_banking_payment (workflow with sent state, transfer accounts, reconciliation, etc)

This allows using payment export (such as sepa credit transfer) independently of bank statement imports.
Account_payment_export does not depend on account_banking anymore, while remaining 100% compatible: when account_banking_payment is installed, the advanced worflow and reconciliation features are added.

Compatibility notes. In order to break the dependency on account_banking, the following minor changes were necessary
- the external id of manual_bank_tranfer payment mode type has changed
- the "Generated SEPA Credit Transfer files" moved to the Payment Orders menu
- manual and sepa credit transfers send the "done" signal when they are finished (instead of "sent") to remain compatible with the default workflow (however the advanced workflow in account_banking_payment supports both done and sent signals to transition from act_open to act_sent)

[lp:~acsone-openerp/banking-addons/ba-70-payment-export-refactoring]

180. By Stéphane Bidoul (Acsone) on 2013-08-10

[FIX] remove leftover of previous experiment

[Stéphane Bidoul (Acsone) (sbi)]

Would it be better to move the following to account_direct_debit?
- payment_term_ids field in payment.mode
- payment_order_type field on payment.mode.type
- payment_order_create.py

This would focus this module account_banking_payment_export on its real purpose, which is adding the hook for payment export wizards.

[Stéphane Bidoul (Acsone) (sbi)]

BTW, how does this all relate to lp:account-payment/account_payment_extension? #headache

[lp:~acsone-openerp/banking-addons/ba-70-payment-export-refactoring]

181. By Stéphane Bidoul (Acsone) on 2013-08-12

[MRG] Merge base_iban_bic_not_required

182. By Stéphane Bidoul (Acsone) on 2013-08-12

[MRG] Sync with 7.0 branch

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi Stéphane,

Thanks for this contrib, this is a good first step in merging this project into one ! I reviewed the structure/concept and it seems good to me. No deep look on the Python code though.

Regards,

Joël

review: Approve (structre/concept, not test)

[lp:~acsone-openerp/banking-addons/ba-70-payment-export-refactoring]

183. By Stéphane Bidoul (Acsone) on 2013-08-13

[IMP] clarify scope of account_banking_payment_export by moving some features back to account_banking_payment
[IMP] nicer manual payment wizard

184. By Stéphane Bidoul (Acsone) on 2013-08-13

[IMP] clarified comment about workflow in account_banking_sepa_credit_transfer

185. By Stéphane Bidoul (Acsone) on 2013-08-13

[IMP] clarify account_banking_payment_export module description

[Stéphane Bidoul (Acsone) (sbi)]

Hi,

Since the purpose of account_banking_payment_export module was still difficult to explain, I went back a little bit and reduced its scope to providing the payment export infrastructure, including the sample "manual" payment mode type, and nothing more.

It's now easy to grasp it's purpose. Other features from account_banking(_payment) can be split in other modules later.

While I was at it I made the manual payment wizard a bit nicer for 7.0.

-sbi

[lp:~acsone-openerp/banking-addons/ba-70-payment-export-refactoring]

186. By Stéphane Bidoul (Acsone) on 2013-08-22

declare conflict with lp:account-payment/account_payment_exention

[Stéphane Bidoul (Acsone) (sbi)]

Documented the conflict with lp:account-payment/account_payment_exention.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks for your hard work on that! I'm not enough familiar to speak about the merge in itself, but from what I can understand, sounds good.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> Thanks for your hard work on that! I'm not enough familiar to speak about the
> merge in itself, but from what I can understand, sounds good.

s/merge/split/

[lp:~acsone-openerp/banking-addons/ba-70-payment-export-refactoring]

187. By Stéphane Bidoul (Acsone) on 2013-08-30

[MRG] Sync with 7.0 branch

188. By Stéphane Bidoul (Acsone) on 2013-08-30

[MRG] Sync with 7.0 branch

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

Hi Stéphane,

thank you for your great work and apologies for the late review. My first impression is that the refactoring is very solid. Also, and importantly, upgrading any existing installation of banking-addons should be straightforward because of the dependency structure, as long as the new module is in the addons path.

Of course, there are a few details to discuss:

- Having account_banking_payment installed, rerouting signal done to state 'send' works when exporting the payment order, but when the reconciliation in account_banking attempts to finish the payment order workflow using the same signal, the payment order stays in the 'send' state. I'm sure there is a way to get this to work using the workflow engine, but depending on whether you are a fan of the workflow engine you could also consider creating a method on the payment order model that triggers 'sent' in account_banking_payment and 'done' in account_banking_payment_export.

- As far as I know, there is no way to craft a migration script that guarantees to move an xml-id to a *newly* installed module that has no common dependency with the originating module. You should probably keep the old module name as part of the manual order type xml-id, and we'll move it back on the next OpenERP major release migration.
- 'name' in the __openerp__.py manifest is the same for both payment modules, which makes it hard to distinguish in the interface

- There is a missing dependency on base_iban, due to the bank type specified in the manual payment mode type. As depending on base_iban is a little Eurocentric, you could consider making the payment mode types editable in the interface (and its data 'noupdate') + let the SEPA export module depend on base_iban itself (or depend on base_iban now and we'll keep the latter in mind).

- Are you very strongly against keeping our version line2bank in the export module? In the days of transitioning to SEPA, where multiple account numbers per partner are not uncommon, I think this is going to hurt a number of people. One option is to at least refactor it into a separate module. But I would prefer to have it in the export module for simplicity.

Not for this review but on a related note, I want to implement a general check on the presence of an account number in each line. Would you agree to have me put this in the export module once it is merged? It is after all, essential for the export of any order to a bank. Alexis already resorted to putting one in the SEPA module itself, but it is useful for all export formats.

review: Needs Fixing

[Stéphane Bidoul (Acsone) (sbi)]

Thanks for the review, Stefan.

- I'll look into the workflow issue. It's not immediately obvious to me why
it does not work.

- regarding the xml_id, if I keep "account_banking.manual_bank_transfer",
it requires to have account_banking installed, which is a dependency we
want to avoid. Or do I overlook something?

- I'm fine with the dependency on base_iban

- with line2bank, do you mean the payment_order_create class? I left it
alone because it was pulling the payment_term filter which is unrelated to
the pure payment export functionality (and also because I was not too sure
of its purpose). Does it make sense to keep the
payment_order_create.create_payment() method in account_payment_export and
leave the rest in account_payment? Perhaps you can help me explaining it's
purpose in the module manifest.

Regarding the check for the presence of an account number, I'm fine with
that.

In the same line of thought, I also saw that Alexis put a feature to
preserve the history of exported files in the sepa module. That's also a
generic requirement that could live in account_payment_export.

-sbi

On Sat, Sep 7, 2013 at 3:40 PM, Stefan Rijnhart (Therp) <email address hidden>wrote:

> Review: Needs Fixing
>
> Hi Stéphane,
>
> thank you for your great work and apologies for the late review. My first
> impression is that the refactoring is very solid. Also, and importantly,
> upgrading any existing installation of banking-addons should be
> straightforward because of the dependency structure, as long as the new
> module is in the addons path.
>
> Of course, there are a few details to discuss:
>
> - Having account_banking_payment installed, rerouting signal done to state
> 'send' works when exporting the payment order, but when the reconciliation
> in account_banking attempts to finish the payment order workflow using the
> same signal, the payment order stays in the 'send' state. I'm sure there is
> a way to get this to work using the workflow engine, but depending on
> whether you are a fan of the workflow engine you could also consider
> creating a method on the payment order model that triggers 'sent' in
> account_banking_payment and 'done' in account_banking_payment_export.
>
> - As far as I know, there is no way to craft a migration script that
> guarantees to move an xml-id to a *newly* installed module that has no
> common dependency with the originating module. You should probably keep the
> old module name as part of the manual order type xml-id, and we'll move it
> back on the next OpenERP major release migration.
> - 'name' in the __openerp__.py manifest is the same for both payment
> modules, which makes it hard to distinguish in the interface
>
> - There is a missing dependency on base_iban, due to the bank type
> specified in the manual payment mode type. As depending on base_iban is a
> little Eurocentric, you could consider making the payment mode types
> editable in the interface (and its data 'noupdate') + let the SEPA export
> module depend on base_iban itself (or depend on base_iban now and we'll
> keep the latter in mind).
>
> - Are you very strongly against keeping our version line2bank in the
> export module? In the days of transitio...

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

On 09/07/2013 05:57 PM, Stéphane Bidoul (Acsone) wrote:
> Thanks for the review, Stefan.
>
> - I'll look into the workflow issue. It's not immediately obvious to me why
> it does not work.

Hi Stéphane,

Sorry, problem between keyboard and chair here, as I was doing the
reconciliation of the payment order (admittedly fueled by my
unfamiliarity of using the same workflow signal for multiple
transitions). It works!

> - regarding the xml_id, if I keep "account_banking.manual_bank_transfer",
> it requires to have account_banking installed, which is a dependency we
> want to avoid. Or do I overlook something?

Yes, apparently. I thought we could pull this one off, as official
modules do use references to other modules, combined with the fact that
internally you can assign arbitrary 'module' labels in ir_model_data.
But when I test it, the installation process complains that
"account_banking.manual_bank_tranfer" refers to an uninstalled module.

I'm not sure what to do. If I upgrade an existing setup that contains a
payment mode with this type, the process breaks with 'null value in
column "type" violates not-null constraint'.

> - with line2bank, do you mean the payment_order_create class? I left it
> alone because it was pulling the payment_term filter which is unrelated to
> the pure payment export functionality (and also because I was not too sure
> of its purpose).

It is actually not line2bank itself, but making it work properly. The
fix is twofold. First, it is reading suitable bank types from the
payment mode type. You kept this bit. The other part is passing the
payment order mode to line2bank. As you can see here, OpenERP does not
do this:
http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/view/head:/account_payment/wizard/account_payment_order.py#L72.

> Does it make sense to keep the
> payment_order_create.create_payment() method in account_payment_export and
> leave the rest in account_payment? Perhaps you can help me explaining it's
> purpose in the module manifest.

Account_banking_payment overwrites payment_order_create.create_payment()
but you don't have to do that if you agree to apply the following trick:
wrap around create_payment to extract the payment mode id and put it in
the context + call super(). Then also wrap around line2bank and extract
the id from the context again, if the payment mode id passed to
line2bank is None + call super() with it.

(the payment term filter is an optional way to use the payment term to
preselect the manner of payment through partner settings or at invoicing
time. This is particularly useful for debit orders because of the
required mandates per partner)

Cheers,
Stefan.

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

One option to move the xml id could be to update the record in ir_model_data using an SQL query in account_banking_payment_export, in payment.mode.type's _auto_init() method. I think that would give it the right timing. It will run every time the module is upgraded which is ugly but the overhead is negligible.

[Stéphane Bidoul (Acsone) (sbi)]

I was considering that approach too. I'll give it a try.

-sbi
Le 8 sept. 2013 11:08, "Stefan Rijnhart (Therp)" <email address hidden> a écrit :

> One option to move the xml id could be to update the record in
> ir_model_data using an SQL query in account_banking_payment_export, in
> payment.mode.type's _auto_init() method. I think that would give it the
> right timing. It will run every time the module is upgraded which is ugly
> but the overhead is negligible.
>
> --
>
> https://code.launchpad.net/~acsone-openerp/banking-addons/ba-70-payment-export-refactoring/+merge/179543
> You proposed
> lp:~acsone-openerp/banking-addons/ba-70-payment-export-refactoring for
> merging.
>

[lp:~acsone-openerp/banking-addons/ba-70-payment-export-refactoring]

189. By Stéphane Bidoul (Acsone) on 2013-09-11

[IMP] module name, base_iban_dependency and migration of manual_bank_transfer

190. By Stéphane Bidoul (Acsone) on 2013-09-11

[IMP] propagate payment mode from create_payment to line2bank

191. By Stéphane Bidoul (Acsone) on 2013-09-11

[FIX] missing return
[IMP] docstring

192. By Stéphane Bidoul (Acsone) on 2013-09-12

[IMP] remove comment from the v5 era

193. By Stéphane Bidoul (Acsone) on 2013-09-12

pep8

194. By Stéphane Bidoul (Acsone) on 2013-09-12

pep8

195. By Stéphane Bidoul (Acsone) on 2013-09-12

[FIX] missing import

196. By Stéphane Bidoul (Acsone) on 2013-09-12

whitespace and pep8

197. By Stéphane Bidoul (Acsone) on 2013-09-12

[FIX] fix payment.mode.type view inheritance

[Stéphane Bidoul (Acsone) (sbi)]

Hi again,

Here is a new version.

I adressed all of Stefan's comments:
- module name
- base_iban dependency
- migration of manual_bank_transfer xml id
- the trick/hack/thing about making line2bank receive the payment mode :)

@Stefan, have you ever attempted to integrate that last one in a MP to the core?
The fix there would be simple, although difficult to explain in a bug report.

plus:
- a bit of pep8
- a view bug I discovered while testing

review: Needs Resubmitting

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

Thanks. The code looks good. One nit:

l.1286: would it be alright with you to put the changes to the move line model in a separate file, following the (relatively recent) conventions in this series of modules?

I would still like a couple of days for testing before I can definately approve, but it's looking really good.

About line2bank in the core: it's just a remnant after payment.mode.type was removed from the core in OpenERP 6.0 so the proper fix would be to replace it in the core with a method that transparently selects the partner's first bank account. I don't see what this project wins with that, as a hack like the one we came up with would still be needed.

[Stéphane Bidoul (Acsone) (sbi)]

On Fri, Sep 13, 2013 at 9:57 AM, Stefan Rijnhart (Therp) <email address hidden>wrote:

> l.1286: would it be alright with you to put the changes to the move line
> model in a separate file, following the (relatively recent) conventions in
> this series of modules?
>

I considered that too, but in the end I decided that since the two parts of
the hack where so closely related that it would make the code much harder
to understand if it was split in two files. After all, python never
enforced a one-class-per-file rule like java, and in this case it made
sense to keep them together. What do you think?

-sbi

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

Good point, let's keep them together.

[lp:~acsone-openerp/banking-addons/ba-70-payment-export-refactoring]

198. By Stéphane Bidoul (Acsone) on 2013-09-23

[IMP] use local imports

199. By Stéphane Bidoul (Acsone) on 2013-09-23

[MRG] Sync with 7.0 branch

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

Stéphane,

once again thank you for your patience. I have succesfully tested migrating existing databases to the current state of the branch. Meanwhile, I am writing a lengthy test that simulates a payment order - bank statement round trip, but that should not keep back the merge of this branch.

In the last revisions, a slight error showed up: BaseModel._auto_init() actually returns something that can be meaningful. It does not seem to make a difference here but I think it would be best to return the result of super() after line 1226.

And then we're done.

review: Needs Fixing

[lp:~acsone-openerp/banking-addons/ba-70-payment-export-refactoring]

200. By Stéphane Bidoul (Acsone) on 2013-09-25

[FIX] proper _auto_init return value

[Stéphane Bidoul (Acsone) (sbi)]

Hi Stefan,

Done. Thanks for the extensive review.

-sbi

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

Approved. Thank you for pushing the idea of decoupling the functionalities and working so hard on it! If no one else has any more comments this could be merged early next week.

review: Approve

=== modified file 'account_banking_payment/__openerp__.py'
--- account_banking_payment/__openerp__.py	2013-05-28 15:18:26 +0000
+++ account_banking_payment/__openerp__.py	2013-09-25 08:52:04 +0000
@@ -32,17 +32,14 @@
     'category': 'Banking addons',
     'depends': [
         'account_banking',
-        'account_payment',
+        'account_banking_payment_export',
         ],
     'data': [
         'view/account_payment.xml',
         'view/banking_transaction_wizard.xml',
         'view/payment_mode.xml',
         'view/payment_mode_type.xml',
-        'view/bank_payment_manual.xml',
-        'data/payment_mode_type.xml',
         'workflow/account_payment.xml',
-        'security/ir.model.access.csv',
     ],
     'description': '''
     This addon adds payment infrastructure to the Banking Addons.
 
=== removed directory 'account_banking_payment/data'
=== removed file 'account_banking_payment/data/payment_mode_type.xml'
--- account_banking_payment/data/payment_mode_type.xml	2013-03-17 12:53:37 +0000
+++ account_banking_payment/data/payment_mode_type.xml	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!-- Add manual bank transfer as default payment option -->
-        <record model="payment.mode.type" id="account_banking.manual_bank_tranfer">
-            <field name="name">Manual Bank Transfer</field>
-            <field name="code">BANKMAN</field>
-            <field name="suitable_bank_types"
-                eval="[(6,0,[ref('base.bank_normal'),ref('base_iban.bank_iban'),])]" />
-            <field name="ir_model_id"
-                   ref="account_banking_payment.model_payment_manual"/>
-        </record>
-    </data>
-</openerp>
 
=== modified file 'account_banking_payment/model/__init__.py'
--- account_banking_payment/model/__init__.py	2013-05-30 10:03:41 +0000
+++ account_banking_payment/model/__init__.py	2013-09-25 08:52:04 +0000
@@ -5,5 +5,4 @@
 import payment_order_create
 import banking_import_transaction
 import banking_transaction_wizard
-import bank_payment_manual
 import banking_import_line
 
=== modified file 'account_banking_payment/model/account_payment.py'
--- account_banking_payment/model/account_payment.py	2013-09-23 13:57:32 +0000
+++ account_banking_payment/model/account_payment.py	2013-09-25 08:52:04 +0000
@@ -115,49 +115,6 @@
         'payment_order_type': 'payment',
         }
 
-    def launch_wizard(self, cr, uid, ids, context=None):
-        """
-        Search for a wizard to launch according to the type.
-        If type is manual. just confirm the order.
-        Previously (pre-v6) in account_payment/wizard/wizard_pay.py
-        """
-        if context == None:
-            context = {}
-        result = {}
-        orders = self.browse(cr, uid, ids, context)
-        order = orders[0]
-        # check if a wizard is defined for the first order
-        if order.mode.type and order.mode.type.ir_model_id:
-            context['active_ids'] = ids
-            wizard_model = order.mode.type.ir_model_id.model
-            wizard_obj = self.pool.get(wizard_model)
-            wizard_id = wizard_obj.create(cr, uid, {}, context)
-            result = {
-                'name': wizard_obj._description or _('Payment Order Export'),
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': wizard_model,
-                'domain': [],
-                'context': context,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'res_id': wizard_id,
-                'nodestroy': True,
-                }
-        else:
-            # should all be manual orders without type or wizard model
-            for order in orders[1:]:
-                if order.mode.type and order.mode.type.ir_model_id:
-                    raise orm.except_orm(
-                        _('Error'),
-                        _('You can only combine payment orders of the same type')
-                        )
-            # process manual payments
-            wf_service = netsvc.LocalService('workflow')
-            for order_id in ids:
-                wf_service.trg_validate(uid, 'payment.order', order_id, 'sent', cr)
-        return result
-
     def _write_payment_lines(self, cr, uid, ids, **kwargs):
         '''
         ORM method for setting attributes of corresponding payment.line objects.
 
=== removed file 'account_banking_payment/model/bank_payment_manual.py'
--- account_banking_payment/model/bank_payment_manual.py	2013-03-17 20:03:32 +0000
+++ account_banking_payment/model/bank_payment_manual.py	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
-#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
-#            
-#    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/>.
-#
-##############################################################################
-
-'''
-This module contains a single "wizard" for including a 'sent' state for manual
-bank transfers.
-'''
-
-from openerp.osv import orm, fields
-from openerp import netsvc
-
-
-class payment_manual(orm.TransientModel):
-    _name = 'payment.manual'
-    _description = 'Set payment orders to \'sent\' manually'
-
-    def default_get(self, cr, uid, fields_list, context=None):
-        if context and context.get('active_ids'):
-            payment_order_obj = self.pool.get('payment.order')
-            wf_service = netsvc.LocalService('workflow')
-            for order_id in context['active_ids']:
-                wf_service.trg_validate(
-                    uid, 'payment.order', order_id, 'sent', cr)
-        return super(payment_manual, self).default_get(
-            cr, uid, fields_list, context=None)
-
-    _columns = {
-        # dummy field, to trigger a call to default_get
-        'name': fields.char('Name', size=1),
-        }
-
 
=== modified file 'account_banking_payment/model/payment_mode.py'
--- account_banking_payment/model/payment_mode.py	2013-05-29 12:35:04 +0000
+++ account_banking_payment/model/payment_mode.py	2013-09-25 08:52:04 +0000
@@ -27,28 +27,9 @@
 
 
 class payment_mode(orm.Model):
-    ''' Restoring the payment type from version 5,
-    used to select the export wizard (if any) '''
     _inherit = "payment.mode"
 
-    def suitable_bank_types(self, cr, uid, payment_mode_id=None, context=None):
-        """ Reinstates functional code for suitable bank type filtering.
-        Current code in account_payment is disfunctional.
-        """
-        res = []
-        payment_mode = self.browse(
-            cr, uid, payment_mode_id, context)
-        if (payment_mode and payment_mode.type and
-            payment_mode.type.suitable_bank_types):
-            res = [type.code for type in payment_mode.type.suitable_bank_types]
-        return res
-
     _columns = {
-        'type': fields.many2one(
-            'payment.mode.type', 'Payment type',
-            required=True,
-            help='Select the Payment Type for the Payment Mode.'
-            ),
         'transfer_account_id': fields.many2one(
             'account.account', 'Transfer account',
             domain=[('type', '=', 'other'),
 
=== added file 'account_banking_payment/model/payment_mode_type.py'
--- account_banking_payment/model/payment_mode_type.py	1970-01-01 00:00:00 +0000
+++ account_banking_payment/model/payment_mode_type.py	2013-09-25 08:52:04 +0000
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
+#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
+#            
+#    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, fields
+
+
+class payment_mode_type(orm.Model):
+    _inherit = 'payment.mode.type'
+
+    _columns = {
+        'payment_order_type': fields.selection(
+            [('payment', 'Payment'),('debit', 'Direct debit')],
+            'Payment order type', required=True,
+            ),
+    }
+
+    _defaults = {
+        'payment_order_type': 'payment',
+        }
 
=== removed file 'account_banking_payment/model/payment_mode_type.py'
--- account_banking_payment/model/payment_mode_type.py	2013-03-17 09:10:15 +0000
+++ account_banking_payment/model/payment_mode_type.py	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
-#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
-#            
-#    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, fields
-
-
-class payment_mode_type(orm.Model):
-    _name = 'payment.mode.type'
-    _description = 'Payment Mode Type'
-    _columns = {
-        'name': fields.char(
-            'Name', size=64, required=True,
-            help='Payment Type'
-            ),
-        'code': fields.char(
-            'Code', size=64, required=True,
-            help='Specify the Code for Payment Type'
-            ),
-        # Setting suitable_bank_types to required pending
-        # https://bugs.launchpad.net/openobject-addons/+bug/786845
-        'suitable_bank_types': fields.many2many(
-            'res.partner.bank.type',
-            'bank_type_payment_type_rel',
-            'pay_type_id','bank_type_id',
-            'Suitable bank types', required=True),
-        'ir_model_id': fields.many2one(
-            'ir.model', 'Payment wizard',
-            help=('Select the Payment Wizard for payments of this type. '
-                  'Leave empty for manual processing'),
-            domain=[('osv_memory', '=', True)],
-            ),
-        'payment_order_type': fields.selection(
-            [('payment', 'Payment'),('debit', 'Direct debit')],
-            'Payment order type', required=True,
-            ),
-    }
-
-    _defaults = {
-        'payment_order_type': 'payment',
-        }
 
=== added file 'account_banking_payment/model/payment_order_create.py'
--- account_banking_payment/model/payment_order_create.py	1970-01-01 00:00:00 +0000
+++ account_banking_payment/model/payment_order_create.py	2013-09-25 08:52:04 +0000
@@ -0,0 +1,197 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
+#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
+#            
+#    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, fields
+from openerp.tools.translate import _
+
+
+class payment_order_create(orm.TransientModel):
+    _inherit = 'payment.order.create'
+
+    def extend_payment_order_domain(
+            self, cr, uid, payment_order, domain, context=None):
+        if payment_order.payment_order_type == 'payment':
+            domain += [
+                ('account_id.type', '=', 'payable'),
+                ('amount_to_pay', '>', 0)
+                ]
+        return True
+
+    def search_entries(self, cr, uid, ids, context=None):
+        """
+        This method taken from account_payment module.
+        We adapt the domain based on the payment_order_type
+        """
+        line_obj = self.pool.get('account.move.line')
+        mod_obj = self.pool.get('ir.model.data')
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, ['duedate'], context=context)[0]
+        search_due_date = data['duedate']
+        
+        ### start account_banking_payment ###
+        payment = self.pool.get('payment.order').browse(
+            cr, uid, context['active_id'], context=context)
+        # Search for move line to pay:
+        domain = [
+            ('move_id.state', '=', 'posted'),
+            ('reconcile_id', '=', False),
+            ('company_id', '=', payment.mode.company_id.id),
+            ]
+        # apply payment term filter
+        if payment.mode.payment_term_ids:
+            domain += [
+                ('invoice.payment_term', 'in', 
+                 [term.id for term in payment.mode.payment_term_ids]
+                 )
+                ]
+        self.extend_payment_order_domain(
+            cr, uid, payment, domain, context=context)
+        ### end account_direct_debit ###
+
+        domain = domain + [
+            '|', ('date_maturity', '<=', search_due_date),
+            ('date_maturity', '=', False)
+            ]
+        line_ids = line_obj.search(cr, uid, domain, context=context)
+        context.update({'line_ids': line_ids})
+        model_data_ids = mod_obj.search(
+            cr, uid,[
+                ('model', '=', 'ir.ui.view'),
+                ('name', '=', 'view_create_payment_order_lines')],
+            context=context)
+        resource_id = mod_obj.read(
+            cr, uid, model_data_ids, fields=['res_id'],
+            context=context)[0]['res_id']
+        return {'name': _('Entry Lines'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'payment.order.create',
+                'views': [(resource_id, 'form')],
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+        }
+
+    def create_payment(self, cr, uid, ids, context=None):
+        '''
+        This method is a slightly modified version of the existing method on this
+        model in account_payment.
+        - pass the payment mode to line2bank()
+        - allow invoices to create influence on the payment process: not only 'Free'
+        references are allowed, but others as well
+        - check date_to_pay is not in the past.
+        '''
+
+        order_obj = self.pool.get('payment.order')
+        line_obj = self.pool.get('account.move.line')
+        payment_obj = self.pool.get('payment.line')
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids, [], context=context)[0]
+        line_ids = data['entries']
+        if not line_ids:
+            return {'type': 'ir.actions.act_window_close'}
+
+        payment = order_obj.browse(
+            cr, uid, context['active_id'], context=context)
+        ### account banking
+        # t = None
+        # line2bank = line_obj.line2bank(cr, uid, line_ids, t, context)
+        line2bank = line_obj.line2bank(
+            cr, uid, line_ids, payment.mode.id, context)
+        _today = fields.date.context_today(self, cr, uid, context=context)
+        ### end account banking
+
+        ## Finally populate the current payment with new lines:
+        for line in line_obj.browse(cr, uid, line_ids, context=context):
+            if payment.date_prefered == "now":
+                #no payment date => immediate payment
+                date_to_pay = False
+            elif payment.date_prefered == 'due':
+                ### account_banking
+                # date_to_pay = line.date_maturity
+                date_to_pay = (
+                    line.date_maturity
+                    if line.date_maturity and line.date_maturity > _today
+                    else False)
+                ### end account banking
+            elif payment.date_prefered == 'fixed':
+                ### account_banking
+                # date_to_pay = payment.date_scheduled
+                date_to_pay = (
+                    payment.date_scheduled
+                    if payment.date_scheduled and payment.date_scheduled > _today
+                    else False)
+                ### end account banking
+
+            ### account_banking
+            state = communication2 = False
+            communication = line.ref or '/'
+            if line.invoice:
+                if line.invoice.type in ('in_invoice', 'in_refund'):
+                    if line.invoice.reference_type == 'structured':
+                        state = 'structured'
+                        communication = line.invoice.reference
+                    else:
+                        state = 'normal'
+                        communication2 = line.invoice.reference
+                else:
+                    # Make sure that the communication includes the
+                    # customer invoice number (in the case of debit order)
+                    communication = line.invoice.number.replace('/', '')
+                    state = 'structured'
+                    if line.invoice.number != line.ref:
+                        communication2 = line.ref
+            else:
+                state = 'normal'
+                communication2 = line.ref
+
+            # support debit orders when enabled
+            if (payment.payment_order_type == 'debit' and
+                'amount_to_receive' in line):
+                amount_currency = line.amount_to_receive
+            else:
+                amount_currency = line.amount_to_pay
+            ### end account_banking
+
+            payment_obj.create(cr, uid, {
+                'move_line_id': line.id,
+                'amount_currency': amount_currency,
+                'bank_id': line2bank.get(line.id),
+                'order_id': payment.id,
+                'partner_id': line.partner_id and line.partner_id.id or False,
+                ### account banking
+                # 'communication': line.ref or '/'
+                'communication': communication,
+                'communication2': communication2,
+                'state': state,
+                ### end account banking
+                'date': date_to_pay,
+                'currency': (line.invoice and line.invoice.currency_id.id
+                             or line.journal_id.currency.id
+                             or line.journal_id.company_id.currency_id.id),
+                }, context=context)
+        return {'type': 'ir.actions.act_window_close'}
 
=== removed file 'account_banking_payment/model/payment_order_create.py'
--- account_banking_payment/model/payment_order_create.py	2013-06-26 21:14:41 +0000
+++ account_banking_payment/model/payment_order_create.py	1970-01-01 00:00:00 +0000
@@ -1,199 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
-#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
-#            
-#    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 datetime import datetime
-from openerp.osv import orm, fields
-from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
-from openerp.tools.translate import _
-
-
-class payment_order_create(orm.TransientModel):
-    _inherit = 'payment.order.create'
-
-    def extend_payment_order_domain(
-            self, cr, uid, payment_order, domain, context=None):
-        if payment_order.payment_order_type == 'payment':
-            domain += [
-                ('account_id.type', '=', 'payable'),
-                ('amount_to_pay', '>', 0)
-                ]
-        return True
-
-    def search_entries(self, cr, uid, ids, context=None):
-        """
-        This method taken from account_payment module.
-        We adapt the domain based on the payment_order_type
-        """
-        line_obj = self.pool.get('account.move.line')
-        mod_obj = self.pool.get('ir.model.data')
-        if context is None:
-            context = {}
-        data = self.read(cr, uid, ids, ['duedate'], context=context)[0]
-        search_due_date = data['duedate']
-        
-        ### start account_banking_payment ###
-        payment = self.pool.get('payment.order').browse(
-            cr, uid, context['active_id'], context=context)
-        # Search for move line to pay:
-        domain = [
-            ('move_id.state', '=', 'posted'),
-            ('reconcile_id', '=', False),
-            ('company_id', '=', payment.mode.company_id.id),
-            ]
-        # apply payment term filter
-        if payment.mode.payment_term_ids:
-            domain += [
-                ('invoice.payment_term', 'in', 
-                 [term.id for term in payment.mode.payment_term_ids]
-                 )
-                ]
-        self.extend_payment_order_domain(
-            cr, uid, payment, domain, context=context)
-        ### end account_direct_debit ###
-
-        domain = domain + [
-            '|', ('date_maturity', '<=', search_due_date),
-            ('date_maturity', '=', False)
-            ]
-        line_ids = line_obj.search(cr, uid, domain, context=context)
-        context.update({'line_ids': line_ids})
-        model_data_ids = mod_obj.search(
-            cr, uid,[
-                ('model', '=', 'ir.ui.view'),
-                ('name', '=', 'view_create_payment_order_lines')],
-            context=context)
-        resource_id = mod_obj.read(
-            cr, uid, model_data_ids, fields=['res_id'],
-            context=context)[0]['res_id']
-        return {'name': _('Entry Lines'),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'payment.order.create',
-                'views': [(resource_id, 'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-        }
-
-    def create_payment(self, cr, uid, ids, context=None):
-        '''
-        This method is a slightly modified version of the existing method on this
-        model in account_payment.
-        - pass the payment mode to line2bank()
-        - allow invoices to create influence on the payment process: not only 'Free'
-        references are allowed, but others as well
-        - check date_to_pay is not in the past.
-        '''
-
-        order_obj = self.pool.get('payment.order')
-        line_obj = self.pool.get('account.move.line')
-        payment_obj = self.pool.get('payment.line')
-        if context is None:
-            context = {}
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        line_ids = data['entries']
-        if not line_ids:
-            return {'type': 'ir.actions.act_window_close'}
-
-        payment = order_obj.browse(
-            cr, uid, context['active_id'], context=context)
-        ### account banking
-        # t = None
-        # line2bank = line_obj.line2bank(cr, uid, line_ids, t, context)
-        line2bank = line_obj.line2bank(
-            cr, uid, line_ids, payment.mode.id, context)
-        _today = fields.date.context_today(self, cr, uid, context=context)
-        ### end account banking
-
-        ## Finally populate the current payment with new lines:
-        for line in line_obj.browse(cr, uid, line_ids, context=context):
-            if payment.date_prefered == "now":
-                #no payment date => immediate payment
-                date_to_pay = False
-            elif payment.date_prefered == 'due':
-                ### account_banking
-                # date_to_pay = line.date_maturity
-                date_to_pay = (
-                    line.date_maturity
-                    if line.date_maturity and line.date_maturity > _today
-                    else False)
-                ### end account banking
-            elif payment.date_prefered == 'fixed':
-                ### account_banking
-                # date_to_pay = payment.date_scheduled
-                date_to_pay = (
-                    payment.date_scheduled
-                    if payment.date_scheduled and payment.date_scheduled > _today
-                    else False)
-                ### end account banking
-
-            ### account_banking
-            state = communication2 = False
-            communication = line.ref or '/'
-            if line.invoice:
-                if line.invoice.type in ('in_invoice', 'in_refund'):
-                    if line.invoice.reference_type == 'structured':
-                        state = 'structured'
-                        communication = line.invoice.reference
-                    else:
-                        state = 'normal'
-                        communication2 = line.invoice.reference
-                else:
-                    # Make sure that the communication includes the
-                    # customer invoice number (in the case of debit order)
-                    communication = line.invoice.number.replace('/', '')
-                    state = 'structured'
-                    if line.invoice.number != line.ref:
-                        communication2 = line.ref
-            else:
-                state = 'normal'
-                communication2 = line.ref
-
-            # support debit orders when enabled
-            if (payment.payment_order_type == 'debit' and
-                'amount_to_receive' in line):
-                amount_currency = line.amount_to_receive
-            else:
-                amount_currency = line.amount_to_pay
-            ### end account_banking
-
-            payment_obj.create(cr, uid, {
-                'move_line_id': line.id,
-                'amount_currency': amount_currency,
-                'bank_id': line2bank.get(line.id),
-                'order_id': payment.id,
-                'partner_id': line.partner_id and line.partner_id.id or False,
-                ### account banking
-                # 'communication': line.ref or '/'
-                'communication': communication,
-                'communication2': communication2,
-                'state': state,
-                ### end account banking
-                'date': date_to_pay,
-                'currency': (line.invoice and line.invoice.currency_id.id
-                             or line.journal_id.currency.id
-                             or line.journal_id.company_id.currency_id.id),
-                }, context=context)
-        return {'type': 'ir.actions.act_window_close'}
 
=== removed directory 'account_banking_payment/security'
=== removed file 'account_banking_payment/security/ir.model.access.csv'
--- account_banking_payment/security/ir.model.access.csv	2013-03-16 16:44:19 +0000
+++ account_banking_payment/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_payment_mode_type","payment.mode.type","model_payment_mode_type","account_payment.group_account_payment",1,1,1,1
 
=== modified file 'account_banking_payment/view/account_payment.xml'
--- account_banking_payment/view/account_payment.xml	2013-06-04 10:18:31 +0000
+++ account_banking_payment/view/account_payment.xml	2013-09-25 08:52:04 +0000
@@ -17,10 +17,6 @@
                             'invisible':[('state','!=','draft')]
                         }</attribute>
                     </xpath>
-                    <xpath expr="//button[@string='Make Payments']"
-                           position="attributes">
-                        <attribute name="name">launch_wizard</attribute>
-                    </xpath>
                     <!-- Communication only used for 'structured' communication -->
                     <xpath expr="//field[@name='line_ids']/form//field[@name='communication']"
                            position="attributes">
 
=== removed file 'account_banking_payment/view/bank_payment_manual.xml'
--- account_banking_payment/view/bank_payment_manual.xml	2013-05-28 15:18:26 +0000
+++ account_banking_payment/view/bank_payment_manual.xml	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_payment_manual_form" model="ir.ui.view">
-            <field name="name">Form for manual payment wizard</field>
-            <field name="model">payment.manual</field>
-            <field name="arch" type="xml">
-                <form string="Manual payment">
-                    <label string="Payment order(s) have been set to 'sent'"/>
-                    <button special="cancel" icon="gtk-ok" string="OK"/>
-                </form>
-            </field>
-        </record>
-    </data>
-</openerp>
 
=== modified file 'account_banking_payment/view/payment_mode.xml'
--- account_banking_payment/view/payment_mode.xml	2013-05-29 12:35:04 +0000
+++ account_banking_payment/view/payment_mode.xml	2013-09-25 08:52:04 +0000
@@ -8,10 +8,9 @@
         <record id="view_payment_mode_form_inherit" model="ir.ui.view">
             <field name="name">payment.mode.form.inherit</field>
             <field name="model">payment.mode</field>
-            <field name="inherit_id" ref="account_payment.view_payment_mode_form"/>
+            <field name="inherit_id" ref="account_banking_payment_export.view_payment_mode_form_inherit"/>
             <field name="arch" type="xml">
-                <field name="company_id" position="after">
-                    <field name="type"/>
+                <field name="type" position="after">
                     <group colspan="4" col="4">
                         <group colspan="2">
                             <separator colspan="2"
 
=== added file 'account_banking_payment/view/payment_mode_type.xml'
--- account_banking_payment/view/payment_mode_type.xml	1970-01-01 00:00:00 +0000
+++ account_banking_payment/view/payment_mode_type.xml	2013-09-25 08:52:04 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="view_payment_mode_type_form_inherit">
+            <field name="name">view.payment.mode.type.form</field>
+            <field name="model">payment.mode.type</field>
+            <field name="inherit_id" ref="account_banking_payment_export.view_payment_mode_type_form"/>
+            <field name="arch" type="xml">
+                <field name="suitable_bank_types" position="after">    
+                    <field name="payment_order_type"/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>
 
=== removed file 'account_banking_payment/view/payment_mode_type.xml'
--- account_banking_payment/view/payment_mode_type.xml	2013-05-28 15:18:26 +0000
+++ account_banking_payment/view/payment_mode_type.xml	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_payment_mode_tree_inherit" model="ir.ui.view">
-            <field name="name">payment.mode.tree.inherit</field>
-            <field name="model">payment.mode</field>
-            <field name="inherit_id" ref="account_payment.view_payment_mode_tree"/>
-            <field name="arch" type="xml">
-                <field name="company_id" position="after">
-                    <field name="type"/>
-                </field>
-            </field>
-        </record>
-
-	<!-- basic view for payment mode type -->
-        <record model="ir.ui.view" id="view_payment_mode_type_form">
-            <field name="name">view.payment.mode.type.form</field>
-            <field name="model">payment.mode.type</field>
-            <field name="arch" type="xml">
-                <form string="Payment mode">
-		    <field name="name" />
-		    <field name="code" />
-		    <field name="suitable_bank_types"/>
-		    <field name="payment_order_type"/>
-		    <field name="ir_model_id"/>
-                </form>
-            </field>
-        </record>
-
-    </data>
-</openerp>
 
=== modified file 'account_banking_payment/workflow/account_payment.xml'
--- account_banking_payment/workflow/account_payment.xml	2013-05-29 22:26:36 +0000
+++ account_banking_payment/workflow/account_payment.xml	2013-09-25 08:52:04 +0000
@@ -29,6 +29,12 @@
             <field name="act_to" ref="account_banking.act_sent"/>
             <field name="signal">sent</field>
         </record>
+        <!-- the done signal continues to work but goes to sent -->
+        <record id="account_banking.trans_open_done" model="workflow.transition">
+            <field name="act_from" ref="account_payment.act_open"/>
+            <field name="act_to" ref="account_banking.act_sent"/>
+            <field name="signal">done</field>
+        </record>
         <!-- From sent straight to sent_wait -->
         <record id="account_banking.trans_sent_sent_wait" model="workflow.transition">
             <field name="act_from" ref="account_banking.act_sent"/>
 
=== added directory 'account_banking_payment_export'
=== added file 'account_banking_payment_export/__init__.py'
--- account_banking_payment_export/__init__.py	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/__init__.py	2013-09-25 08:52:04 +0000
@@ -0,0 +1,1 @@
+from . import model
 \ No newline at end of file
 
=== added file 'account_banking_payment_export/__openerp__.py'
--- account_banking_payment_export/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/__openerp__.py	2013-09-25 08:52:04 +0000
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
+#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
+#            
+#    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/>.
+#
+##############################################################################
+
+{
+    'name': 'Account Banking - Payments Export Infrastructure',
+    'version': '0.1.164',
+    'license': 'AGPL-3',
+    'author': 'Banking addons community',
+    'website': 'https://launchpad.net/banking-addons',
+    'category': 'Banking addons',
+    'depends': [
+        'account_payment',
+        'base_iban',  # for manual_bank_tranfer
+        ],
+    'conflicts': [
+        # lp:account-payment/account_payment_extension also adds
+        # a type field to payment.mode, with a very similar purpose.
+        # We can't add a dependency on account_payment_extension here
+        # because account_payment_extension adds many other features
+        # that probably conflict with other parts of lp:banking-addons.
+        # Proposal to resolve: make account_payment_extension depend
+        # on the present account_banking_payment_export module.
+        'account_payment_extension',
+        ],
+    'data': [
+        'view/account_payment.xml',
+        'view/bank_payment_manual.xml',
+        'view/payment_mode.xml',
+        'view/payment_mode_type.xml',
+        'data/payment_mode_type.xml',
+        'security/ir.model.access.csv',
+    ],
+    'description': '''
+        Infrastructure to export payment orders.
+
+        This technical module provides the base infrastructure to export 
+        payment orders for electronic banking. It provides the following
+        technical features:
+        * a new payment.mode.type model
+        * payment.mode now has a mandatory type
+        * 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
+    ''',
+    'auto_install': True,
+    'installable': True,
+}
 
=== added directory 'account_banking_payment_export/data'
=== added file 'account_banking_payment_export/data/payment_mode_type.xml'
--- account_banking_payment_export/data/payment_mode_type.xml	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/data/payment_mode_type.xml	2013-09-25 08:52:04 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- Add manual bank transfer as default payment option -->
+        <record model="payment.mode.type" id="manual_bank_tranfer">
+            <field name="name">Manual Bank Transfer</field>
+            <field name="code">BANKMAN</field>
+            <field name="suitable_bank_types"
+                eval="[(6,0,[ref('base.bank_normal'),ref('base_iban.bank_iban'),])]" />
+            <field name="ir_model_id"
+                   ref="model_payment_manual"/>
+        </record>
+    </data>
+</openerp>
 
=== added directory 'account_banking_payment_export/model'
=== added file 'account_banking_payment_export/model/__init__.py'
--- account_banking_payment_export/model/__init__.py	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/model/__init__.py	2013-09-25 08:52:04 +0000
@@ -0,0 +1,5 @@
+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
 
=== added file 'account_banking_payment_export/model/account_payment.py'
--- account_banking_payment_export/model/account_payment.py	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/model/account_payment.py	2013-09-25 08:52:04 +0000
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
+#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
+#            
+#    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
+from openerp.tools.translate import _
+from openerp import netsvc
+
+
+class payment_order(orm.Model):
+    _inherit = 'payment.order'
+
+    def launch_wizard(self, cr, uid, ids, context=None):
+        """
+        Search for a wizard to launch according to the type.
+        If type is manual. just confirm the order.
+        Previously (pre-v6) in account_payment/wizard/wizard_pay.py
+        """
+        if context == None:
+            context = {}
+        result = {}
+        orders = self.browse(cr, uid, ids, context)
+        order = orders[0]
+        # check if a wizard is defined for the first order
+        if order.mode.type and order.mode.type.ir_model_id:
+            context['active_ids'] = ids
+            wizard_model = order.mode.type.ir_model_id.model
+            wizard_obj = self.pool.get(wizard_model)
+            wizard_id = wizard_obj.create(cr, uid, {}, context)
+            result = {
+                'name': wizard_obj._description or _('Payment Order Export'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': wizard_model,
+                'domain': [],
+                'context': context,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'res_id': wizard_id,
+                'nodestroy': True,
+                }
+        else:
+            # should all be manual orders without type or wizard model
+            for order in orders[1:]:
+                if order.mode.type and order.mode.type.ir_model_id:
+                    raise orm.except_orm(
+                        _('Error'),
+                        _('You can only combine payment orders of the same type')
+                        )
+            # process manual payments
+            wf_service = netsvc.LocalService('workflow')
+            for order_id in ids:
+                wf_service.trg_validate(uid, 'payment.order', order_id, 'done', cr)
+        return result
 
=== added file 'account_banking_payment_export/model/bank_payment_manual.py'
--- account_banking_payment_export/model/bank_payment_manual.py	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/model/bank_payment_manual.py	2013-09-25 08:52:04 +0000
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
+#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
+#            
+#    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/>.
+#
+##############################################################################
+
+'''
+This module contains a single "wizard" for confirming manual
+bank transfers.
+'''
+
+from openerp.osv import orm, fields
+from openerp import netsvc
+
+
+class payment_manual(orm.TransientModel):
+    _name = 'payment.manual'
+    _description = 'Send payment order(s) manually'
+
+    _columns = {
+        'payment_order_ids': fields.many2many('payment.order',
+            'wiz_manual_payorders_rel', 'wizard_id', 'payment_order_id',
+            'Payment orders', readonly=True),
+        }
+
+    def create(self, cr, uid, vals, context=None):
+        payment_order_ids = context.get('active_ids', [])
+        vals.update({
+            'payment_order_ids': [[6, 0, payment_order_ids]],
+        })
+        return super(payment_manual, self).create(cr, uid,
+            vals, context=context)
+
+    def button_ok(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService('workflow')
+        for wiz in self.browse(cr, uid, ids, context=context):
+            for order_id in wiz.payment_order_ids:
+                wf_service.trg_validate(
+                    uid, 'payment.order', order_id.id, 'done', cr)
+        return {'type': 'ir.actions.act_window_close'}
 
=== added file 'account_banking_payment_export/model/payment_mode.py'
--- account_banking_payment_export/model/payment_mode.py	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/model/payment_mode.py	2013-09-25 08:52:04 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
+#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
+#            
+#    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, fields
+
+
+class payment_mode(orm.Model):
+    ''' Restoring the payment type from version 5,
+    used to select the export wizard (if any) '''
+    _inherit = "payment.mode"
+
+    def suitable_bank_types(self, cr, uid, payment_mode_id=None, context=None):
+        """ Reinstates functional code for suitable bank type filtering.
+        Current code in account_payment is disfunctional.
+        """
+        res = []
+        payment_mode = self.browse(
+            cr, uid, payment_mode_id, context)
+        if (payment_mode and payment_mode.type and
+            payment_mode.type.suitable_bank_types):
+            res = [t.code for t in payment_mode.type.suitable_bank_types]
+        return res
+
+    _columns = {
+        'type': fields.many2one(
+            'payment.mode.type', 'Payment type',
+            required=True,
+            help='Select the Payment Type for the Payment Mode.'
+            ),
+        }
 
=== added file 'account_banking_payment_export/model/payment_mode_type.py'
--- account_banking_payment_export/model/payment_mode_type.py	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/model/payment_mode_type.py	2013-09-25 08:52:04 +0000
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
+#              (C) 2011 - 2013 Therp BV (<http://therp.nl>).
+#            
+#    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, fields
+
+
+class payment_mode_type(orm.Model):
+    _name = 'payment.mode.type'
+    _description = 'Payment Mode Type'
+    _columns = {
+        'name': fields.char(
+            'Name', size=64, required=True,
+            help='Payment Type'
+            ),
+        'code': fields.char(
+            'Code', size=64, required=True,
+            help='Specify the Code for Payment Type'
+            ),
+        'suitable_bank_types': fields.many2many(
+            'res.partner.bank.type',
+            'bank_type_payment_type_rel',
+            'pay_type_id','bank_type_id',
+            'Suitable bank types', required=True),
+        'ir_model_id': fields.many2one(
+            'ir.model', 'Payment wizard',
+            help=('Select the Payment Wizard for payments of this type. '
+                  'Leave empty for manual processing'),
+            domain=[('osv_memory', '=', True)],
+            ),
+    }
+    
+    def _auto_init(self, cr, context=None):
+        r = super(payment_mode_type, self)._auto_init(cr, context=context)
+        # migrate xmlid from manual_bank_transfer to avoid dependency on account_banking
+        cr.execute("""UPDATE ir_model_data SET module='account_banking_payment_export'
+                      WHERE module='account_banking' AND 
+                            name='manual_bank_tranfer' AND 
+                            model='payment.mode.type'""")
+        return r
 
=== added file 'account_banking_payment_export/model/payment_order_create.py'
--- account_banking_payment_export/model/payment_order_create.py	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/model/payment_order_create.py	2013-09-25 08:52:04 +0000
@@ -0,0 +1,58 @@
+# -*- 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)
+
 
=== added directory 'account_banking_payment_export/security'
=== added file 'account_banking_payment_export/security/ir.model.access.csv'
--- account_banking_payment_export/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/security/ir.model.access.csv	2013-09-25 08:52:04 +0000
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_payment_mode_type","payment.mode.type","model_payment_mode_type","account_payment.group_account_payment",1,1,1,1
 
=== added directory 'account_banking_payment_export/view'
=== added file 'account_banking_payment_export/view/account_payment.xml'
--- account_banking_payment_export/view/account_payment.xml	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/view/account_payment.xml	2013-09-25 08:52:04 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- restore wizard functionality when making payments
+          -->
+
+        <record id="view_banking_payment_order_form_1" model="ir.ui.view">
+            <field name="name">account.payment.order.form.banking-1</field>
+            <field name="inherit_id" ref="account_payment.view_payment_order_form" />
+            <field name="model">payment.order</field>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//button[@string='Make Payments']"
+                           position="attributes">
+                        <attribute name="name">launch_wizard</attribute>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+    </data>
+</openerp>
 
=== added file 'account_banking_payment_export/view/bank_payment_manual.xml'
--- account_banking_payment_export/view/bank_payment_manual.xml	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/view/bank_payment_manual.xml	2013-09-25 08:52:04 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_payment_manual_form" model="ir.ui.view">
+            <field name="name">Form for manual payment wizard</field>
+            <field name="model">payment.manual</field>
+            <field name="arch" type="xml">
+                <form string="Manual payment" version="7.0">
+                    <label string="Please execute payment order manually, and click OK when succesfully sent."/>
+                    <footer>
+	                    <button name="button_ok" type="object" string="OK" class="oe_highlight"/>
+	                    <button special="cancel" string="Cancel" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>
 
=== added file 'account_banking_payment_export/view/payment_mode.xml'
--- account_banking_payment_export/view/payment_mode.xml	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/view/payment_mode.xml	2013-09-25 08:52:04 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- 
+             Add the payment mode type and transfer settings
+        -->
+        <record id="view_payment_mode_form_inherit" model="ir.ui.view">
+            <field name="name">payment.mode.form.inherit</field>
+            <field name="model">payment.mode</field>
+            <field name="inherit_id" ref="account_payment.view_payment_mode_form"/>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <field name="type"/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>
 
=== added file 'account_banking_payment_export/view/payment_mode_type.xml'
--- account_banking_payment_export/view/payment_mode_type.xml	1970-01-01 00:00:00 +0000
+++ account_banking_payment_export/view/payment_mode_type.xml	2013-09-25 08:52:04 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_payment_mode_tree_inherit" model="ir.ui.view">
+            <field name="name">payment.mode.tree.inherit</field>
+            <field name="model">payment.mode</field>
+            <field name="inherit_id" ref="account_payment.view_payment_mode_tree"/>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <field name="type"/>
+                </field>
+            </field>
+        </record>
+
+        <!-- basic view for payment mode type -->
+        <record model="ir.ui.view" id="view_payment_mode_type_form">
+            <field name="name">view.payment.mode.type.form</field>
+            <field name="model">payment.mode.type</field>
+            <field name="arch" type="xml">
+                <form string="Payment mode">
+                    <field name="name" />
+                    <field name="code" />
+                    <field name="suitable_bank_types"/>
+                    <field name="ir_model_id"/>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</openerp>
 
=== modified file 'account_banking_sepa_credit_transfer/__openerp__.py'
--- account_banking_sepa_credit_transfer/__openerp__.py	2013-08-02 22:39:11 +0000
+++ account_banking_sepa_credit_transfer/__openerp__.py	2013-09-25 08:52:04 +0000
@@ -26,7 +26,7 @@
     'author': 'Akretion',
     'website': 'http://www.akretion.com',
     'category': 'Banking addons',
-    'depends': ['account_banking_payment'],
+    'depends': ['account_banking_payment_export'],
     'data': [
         'account_banking_sepa_view.xml',
         'wizard/export_sepa_view.xml',
 
=== modified file 'account_banking_sepa_credit_transfer/account_banking_sepa.py'
--- account_banking_sepa_credit_transfer/account_banking_sepa.py	2013-06-28 20:34:58 +0000
+++ account_banking_sepa_credit_transfer/account_banking_sepa.py	2013-09-25 08:52:04 +0000
@@ -20,8 +20,6 @@
 ##############################################################################
 
 from openerp.osv import orm, fields
-import time
-from openerp.tools.translate import _
 from openerp.addons.decimal_precision import decimal_precision as dp
 
 
 
=== modified file 'account_banking_sepa_credit_transfer/account_banking_sepa_view.xml'
--- account_banking_sepa_credit_transfer/account_banking_sepa_view.xml	2013-08-02 22:39:11 +0000
+++ account_banking_sepa_credit_transfer/account_banking_sepa_view.xml	2013-09-25 08:52:04 +0000
@@ -65,7 +65,7 @@
 
 
 <menuitem id="menu_account_banking_sepa"
-          parent="account_banking.menu_finance_banking_actions"
+          parent="account_payment.menu_main_payment"
           action="action_account_banking_sepa"
           sequence="15"
           />
 
=== modified file 'account_banking_sepa_credit_transfer/wizard/export_sepa.py'
--- account_banking_sepa_credit_transfer/wizard/export_sepa.py	2013-09-19 11:50:30 +0000
+++ account_banking_sepa_credit_transfer/wizard/export_sepa.py	2013-09-25 08:52:04 +0000
@@ -101,8 +101,6 @@
         '''
         Creates the SEPA Credit Transfer file. That's the important code !
         '''
-        payment_order_obj = self.pool.get('payment.order')
-
         sepa_export = self.browse(cr, uid, ids[0], context=context)
 
         my_company_name = sepa_export.payment_order_ids[0].mode.bank_id.partner_id.name
@@ -330,12 +328,15 @@
 
     def save_sepa(self, cr, uid, ids, context=None):
         '''
-        Save the SEPA PAIN: mark all payments in the file as 'sent'.
+        Save the SEPA PAIN: send the done signal to all payment orders in the file.
+        With the default workflow, they will transition to 'done', while with the
+        advanced workflow in account_banking_payment they will transition to 'sent'
+        waiting reconciliation.
         '''
         sepa_export = self.browse(cr, uid, ids[0], context=context)
-        sepa_file = self.pool.get('banking.export.sepa').write(cr, uid,
+        self.pool.get('banking.export.sepa').write(cr, uid,
             sepa_export.file_id.id, {'state': 'sent'}, context=context)
         wf_service = netsvc.LocalService('workflow')
         for order in sepa_export.payment_order_ids:
-            wf_service.trg_validate(uid, 'payment.order', order.id, 'sent', cr)
+            wf_service.trg_validate(uid, 'payment.order', order.id, 'done', cr)
         return {'type': 'ir.actions.act_window_close'}