Merge lp:~akretion-team/banking-addons/70-fully-handle-payment-types into lp:banking-addons

[Alexis de Lattre]

This merge proposal is the result of the discussion that I started in the mailing-list banking-addons-drivers with subject "account_payment_extension", cf https://lists.launchpad.net/banking-addons-drivers/msg00059.html

The main changes in this merge proposal are :

1) Add 4 new modules to handle payment type and bank accounts:
    - account_payment_partner
    - account_payment_sale
    - account_payment_sale_stock
    - account_payment_purchase

2) Filter the selection of invoices per payment type.
    Add active field on payment.mode and payment.mode.type.
    Add menu entry for Payment Types.

This MP also contains smaller stuff :

3) Small code clean-up in the SEPA modules (views, 'state' field on SEPA file objects)

4) Code enhancement in the file account_banking_payment/model/account_payment.py (PEP-8, _prepare_* functions, support for payment lines with move_line_id = False)

I hope you will enjoy this work.

[lp:~akretion-team/banking-addons/70-fully-handle-payment-types]

239. By Alexis de Lattre on 2014-03-18

Add a hook, which is designed to be inherited. For example, it can be used to wake-up the workflow of purchase order (usefull in combination with the module 'purchase_payment_order')

240. By Alexis de Lattre on 2014-03-21

[FIX] wrong model type in inherit.

241. By Raphaël Valyi - http://www.akretion.com on 2014-03-21

[MERGE] merged HEAD into current feature branch

242. By Raphaël Valyi - http://www.akretion.com on 2014-03-21

[REF] wrapping module description lines to keep cool with the PEP-8 extremists

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

Thanks for this excellent work Alexis! This is making it possible to finally migrate from account_payment_extension and weight altogether on the same banking modules.

review: Approve

[Luis Felipe Miléo - http://www.kmee.com.br (mileo)]

Nice work. Thanks
Em 21/03/2014 16:53, "Raphaël Valyi - http://www.akretion.com" <
<email address hidden>> escreveu:

> Review: Approve
>
> Thanks for this excellent work Alexis! This is making it possible to
> finally migrate from account_payment_extension and weight altogether on the
> same banking modules.
> --
>
> https://code.launchpad.net/~akretion-team/banking-addons/70-fully-handle-payment-types/+merge/211283
> Your team Banking Addons Core Editors is subscribed to branch
> lp:banking-addons.
>
> --
> Mailing list: https://launchpad.net/~banking-addons-team
> Post to : <email address hidden>
> Unsubscribe : https://launchpad.net/~banking-addons-team
> More help : https://help.launchpad.net/ListHelp
>

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

Thanks. The general architecture looks very neat.

Can I ask you why you chose the level of payment mode type to register on partners and invoices instead of the payment mode level? The payment mode type level does not cover the case where you have several payment modes of the same SEPA mode type but on different bank accounts. It also makes transitions between various SEPA modes difficult (for instance, when the bank switches from supporting version 03 to 04).

Other remarks:

- IMHO the sale/sale_stock/purchase modules should be set to autoinstall (=installed automatically when dependencies are fulfilled).
- Filtering seems very strict. Maybe allow for a transition by means of a checkbox on the payment mode (type) to indicate if you want to filter invoices by this exact payment mode or also select for invoices with no payment mode set yet. What do you think?
- Purchase module: maybe override do_merge and apply any payment mode found in the original purchase orders to the resulting merged order? If you merge purchase orders with this code, you don't get any payment mode in the result.
- I would have prefered module names with 'payment_mode' (like account_payment_mode_sale). Would you consider renaming them?
- You really should apply the reverse payment mode setting from the partner for refunds. With regards to that, the fields had better be called something like credit_payment_mode and debit_payment_mode instead of supplier_payment_mode and customer_payment_mode. Maybe combine this with a corresponding filter on 'debit' or 'credit' modes.
- What is the use of partner_bank_receivable? It does not seem related at all related to the rest of the changes, or to payment functionality in general.
- Moot point if you honour my first question, but I think it would be nice if the payment type tree view could show inactive items by default, by passing {'active_test': False} in its act_window's context.

review: Needs Fixing

[lp:~akretion-team/banking-addons/70-fully-handle-payment-types]

243. By Alexis de Lattre on 2014-04-10

Add auto-install on account_payment_sale_stock.

244. By Alexis de Lattre on 2014-04-10

As suggested by Stefan, display unactive payment.mode.types in tree view.

[Alexis de Lattre (alexis-via)]

@Stefan:

About why I chose the level of payment.mode.type vs payment.mode : I first thought I would point to payment.mode, but, as I explained that in my email "Re: [Banking-addons-drivers] account_payment_extension" on 21/02/2014 12:40 Paris time, I found out that account_payment_extension points to payment.mode.type and I think I found the reason ; here is the explaination of my email :

<<
if you consider that your company has 2 bank accounts A and B : they sometimes pay their suppliers from account A, sometimes from account B, depending on the situation of each bank account. As they have 2 bank accounts, they have 2 payment modes for wire transfer... but they could share the same account type "wire transfer". In this case, we would prefer to have the many2one fields point to account.type, so that it is independant from the bank account that will be used for the payment.
Note : if the 2 banks use 2 different versions of SEPA PAIN, then we'll have 2 different payment types... bad luck ! But maybe we could change that in the future and have 1 payment type for "pain.001.001.xx" and store the xx on the payment.mode.
>>

About your other remarks :
- I must say that I dislike the auto_install mechanism :) I don't think it would be a good idea to have it on account_payment_purchase and account_payment_sale, because you may want to have sale and account_payment_partner, but not to manage the payment type on sale.order, but only on partners and customer invoices. Same for purchase ; you may not want to manage the payment type on purchase.order, but only on partners and supplier invoices. So I have just added the auto-install option on account_payment_sale_stock, where I admit it can be a good idea :)
- About filtering : I agree with you. We could imagine that, by default, you also get the invoices with no payment type set.
- I always forget the do_merge stuff on POs ; I surely need to add that.
- about the name of the modules : if we keep pointing to payment.mode.type, it may lead to confusion to put "payment_mode" in the name.
- I think that the partner_bank_receivable is fully related to the other changes. On a customer invoice, the field partner_bank_id is a M2O to res.partner.bank and it designate the bank account of "your company" on which you would like to receive the money. We need to have the same field on sale.order and res.partner, and have the usual behavior :

customer res.partner (partner_bank_receivable) -> sale.order (partner_bank_receivable) -> customer account.invoice (partner_bank_id)

- I like your suggestion to show inactive payment types in tree view by default. I didn't knew it was possible with active_test : False. I just made the modification.

[Alexis de Lattre (alexis-via)]

Can we really inherit the do_merge function ? It seems that this function is not designed to be inherited... I don't see how I could develop what you suggested (and it would be a bad idea to copy-paste the whole do_merge function inside the module account_payment_purchase). If you have an example of a module that inherit do_merge to add a field, please tell me.

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

Hello,

I believed that this fat do_merge method would have been refactored in trunk or trunk-wms. Sadly I just checked and I had wrong expectation: it stayed nearly the same. Eventually, if a simple patch is envisioned to make do_merge easier to override we may consider refactoring it very lightly in OCB and having a hook working here. Now, may be we should just first merge Alexis's improvement and leave this minor detail for later?

for reference:
7.0: https://github.com/akretion/openerp-addons/blob/ocb-7.0/purchase/purchase.py#L751
trunk: https://github.com/akretion/openerp-addons/blob/master/purchase/purchase.py#L749
trunk-wms: https://github.com/akretion/openerp-addons/blob/trunk-wms/purchase/purchase.py#L829

[lp:~akretion-team/banking-addons/70-fully-handle-payment-types]

245. By Alexis de Lattre on 2014-04-11

As suggested by Stefan: also select invoices with empty payment.mode.type.

[Alexis de Lattre (alexis-via)]

@Stefan:

My last commit (245) is on your remark about filtering : by default, you now also get the invoices with no payment type set.

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

Interestingly, Leonardo Pistone just did a modular rewrite of the do_merge method:
http://bazaar.launchpad.net/~camptocamp/openobject-addons/trunk-refactor-po-merge-lep/revision/9372
Not sure yet what is the plan for 7 (OCB merge? monkey patch? depend on extra module?) or 8 (merge in official?)
But at least the code exists now.

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

Thanks for your response, Alexis. I see you honoured most of my requests. As for purchase do_merge, it's OK to leave it for another proposal.

I am still not convinced of using the payment type, instead of the payment mode. I think it is safe to say that the payment type is an arbitrary technical detail of the way that payment orders are exported for each bank account, but then again so is the actual bank account. However, the first option leads to a big hassle when a bank changes the payment type that it supports (which we see now in the transfer to SEPA and we will see in the future with SEPA updates). The latter option is transparent in that case: you just change this technical detail in the payment mode.

You mention a valid example of course, of a company exporting to one of a couple of bank accounts depending on their liquidity situation. But this is not an argument for implementing this feature on the wrong level. Instead, this is supported transparently in the following manner: link the same payment mode on every partner that you want to include in payments from this pool of bank accounts. This particular payment mode is of course tied to a specific bank account itself, but if the user wants to change the bank account, they can simply change the payment mode on the payment order after selecting the payables, switching to the bank account that they want to use this time.

On the contrary, my use case of a company that wants to pay some suppliers from account A and some suppliers from account B is not supported at all in the current implementation. It would be when you implement it on the level of the payment mode.

It looks to me as if implementing this on the level of the payment mode leads to greater flexibility and no real problems when the payment type should change. So I'm still asking you to reconsider.

review: Needs Fixing

[lp:~akretion-team/banking-addons/70-fully-handle-payment-types]

246. By Alexis de Lattre on 2014-06-09

Update to the new data-model decided during the Open Days 2014.
Add demo data.

[Alexis de Lattre (alexis-via)]

I have just implemented the data-model that we decided during the Open Days ; we don't use payment types any more, only payment modes.

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

Thank you Alexis, code looks good to me! I'll be doing some tests later on.

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

Found a small oversight: ll.973,1738,1922 need to check for the payment_mode_id before asking its bank_id.id

review: Needs Fixing

[lp:~akretion-team/banking-addons/70-fully-handle-payment-types]

247. By Alexis de Lattre on 2014-06-23

Suggested by Stefan Rijnhart : check for the payment_mode_id before asking its bank_id.id

248. By Alexis de Lattre on 2014-06-23

[MERGE] with trunk revno 260.

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

Thanks for the update!

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

review: Approve

=== modified file 'account_banking_pain_base/__openerp__.py'
--- account_banking_pain_base/__openerp__.py	2013-12-24 14:30:37 +0000
+++ account_banking_pain_base/__openerp__.py	2014-06-23 09:47:35 +0000
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    PAIN base module for OpenERP

=== modified file 'account_banking_payment/model/account_payment.py'
--- account_banking_payment/model/account_payment.py	2014-02-16 16:13:15 +0000
+++ account_banking_payment/model/account_payment.py	2014-06-23 09:47:35 +0000
@@ -3,7 +3,7 @@
 #
 #    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
@@ -63,11 +63,11 @@
         ),
         'state': fields.selection([
             ('draft', 'Draft'),
-            ('open','Confirmed'),
-            ('cancel','Cancelled'),
+            ('open', 'Confirmed'),
+            ('cancel', 'Cancelled'),
             ('sent', 'Sent'),
             ('rejected', 'Rejected'),
-            ('done','Done'),
+            ('done', 'Done'),
             ], 'State', select=True
         ),
         'line_ids': fields.one2many(
@@ -81,7 +81,7 @@
             },
         ),
         'user_id': fields.many2one(
-            'res.users','User', required=True,
+            'res.users', 'User', required=True,
             states={
                 'sent': [('readonly', True)],
                 'rejected': [('readonly', True)],
@@ -98,18 +98,19 @@
                 'rejected': [('readonly', True)],
                 'done': [('readonly', True)]
             },
-            help=("Choose an option for the Payment Order:'Fixed' stands for a "
-                  "date specified by you.'Directly' stands for the direct "
+            help=("Choose an option for the Payment Order:'Fixed' stands for "
+                  "a date specified by you.'Directly' stands for the direct "
                   "execution.'Due date' stands for the scheduled date of "
                   "execution."
-                 )
+                  )
             ),
         'date_sent': fields.date('Send date', readonly=True),
     }
 
     def _write_payment_lines(self, cr, uid, ids, **kwargs):
         '''
-        ORM method for setting attributes of corresponding payment.line objects.
+        ORM method for setting attributes of corresponding payment.line
+        objects.
         Note that while this is ORM compliant, it is also very ineffecient due
         to the absence of filters on writes and hence the requirement to
         filter on the client(=OpenERP server) side.
@@ -143,7 +144,7 @@
             cr, uid, ids, *args
         )
 
-    def debit_reconcile_transfer(self, cr, uid, payment_order_id, 
+    def debit_reconcile_transfer(self, cr, uid, payment_order_id,
                                  amount, currency, context=None):
         """
         During import of bank statements, create the reconcile on the transfer
@@ -163,10 +164,10 @@
                 if line.account_id.type == 'other' and not line.reconcile_id:
                     line_ids.append(line.id)
         if self.pool.get('res.currency').is_zero(
-            cr, uid, currency,
-            move_line_obj.get_balance(cr, uid, line_ids) - amount):
+                cr, uid, currency,
+                move_line_obj.get_balance(cr, uid, line_ids) - amount):
             reconcile_id = self.pool.get('account.move.reconcile').create(
-                cr, uid, 
+                cr, uid,
                 {'type': 'auto', 'line_id': [(6, 0, line_ids)]},
                 context)
             # set direct debit order to finished state
@@ -175,8 +176,9 @@
                 uid, 'payment.order', payment_order_id, 'done', cr)
         return reconcile_id
 
-    def debit_unreconcile_transfer(self, cr, uid, payment_order_id, reconcile_id,
-                                 amount, currency, context=None):
+    def debit_unreconcile_transfer(
+            self, cr, uid, payment_order_id, reconcile_id, amount, currency,
+            context=None):
         """
         Due to a cancelled bank statements import, unreconcile the move on
         the transfer account. Delegate the conditions to the workflow.
@@ -194,12 +196,12 @@
         if state != 'sent':
             raise orm.except_orm(
                 _("Cannot unreconcile"),
-                _("Cannot unreconcile payment order: "+
+                _("Cannot unreconcile payment order: "
                   "Workflow will not allow it."))
         return True
 
     def test_undo_done(self, cr, uid, ids, context=None):
-        """ 
+        """
         Called from the workflow. Used to unset done state on
         payment orders that were reconciled with bank transfers
         which are being cancelled.
@@ -213,14 +215,72 @@
         for order in self.browse(cr, uid, ids, context=context):
             for order_line in order.line_ids:
                 if order_line.transit_move_line_id.move_id:
-                    for line in order_line.transit_move_line_id.move_id.line_id:
+                    for line in \
+                            order_line.transit_move_line_id.move_id.line_id:
                         if (line.account_id.type == 'other' and
                                 line.reconcile_id):
                             return False
         return True
-        
+
+    def _prepare_transfer_move(
+            self, cr, uid, order, line, labels, context=None):
+        vals = {
+            'journal_id': order.mode.transfer_journal_id.id,
+            'name': '%s %s' % (labels[order.payment_order_type],
+                               line.move_line_id
+                               and line.move_line_id.move_id.name
+                               or line.communication),
+            'ref': '%s %s' % (order.payment_order_type[:3].upper(),
+                              line.move_line_id
+                              and line.move_line_id.move_id.name
+                              or line.communication),
+            }
+        return vals
+
+    def _prepare_move_line_transfer_account(
+            self, cr, uid, order, line, move_id, labels, context=None):
+        vals = {
+            'name': _('%s for %s') % (
+                labels[order.payment_order_type],
+                line.move_line_id and (line.move_line_id.invoice
+                                       and line.move_line_id.invoice.number
+                                       or line.move_line_id.name)
+                or line.communication),
+            'move_id': move_id,
+            'partner_id': False,
+            'account_id': order.mode.transfer_account_id.id,
+            'credit': (order.payment_order_type == 'payment'
+                       and line.amount or 0.0),
+            'debit': (order.payment_order_type == 'debit'
+                      and line.amount or 0.0),
+            'date': fields.date.context_today(
+                self, cr, uid, context=context),
+            }
+        return vals
+
+    def _update_move_line_partner_account(
+            self, cr, uid, order, line, vals, context=None):
+        vals.update({
+            'partner_id': line.partner_id.id,
+            'account_id': (line.move_line_id
+                           and line.move_line_id.account_id.id
+                           or False),
+            # if not line.move_line_id, the field 'account_id' must be set by
+            # another module that inherit this function, like for example in
+            # the module purchase_payment_order
+            'credit': (order.payment_order_type == 'debit'
+                       and line.amount or 0.0),
+            'debit': (order.payment_order_type == 'payment'
+                      and line.amount or 0.0),
+            })
+        return vals
+
+    def action_sent_no_move_line_hook(self, cr, uid, pay_line, context=None):
+        """This function is designed to be inherited"""
+        return
+
     def action_sent(self, cr, uid, ids, context=None):
-        """ 
+        """
         Create the moves that pay off the move lines from
         the debit order. This happens when the debit order file is
         generated.
@@ -233,63 +293,35 @@
             'debit': _('Direct debit order'),
             }
         for order in self.browse(cr, uid, ids, context=context):
-            if not order.mode.transfer_journal_id or not order.mode.transfer_account_id:
+            if not order.mode.transfer_journal_id \
+                    or not order.mode.transfer_account_id:
                 continue
             for line in order.line_ids:
                 # basic checks
-                if not line.move_line_id:
-                    raise orm.except_orm(
-                        _('Error'),
-                        _('No move line provided for line %s') % line.name)
-                if line.move_line_id.reconcile_id:
-                    raise orm.except_orm(
-                        _('Error'),
-                        _('Move line %s has already been paid/reconciled') % 
-                        line.move_line_id.name
-                        )
+                if line.move_line_id and line.move_line_id.reconcile_id:
+                    raise orm.except_orm(
+                        _('Error'),
+                        _('Move line %s has already been paid/reconciled')
+                        % line.move_line_id.name)
 
-                move_id = account_move_obj.create(cr, uid, {
-                        'journal_id': order.mode.transfer_journal_id.id,
-                        'name': '%s %s' % (labels[order.payment_order_type], 
-                                           line.move_line_id.move_id.name),
-                        'ref': '%s%s' % (order.payment_order_type[:3].upper(),
-                                               line.move_line_id.move_id.name),
-                        }, context=context)
+                move_id = account_move_obj.create(
+                    cr, uid, self._prepare_transfer_move(
+                        cr, uid, order, line, labels, context=context),
+                    context=context)
 
                 # TODO: take multicurrency into account
-                
+
                 # create the debit move line on the transfer account
-                vals = {
-                    'name': _('%s for %s') % (
-                        labels[order.payment_order_type],
-                        line.move_line_id.invoice and 
-                        line.move_line_id.invoice.number or 
-                        line.move_line_id.name),
-                    'move_id': move_id,
-                    'partner_id': False,
-                    'account_id': order.mode.transfer_account_id.id,
-                    'credit': (order.payment_order_type == 'payment'
-                               and line.amount or 0.0),
-                    'debit': (order.payment_order_type == 'debit'
-                              and line.amount or 0.0),
-                    'date': fields.date.context_today(
-                        self, cr, uid, context=context),
-                    }
-                transfer_move_line_id = account_move_line_obj.create(
-                    cr, uid, vals, context=context)
+                ml_vals = self._prepare_move_line_transfer_account(
+                    cr, uid, order, line, move_id, labels, context=context)
+                account_move_line_obj.create(cr, uid, ml_vals, context=context)
 
-                # create the debit move line on the receivable account
-                vals.update({
-                        'partner_id': line.partner_id.id,
-                        'account_id': line.move_line_id.account_id.id,
-                        'credit': (order.payment_order_type == 'debit'
-                                   and line.amount or 0.0),
-                        'debit': (order.payment_order_type == 'payment'
-                                   and line.amount or 0.0),
-                        })               
+                # create the debit move line on the partner account
+                self._update_move_line_partner_account(
+                    cr, uid, order, line, ml_vals, context=context)
                 reconcile_move_line_id = account_move_line_obj.create(
-                    cr, uid, vals, context=context)
-                
+                    cr, uid, ml_vals, context=context)
+
                 # register the debit move line on the payment line
                 # and call reconciliation on it
                 payment_line_obj.write(
@@ -297,16 +329,18 @@
                     {'transit_move_line_id': reconcile_move_line_id},
                     context=context)
 
-                payment_line_obj.debit_reconcile(
-                    cr, uid, line.id, context=context)
+                if line.move_line_id:
+                    payment_line_obj.debit_reconcile(
+                        cr, uid, line.id, context=context)
+                else:
+                    self.action_sent_no_move_line_hook(
+                        cr, uid, line, context=context)
                 account_move_obj.post(cr, uid, [move_id], context=context)
 
         # State field is written by act_sent_wait
         self.write(cr, uid, ids, {
-                'date_sent': fields.date.context_today(
-                    self, cr, uid, context=context),
-                }, context=context)
+            'date_sent': fields.date.context_today(
+                self, cr, uid, context=context),
+            }, context=context)
 
         return True
-
-

=== modified file 'account_banking_payment_export/demo/banking_demo.xml'
--- account_banking_payment_export/demo/banking_demo.xml	2014-02-16 14:01:09 +0000
+++ account_banking_payment_export/demo/banking_demo.xml	2014-06-23 09:47:35 +0000
@@ -21,6 +21,15 @@
     <field name="country" ref="base.fr"/>
 </record>
 
+<record id="bank_societe_generale" model="res.bank">
+    <field name="name">Société Générale</field>
+    <field name="bic">SOGEFRPPXXX</field>
+    <field name="street">1 avenue du Roi Fabien 1er</field>
+    <field name="zip">75008</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>
@@ -30,6 +39,15 @@
     <field name="bank_bic">PSSTFRPPXXX</field>
 </record>
 
+<record id="main_company_iban2" model="res.partner.bank">
+    <field name="acc_number">FR20 1242 1242 1242 1242 1242 124</field>
+    <field name="state">iban</field>
+    <field name="bank" ref="bank_societe_generale"/>
+    <field name="partner_id" ref="base.main_partner" />
+    <field name="bank_name">Société Générale</field>
+    <field name="bank_bic">SOGEFRPPXXX</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>
@@ -39,5 +57,22 @@
     <field name="bank_bic">FTNOFRP1XXX</field>
 </record>
 
+<record id="payment_mode_2" model="payment.mode">
+    <field name="name">Credit Trf Banque Postale</field>
+    <field name="journal" ref="account.bank_journal"/>
+    <field name="bank_id" ref="main_company_iban"/>
+    <field name="company_id" ref="base.main_company"/>
+    <field name="type" ref="account_banking_payment_export.manual_bank_tranfer"/>
+</record>
+
+<record id="payment_mode_3" model="payment.mode">
+    <field name="name">Credit Trf Société Générale</field>
+    <field name="journal" ref="account.bank_journal"/>
+    <field name="bank_id" ref="main_company_iban2"/>
+    <field name="company_id" ref="base.main_company"/>
+    <field name="type" ref="account_banking_payment_export.manual_bank_tranfer"/>
+</record>
+
+
 </data>
 </openerp>

=== modified file 'account_banking_payment_export/model/__init__.py'
--- account_banking_payment_export/model/__init__.py	2014-02-16 14:03:28 +0000
+++ account_banking_payment_export/model/__init__.py	2014-06-23 09:47:35 +0000
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from . import account_move_line
 from . import account_payment
 from . import bank_payment_manual

=== modified file 'account_banking_payment_export/model/account_payment.py'
--- account_banking_payment_export/model/account_payment.py	2014-02-16 16:13:15 +0000
+++ account_banking_payment_export/model/account_payment.py	2014-06-23 09:47:35 +0000
@@ -37,6 +37,9 @@
             'Payment order type', required=True,
             readonly=True, states={'draft': [('readonly', False)]},
             ),
+        'mode_type': fields.related(
+            'mode', 'type', type='many2one', relation='payment.mode.type',
+            string='Payment Type'),
     }
 
     _defaults = {

=== modified file 'account_banking_payment_export/model/payment_mode.py'
--- account_banking_payment_export/model/payment_mode.py	2014-02-16 16:13:15 +0000
+++ account_banking_payment_export/model/payment_mode.py	2014-06-23 09:47:35 +0000
@@ -53,4 +53,9 @@
             'type', 'payment_order_type', readonly=True, type='selection',
             selection=[('payment', 'Payment'), ('debit', 'Direct debit')],
             string="Payment Order Type"),
+        'active': fields.boolean('Active'),
+        }
+
+    _defaults = {
+        'active': True,
         }

=== modified file 'account_banking_payment_export/model/payment_mode_type.py'
--- account_banking_payment_export/model/payment_mode_type.py	2014-02-16 16:13:15 +0000
+++ account_banking_payment_export/model/payment_mode_type.py	2014-06-23 09:47:35 +0000
@@ -53,10 +53,12 @@
             [('payment', 'Payment'), ('debit', 'Direct debit')],
             'Payment order type', required=True,
             ),
+        'active': fields.boolean('Active'),
     }
 
     _defaults = {
         'payment_order_type': 'payment',
+        'active': True,
     }
 
     def _auto_init(self, cr, context=None):

=== modified file 'account_banking_payment_export/view/account_payment.xml'
--- account_banking_payment_export/view/account_payment.xml	2013-08-09 20:55:49 +0000
+++ account_banking_payment_export/view/account_payment.xml	2014-06-23 09:47:35 +0000
@@ -9,12 +9,13 @@
             <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>
+                <xpath expr="//button[@string='Make Payments']"
+                       position="attributes">
+                    <attribute name="name">launch_wizard</attribute>
+                </xpath>
+                <field name="mode" position="after">
+                    <field name="mode_type" invisible="1"/>
+                </field>
             </field>
         </record>
 

=== modified file 'account_banking_payment_export/view/payment_mode.xml'
--- account_banking_payment_export/view/payment_mode.xml	2013-08-13 09:18:15 +0000
+++ account_banking_payment_export/view/payment_mode.xml	2014-06-23 09:47:35 +0000
@@ -11,6 +11,7 @@
             <field name="inherit_id" ref="account_payment.view_payment_mode_form"/>
             <field name="arch" type="xml">
                 <field name="company_id" position="after">
+                    <field name="active"/>
                     <field name="type"/>
                 </field>
             </field>

=== modified file 'account_banking_payment_export/view/payment_mode_type.xml'
--- account_banking_payment_export/view/payment_mode_type.xml	2013-09-12 07:32:00 +0000
+++ account_banking_payment_export/view/payment_mode_type.xml	2014-06-23 09:47:35 +0000
@@ -18,14 +18,42 @@
             <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"/>
+                <form string="Payment Type" version="7.0">
+                    <group name="main">
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="active"/>
+                        <field name="ir_model_id"/>
+                        <field name="suitable_bank_types"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_payment_mode_type_tree" model="ir.ui.view">
+            <field name="name">view.payment.mode.type.tree</field>
+            <field name="model">payment.mode.type</field>
+            <field name="arch" type="xml">
+                <tree string="Payment Types">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="active"/>
                     <field name="ir_model_id"/>
-                </form>
+                </tree>
             </field>
         </record>
 
+        <record id="action_payment_mode_type" model="ir.actions.act_window">
+            <field name="name">Payment Type</field>
+            <field name="res_model">payment.mode.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'active_test': False}</field>
+        </record>
+
+        <menuitem id="menu_payment_mode_type"
+            action="action_payment_mode_type"
+            parent="account.menu_configuration_misc" />
+
     </data>
 </openerp>

=== modified file 'account_banking_sepa_credit_transfer/__openerp__.py'
--- account_banking_sepa_credit_transfer/__openerp__.py	2014-02-16 14:01:09 +0000
+++ account_banking_sepa_credit_transfer/__openerp__.py	2014-06-23 09:47:35 +0000
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    SEPA Credit Transfer module for OpenERP

=== modified file 'account_banking_sepa_credit_transfer/account_banking_sepa.py'
--- account_banking_sepa_credit_transfer/account_banking_sepa.py	2013-12-24 00:01:04 +0000
+++ account_banking_sepa_credit_transfer/account_banking_sepa.py	2014-06-23 09:47:35 +0000
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    SEPA Credit Transfer module for OpenERP
@@ -81,7 +82,6 @@
         'state': fields.selection([
             ('draft', 'Draft'),
             ('sent', 'Sent'),
-            ('done', 'Reconciled'),
             ], 'State', readonly=True),
     }
 

=== modified file 'account_banking_sepa_credit_transfer/account_banking_sepa_view.xml'
--- account_banking_sepa_credit_transfer/account_banking_sepa_view.xml	2013-11-21 23:41:32 +0000
+++ account_banking_sepa_credit_transfer/account_banking_sepa_view.xml	2014-06-23 09:47:35 +0000
@@ -11,28 +11,24 @@
     <field name="name">account.banking.export.sepa.form</field>
     <field name="model">banking.export.sepa</field>
     <field name="arch" type="xml">
-        <form string="SEPA Credit Transfer">
+        <form string="SEPA Credit Transfer" version="7.0">
+            <header>
+                <field name="state" widget="statusbar"/>
+            </header>
             <notebook>
                 <page string="General Information">
-                    <field name="total_amount" />
-                    <field name="nb_transactions" />
-                    <field name="batch_booking" />
-                    <field name="charge_bearer"/>
-                    <field name="create_date" />
-                    <newline />
-                    <field name="file" filename="filename"/>
-                    <field name="filename" invisible="True"/>
+                    <group name="main">
+                        <field name="total_amount" />
+                        <field name="nb_transactions" />
+                        <field name="batch_booking" />
+                        <field name="charge_bearer"/>
+                        <field name="create_date" />
+                        <field name="file" filename="filename"/>
+                        <field name="filename" invisible="True"/>
+                    </group>
                 </page>
                 <page string="Payment Orders">
-                    <field name="payment_order_ids" colspan="4" nolabel="1">
-                        <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" string="Payment Orders">
-                            <field name="reference"/>
-                            <field name="date_created"/>
-                            <field name="date_done"/>
-                            <field name="total"/>
-                            <field name="state"/>
-                        </tree>
-                    </field>
+                    <field name="payment_order_ids" nolabel="1"/>
                 </page>
             </notebook>
         </form>
@@ -48,6 +44,7 @@
             <field name="filename"/>
             <field name="create_date"/>
             <field name="nb_transactions"/>
+            <field name="state"/>
         </tree>
     </field>
 </record>

=== modified file 'account_banking_sepa_direct_debit/__openerp__.py'
--- account_banking_sepa_direct_debit/__openerp__.py	2014-02-16 14:01:09 +0000
+++ account_banking_sepa_direct_debit/__openerp__.py	2014-06-23 09:47:35 +0000
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    SEPA Direct Debit module for OpenERP

=== modified file 'account_banking_sepa_direct_debit/account_banking_sdd.py'
--- account_banking_sepa_direct_debit/account_banking_sdd.py	2014-06-12 16:05:52 +0000
+++ account_banking_sepa_direct_debit/account_banking_sdd.py	2014-06-23 09:47:35 +0000
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    SEPA Direct Debit module for OpenERP
@@ -89,7 +90,6 @@
         'state': fields.selection([
             ('draft', 'Draft'),
             ('sent', 'Sent'),
-            ('done', 'Reconciled'),
             ], 'State', readonly=True),
     }
 

=== modified file 'account_banking_sepa_direct_debit/account_banking_sdd_view.xml'
--- account_banking_sepa_direct_debit/account_banking_sdd_view.xml	2013-12-12 22:19:53 +0000
+++ account_banking_sepa_direct_debit/account_banking_sdd_view.xml	2014-06-23 09:47:35 +0000
@@ -11,28 +11,24 @@
     <field name="name">account.banking.export.sdd.form</field>
     <field name="model">banking.export.sdd</field>
     <field name="arch" type="xml">
-        <form string="SEPA Direct Debit">
+        <form string="SEPA Direct Debit" version="7.0">
+            <header>
+                <field name="state" widget="statusbar"/>
+            </header>
             <notebook>
                 <page string="General Information">
-                    <field name="total_amount" />
-                    <field name="nb_transactions" />
-                    <field name="batch_booking" />
-                    <field name="charge_bearer"/>
-                    <field name="create_date" />
-                    <newline />
-                    <field name="file" filename="filename"/>
-                    <field name="filename" invisible="True"/>
+                    <group name="main">
+                        <field name="total_amount" />
+                        <field name="nb_transactions" />
+                        <field name="batch_booking" />
+                        <field name="charge_bearer"/>
+                        <field name="create_date" />
+                        <field name="file" filename="filename"/>
+                        <field name="filename" invisible="True"/>
+                    </group>
                 </page>
                 <page string="Payment Orders">
-                    <field name="payment_order_ids" colspan="4" nolabel="1">
-                        <tree colors="blue:state in ('draft');gray:state in ('cancel','done');black:state in ('open')" string="Payment Orders">
-                            <field name="reference"/>
-                            <field name="date_created"/>
-                            <field name="date_done"/>
-                            <field name="total"/>
-                            <field name="state"/>
-                        </tree>
-                    </field>
+                    <field name="payment_order_ids" nolabel="1"/>
                 </page>
             </notebook>
         </form>
@@ -48,6 +44,7 @@
             <field name="filename"/>
             <field name="create_date"/>
             <field name="nb_transactions"/>
+            <field name="state"/>
         </tree>
     </field>
 </record>

=== modified file 'account_banking_sepa_direct_debit/company.py'
--- account_banking_sepa_direct_debit/company.py	2013-12-24 00:01:04 +0000
+++ account_banking_sepa_direct_debit/company.py	2014-06-23 09:47:35 +0000
@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
 #    SEPA Direct Debit module for OpenERP

=== added directory 'account_payment_partner'
=== added file 'account_payment_partner/__init__.py'
--- account_payment_partner/__init__.py	1970-01-01 00:00:00 +0000
+++ account_payment_partner/__init__.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Partner module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 . import model

=== added file 'account_payment_partner/__openerp__.py'
--- account_payment_partner/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_payment_partner/__openerp__.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,55 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Partner module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 Payment Partner',
+    'version': '0.1',
+    'category': 'Banking addons',
+    'license': 'AGPL-3',
+    'summary': 'Adds payment mode on partners and invoices',
+    'description': """
+Account Payment Partner
+=======================
+
+This module adds severals fields :
+
+* the *Supplier Payment Mode* and *Customer Payment Mode* on Partners,
+
+* the *Payment Mode* on Invoices.
+
+On a Payment Order, in the wizard *Select Invoices to Pay*, the invoices will
+be filtered per Payment Mode.
+
+Please contact Alexis de Lattre from Akretion <[e-mail]>
+for any help or question about this module.
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com',
+    'depends': ['account_banking_payment_export'],
+    'data': [
+        'view/partner.xml',
+        'view/account_invoice.xml',
+    ],
+    'demo': ['demo/partner_demo.xml'],
+    'active': False,
+}

=== added directory 'account_payment_partner/demo'
=== added file 'account_payment_partner/demo/partner_demo.xml'
--- account_payment_partner/demo/partner_demo.xml	1970-01-01 00:00:00 +0000
+++ account_payment_partner/demo/partner_demo.xml	2014-06-23 09:47:35 +0000
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<openerp>
+<data noupdate="1">
+
+<!-- Camptocamp -->
+<record id="supplier_payment_mode_12" model="ir.property" forcecreate="True">
+    <field name="name">supplier_payment_mode_12</field>
+    <field name="fields_id"
+    search="[('model','=','res.partner'),('name','=','supplier_payment_mode')]"/>
+    <field name="value"
+    eval="'payment.mode,'+str(ref('account_banking_payment_export.payment_mode_2'))"/>
+    <field name="company_id" ref="base.main_company"/>
+    <field name="res_id" ref="base.res_partner_12"/>
+</record>
+
+<record id="customer_payment_mode_12" model="ir.property" forcecreate="True">
+    <field name="name">customer_payment_mode_12</field>
+    <field name="fields_id"
+    search="[('model','=','res.partner'),('name','=','customer_payment_mode')]"/>
+    <field name="value"
+    eval="'payment.mode,'+str(ref('account_banking_payment_export.payment_mode_2'))"/>
+    <field name="company_id" ref="base.main_company"/>
+    <field name="res_id" ref="base.res_partner_12"/>
+</record>
+
+<!-- Agrolait -->
+<record id="customer_payment_mode_2" model="ir.property" forcecreate="True">
+    <field name="name">customer_payment_mode_2</field>
+    <field name="fields_id"
+    search="[('model','=','res.partner'),('name','=','customer_payment_mode')]"/>
+    <field name="value"
+    eval="'payment.mode,'+str(ref('account_banking_payment_export.payment_mode_3'))"/>
+    <field name="company_id" ref="base.main_company"/>
+    <field name="res_id" ref="base.res_partner_2"/>
+</record>
+
+<!-- Asustek -->
+<record id="supplier_payment_mode_1" model="ir.property" forcecreate="True">
+    <field name="name">supplier_payment_mode_1</field>
+    <field name="fields_id"
+    search="[('model','=','res.partner'),('name','=','supplier_payment_mode')]"/>
+    <field name="value"
+    eval="'payment.mode,'+str(ref('account_banking_payment_export.payment_mode_2'))"/>
+    <field name="company_id" ref="base.main_company"/>
+    <field name="res_id" ref="base.res_partner_1"/>
+</record>
+
+
+</data>
+</openerp>

=== added directory 'account_payment_partner/i18n'
=== added file 'account_payment_partner/i18n/account_payment_partner.pot'
--- account_payment_partner/i18n/account_payment_partner.pot	1970-01-01 00:00:00 +0000
+++ account_payment_partner/i18n/account_payment_partner.pot	2014-06-23 09:47:35 +0000
@@ -0,0 +1,57 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_payment_partner
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-09 23:22+0000\n"
+"PO-Revision-Date: 2014-06-09 23:22+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_payment_partner
+#: field:res.partner,customer_payment_mode:0
+msgid "Customer Payment Mode"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model,name:account_payment_partner.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model,name:account_payment_partner.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: account_payment_partner
+#: field:account.invoice,payment_mode_id:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment_partner
+#: help:res.partner,customer_payment_mode:0
+msgid "Select the default payment mode for this customer."
+msgstr ""
+
+#. module: account_payment_partner
+#: help:res.partner,supplier_payment_mode:0
+msgid "Select the default payment mode for this supplier."
+msgstr ""
+
+#. module: account_payment_partner
+#: field:res.partner,supplier_payment_mode:0
+msgid "Supplier Payment Mode"
+msgstr ""
+
+#. module: account_payment_partner
+#: model:ir.model,name:account_payment_partner.model_payment_order_create
+msgid "payment.order.create"
+msgstr ""
+

=== added directory 'account_payment_partner/model'
=== added file 'account_payment_partner/model/__init__.py'
--- account_payment_partner/model/__init__.py	1970-01-01 00:00:00 +0000
+++ account_payment_partner/model/__init__.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Partner module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 . import partner
+from . import account_invoice
+from . import payment_order_create

=== added file 'account_payment_partner/model/account_invoice.py'
--- account_payment_partner/model/account_invoice.py	1970-01-01 00:00:00 +0000
+++ account_payment_partner/model/account_invoice.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,56 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Partner module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 account_invoice(orm.Model):
+    _inherit = 'account.invoice'
+
+    _columns = {
+        'payment_mode_id': fields.many2one(
+            'payment.mode', 'Payment Mode'),
+        }
+
+    def onchange_partner_id(
+            self, cr, uid, ids, type, partner_id, date_invoice=False,
+            payment_term=False, partner_bank_id=False, company_id=False):
+        res = super(account_invoice, self).onchange_partner_id(
+            cr, uid, ids, type, partner_id, date_invoice=date_invoice,
+            payment_term=payment_term, partner_bank_id=partner_bank_id,
+            company_id=company_id)
+        if partner_id:
+            partner = self.pool['res.partner'].browse(cr, uid, partner_id)
+            if type == 'in_invoice':
+                res['value']['payment_mode_id'] = \
+                    partner.supplier_payment_mode.id or False
+            elif type == 'out_invoice':
+                res['value'].update({
+                    'payment_mode_id':
+                    partner.customer_payment_mode.id or False,
+                    'partner_bank_id':
+                    partner.customer_payment_mode and
+                    partner.customer_payment_mode.bank_id.id or False,
+                    })
+        else:
+            res['value']['payment_mode_id'] = False
+        return res

=== added file 'account_payment_partner/model/partner.py'
--- account_payment_partner/model/partner.py	1970-01-01 00:00:00 +0000
+++ account_payment_partner/model/partner.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Partner module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 res_partner(orm.Model):
+    _inherit = 'res.partner'
+
+    _columns = {
+        'supplier_payment_mode': fields.property(
+            'payment.mode', type='many2one', relation='payment.mode',
+            string='Supplier Payment Mode', view_load=True,
+            help="Select the default payment mode for this supplier."),
+        'customer_payment_mode': fields.property(
+            'payment.mode', type='many2one', relation='payment.mode',
+            string='Customer Payment Mode', view_load=True,
+            help="Select the default payment mode for this customer."),
+        }
+
+    def _commercial_fields(self, cr, uid, context=None):
+        res = super(res_partner, self)._commercial_fields(
+            cr, uid, context=context)
+        res += ['supplier_payment_mode', 'customer_payment_mode']
+        return res

=== added file 'account_payment_partner/model/payment_order_create.py'
--- account_payment_partner/model/payment_order_create.py	1970-01-01 00:00:00 +0000
+++ account_payment_partner/model/payment_order_create.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Partner module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 extend_payment_order_domain(
+            self, cr, uid, payment_order, domain, context=None):
+        super(payment_order_create, self).extend_payment_order_domain(
+            cr, uid, payment_order, domain, context=context)
+        domain += [
+            '|', '|',
+            ('invoice', '=', False),
+            ('invoice.payment_mode_id', '=', False),
+            ('invoice.payment_mode_id', '=', payment_order.mode.id)
+            ]
+        return True

=== added directory 'account_payment_partner/view'
=== added file 'account_payment_partner/view/account_invoice.xml'
--- account_payment_partner/view/account_invoice.xml	1970-01-01 00:00:00 +0000
+++ account_payment_partner/view/account_invoice.xml	2014-06-23 09:47:35 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Copyright (C) 2014 Akretion (http://www.akretion.com/)
+    @author Alexis de Lattre <[e-mail]>
+    The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+
+<record id="invoice_form" model="ir.ui.view">
+    <field name="name">account_payment_partner.invoice_form</field>
+    <field name="model">account.invoice</field>
+    <field name="inherit_id" ref="account.invoice_form" />
+    <field name="arch" type="xml">
+        <field name="partner_bank_id" position="after">
+            <field name="payment_mode_id"/>
+        </field>
+    </field>
+</record>
+
+
+<record id="invoice_supplier_form" model="ir.ui.view">
+    <field name="name">account_payment_partner.invoice_supplier_form</field>
+    <field name="model">account.invoice</field>
+    <field name="inherit_id" ref="account.invoice_supplier_form" />
+    <field name="arch" type="xml">
+        <field name="partner_bank_id" position="after">
+            <field name="payment_mode_id"/>
+        </field>
+    </field>
+</record>
+
+
+</data>
+</openerp>

=== added file 'account_payment_partner/view/partner.xml'
--- account_payment_partner/view/partner.xml	1970-01-01 00:00:00 +0000
+++ account_payment_partner/view/partner.xml	2014-06-23 09:47:35 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Copyright (C) 2014 Akretion (http://www.akretion.com/)
+    @author Alexis de Lattre <[e-mail]>
+    The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+
+<record id="view_partner_property_form" model="ir.ui.view">
+    <field name="name">account_partner_payment.partner_form</field>
+    <field name="model">res.partner</field>
+    <field name="inherit_id" ref="account.view_partner_property_form" />
+    <field name="arch" type="xml">
+        <field name="property_payment_term" position="after">
+            <field name="customer_payment_mode"
+                attrs="{'invisible': [('customer', '=', False)]}"/>
+        </field>
+        <field name="property_supplier_payment_term" position="after">
+            <field name="supplier_payment_mode"
+                attrs="{'invisible': [('supplier', '=', False)]}"/>
+        </field>
+    </field>
+</record>
+
+
+</data>
+</openerp>

=== added directory 'account_payment_purchase'
=== added file 'account_payment_purchase/__init__.py'
--- account_payment_purchase/__init__.py	1970-01-01 00:00:00 +0000
+++ account_payment_purchase/__init__.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Purchase module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 . import model

=== added file 'account_payment_purchase/__openerp__.py'
--- account_payment_purchase/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_payment_purchase/__openerp__.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,55 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Purchase module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com).
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 Payment Purchase',
+    'version': '1.0',
+    'category': 'Banking addons',
+    'license': 'AGPL-3',
+    'summary': "Adds Bank Account and Payment Mode on Purchase Orders",
+    'description': """
+Account Payment Purchase
+========================
+
+This modules adds 2 fields on purchase orders : *Bank Account* and *Payment
+Mode*. These fields are copied from partner to purchase order and then from
+purchase order to supplier invoice.
+
+This module is similar to the *purchase_payment* module ; the main difference
+is that it doesn't depend on the *account_payment_extension* module (it's not
+the only module to conflict with *account_payment_extension* ; all the SEPA
+modules in the banking addons conflict with *account_payment_extension*, cf
+banking-addons-70/account_banking_payment_export/__openerp__.py).
+
+Please contact Alexis de Lattre from Akretion <[e-mail]>
+for any help or question about this module.
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com',
+    'depends': ['purchase', 'account_payment_partner'],
+    'conflicts': ['purchase_payment'],
+    'data': [
+        'view/purchase.xml',
+    ],
+    'installable': True,
+    'active': False,
+}

=== added directory 'account_payment_purchase/i18n'
=== added file 'account_payment_purchase/i18n/account_payment_purchase.pot'
--- account_payment_purchase/i18n/account_payment_purchase.pot	1970-01-01 00:00:00 +0000
+++ account_payment_purchase/i18n/account_payment_purchase.pot	2014-06-23 09:47:35 +0000
@@ -0,0 +1,42 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_payment_purchase
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-09 23:23+0000\n"
+"PO-Revision-Date: 2014-06-09 23:23+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr ""
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank_id:0
+msgid "Select the bank account of your supplier on which your company should send the payment. This field is copied from the partner and will be copied to the supplier invoice."
+msgstr ""
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank_id:0
+msgid "Supplier Bank Account"
+msgstr ""
+

=== added file 'account_payment_purchase/i18n/fr.po'
--- account_payment_purchase/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ account_payment_purchase/i18n/fr.po	2014-06-23 09:47:35 +0000
@@ -0,0 +1,42 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_payment_purchase
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-24 23:09+0000\n"
+"PO-Revision-Date: 2014-02-24 23:09+0000\n"
+"Last-Translator: Alexis de Lattre <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_payment_purchase
+#: field:purchase.order,payment_mode_type:0
+msgid "Payment Type"
+msgstr "Type de Paiement"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_purchase_order
+msgid "Purchase Order"
+msgstr "Bon de commande"
+
+#. module: account_payment_purchase
+#: help:purchase.order,supplier_partner_bank:0
+msgid "Select the bank account of your supplier on which your company should send the payment. This field is copied from the partner and will be copied to the supplier invoice."
+msgstr "Selectionnez le compte bancaire du fournisseur sur lequel votre société devra effectuer le règlement. Ce champ est copié depuis le partenaire et sera recopié sur la facture fournisseur."
+
+#. module: account_payment_purchase
+#: field:purchase.order,supplier_partner_bank:0
+msgid "Supplier Bank Account"
+msgstr "Compte bancaire du fournisseur"
+
+#. module: account_payment_purchase
+#: model:ir.model,name:account_payment_purchase.model_stock_picking
+msgid "Picking List"
+msgstr "Bon de livraison"
+

=== added directory 'account_payment_purchase/model'
=== added file 'account_payment_purchase/model/__init__.py'
--- account_payment_purchase/model/__init__.py	1970-01-01 00:00:00 +0000
+++ account_payment_purchase/model/__init__.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Purchase module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 . import purchase
+from . import stock

=== added file 'account_payment_purchase/model/purchase.py'
--- account_payment_purchase/model/purchase.py	1970-01-01 00:00:00 +0000
+++ account_payment_purchase/model/purchase.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,82 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Purchase module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 purchase_order(orm.Model):
+    _inherit = "purchase.order"
+
+    _columns = {
+        'supplier_partner_bank_id': fields.many2one(
+            'res.partner.bank', 'Supplier Bank Account',
+            help="Select the bank account of your supplier on which "
+            "your company should send the payment. This field is copied "
+            "from the partner and will be copied to the supplier invoice."),
+        'payment_mode_id': fields.many2one(
+            'payment.mode', 'Payment Mode'),
+        }
+
+    def _get_default_supplier_partner_bank(
+            self, cr, uid, partner, context=None):
+        '''This function is designed to be inherited'''
+        if partner.bank_ids:
+            return partner.bank_ids[0].id
+        else:
+            return False
+
+    def onchange_partner_id(self, cr, uid, ids, partner_id):
+        res = super(purchase_order, self).onchange_partner_id(
+            cr, uid, ids, partner_id)
+        if partner_id:
+            partner = self.pool['res.partner'].browse(
+                cr, uid, partner_id)
+            res['value'].update({
+                'supplier_partner_bank_id':
+                self._get_default_supplier_partner_bank(
+                    cr, uid, partner),
+                'payment_mode_id':
+                partner.supplier_payment_mode.id or False,
+                })
+        else:
+            res['value'].update({
+                'supplier_partner_bank_id': False,
+                'payment_mode_id': False,
+                })
+        return res
+
+    def action_invoice_create(self, cr, uid, ids, context=None):
+        """Copy bank partner + payment type from PO to invoice"""
+        # as of OpenERP 7.0, there is no _prepare function for
+        # the invoice (the _prepare function only exists for invoice lines)
+        res = super(purchase_order, self).action_invoice_create(
+            cr, uid, ids, context=context)
+        for order in self.browse(cr, uid, ids, context=context):
+            for invoice in order.invoice_ids:
+                if invoice.state == 'draft':
+                    invoice.write({
+                        'partner_bank_id':
+                        order.supplier_partner_bank_id.id or False,
+                        'payment_mode_id':
+                        order.payment_mode_id.id or False,
+                        }, context=context)
+        return res

=== added file 'account_payment_purchase/model/stock.py'
--- account_payment_purchase/model/stock.py	1970-01-01 00:00:00 +0000
+++ account_payment_purchase/model/stock.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Purchase module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 stock_picking(orm.Model):
+    _inherit = "stock.picking"
+
+    def _prepare_invoice(
+            self, cr, uid, picking, partner, inv_type, journal_id,
+            context=None):
+        """Copy bank partner and payment type from PO to invoice"""
+        invoice_vals = super(stock_picking, self)._prepare_invoice(
+            cr, uid, picking, partner, inv_type, journal_id, context=context)
+        if picking.purchase_id:
+            invoice_vals.update({
+                'partner_bank_id':
+                picking.purchase_id.supplier_partner_bank.id or False,
+                'payment_mode_type':
+                picking.purchase_id.payment_mode_type.id or False,
+                })
+        return invoice_vals

=== added directory 'account_payment_purchase/view'
=== added file 'account_payment_purchase/view/purchase.xml'
--- account_payment_purchase/view/purchase.xml	1970-01-01 00:00:00 +0000
+++ account_payment_purchase/view/purchase.xml	2014-06-23 09:47:35 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Copyright (C) 2014 Akretion (http://www.akretion.com/)
+    @author Alexis de Lattre <[e-mail]>
+    The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+<record id="purchase_order_form" model="ir.ui.view">
+    <field name="name">account_payment_purchase.purchase_order.form</field>
+    <field name="model">purchase.order</field>
+    <field name="inherit_id" ref="purchase.purchase_order_form"/>
+    <field name="arch" type="xml">
+        <field name="payment_term_id" position="after">
+            <field name="payment_mode_id"/>
+            <field name="supplier_partner_bank_id"
+                domain="[('partner_id', '=', partner_id)]" />
+        </field>
+    </field>
+</record>
+
+</data>
+</openerp>

=== added directory 'account_payment_sale'
=== added file 'account_payment_sale/__init__.py'
--- account_payment_sale/__init__.py	1970-01-01 00:00:00 +0000
+++ account_payment_sale/__init__.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Sale module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 . import model

=== added file 'account_payment_sale/__openerp__.py'
--- account_payment_sale/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_payment_sale/__openerp__.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,55 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Sale module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com).
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 Payment Sale',
+    'version': '1.0',
+    'category': 'Banking addons',
+    'license': 'AGPL-3',
+    'summary': "Adds Payment Mode on Sale Orders",
+    'description': """
+Account Payment Sale
+====================
+
+This modules adds one field on sale orders : *Payment Mode*.
+This field is copied from partner to sale order and then from sale order to
+customer invoice.
+
+This module is similar to the *sale_payment* module ; the main difference is
+that it doesn't depend on the *account_payment_extension* module (it's not the
+only module to conflict with *account_payment_extension* ; all the SEPA
+modules in the banking addons conflict with *account_payment_extension*, cf
+banking-addons-70/account_banking_payment_export/__openerp__.py).
+
+Please contact Alexis de Lattre from Akretion <[e-mail]>
+for any help or question about this module.
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com',
+    'depends': ['sale', 'account_payment_partner'],
+    'conflicts': ['sale_payment'],
+    'data': [
+        'view/sale.xml',
+    ],
+    'installable': True,
+    'active': False,
+}

=== added directory 'account_payment_sale/i18n'
=== added file 'account_payment_sale/i18n/account_payment_sale.pot'
--- account_payment_sale/i18n/account_payment_sale.pot	1970-01-01 00:00:00 +0000
+++ account_payment_sale/i18n/account_payment_sale.pot	2014-06-23 09:47:35 +0000
@@ -0,0 +1,27 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_payment_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-09 23:24+0000\n"
+"PO-Revision-Date: 2014-06-09 23:24+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_payment_sale
+#: field:sale.order,payment_mode_id:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment_sale
+#: model:ir.model,name:account_payment_sale.model_sale_order
+msgid "Sales Order"
+msgstr ""
+

=== added directory 'account_payment_sale/model'
=== added file 'account_payment_sale/model/__init__.py'
--- account_payment_sale/model/__init__.py	1970-01-01 00:00:00 +0000
+++ account_payment_sale/model/__init__.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Sale module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 . import sale

=== added file 'account_payment_sale/model/sale.py'
--- account_payment_sale/model/sale.py	1970-01-01 00:00:00 +0000
+++ account_payment_sale/model/sale.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,55 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Sale module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 sale_order(orm.Model):
+    _inherit = "sale.order"
+
+    _columns = {
+        'payment_mode_id': fields.many2one(
+            'payment.mode', 'Payment Mode'),
+        }
+
+    def onchange_partner_id(self, cr, uid, ids, part, context=None):
+        res = super(sale_order, self).onchange_partner_id(
+            cr, uid, ids, part, context=context)
+        if part:
+            partner = self.pool['res.partner'].browse(
+                cr, uid, part, context=context)
+            res['value']['payment_mode_id'] = \
+                partner.customer_payment_mode.id or False,
+        else:
+            res['value']['payment_mode_id'] = False
+        return res
+
+    def _prepare_invoice(self, cr, uid, order, lines, context=None):
+        """Copy bank partner from sale order to invoice"""
+        invoice_vals = super(sale_order, self)._prepare_invoice(
+            cr, uid, order, lines, context=context)
+        invoice_vals.update({
+            'payment_mode_id': order.payment_mode_id.id or False,
+            'partner_bank_id': order.payment_mode_id and
+            order.payment_mode_id.bank_id.id or False,
+            })
+        return invoice_vals

=== added directory 'account_payment_sale/view'
=== added file 'account_payment_sale/view/sale.xml'
--- account_payment_sale/view/sale.xml	1970-01-01 00:00:00 +0000
+++ account_payment_sale/view/sale.xml	2014-06-23 09:47:35 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Copyright (C) 2014 Akretion (http://www.akretion.com/)
+    @author Alexis de Lattre <[e-mail]>
+    The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+<record id="view_order_form" model="ir.ui.view">
+    <field name="name">account_payment_sale.sale_order.form</field>
+    <field name="model">sale.order</field>
+    <field name="inherit_id" ref="sale.view_order_form"/>
+    <field name="arch" type="xml">
+        <field name="payment_term" position="after">
+            <field name="payment_mode_id"/>
+        </field>
+    </field>
+</record>
+
+</data>
+</openerp>

=== added directory 'account_payment_sale_stock'
=== added file 'account_payment_sale_stock/__init__.py'
--- account_payment_sale_stock/__init__.py	1970-01-01 00:00:00 +0000
+++ account_payment_sale_stock/__init__.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Sale Stock module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 . import model

=== added file 'account_payment_sale_stock/__openerp__.py'
--- account_payment_sale_stock/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_payment_sale_stock/__openerp__.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Sale Stock module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com).
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 Payment Sale Stock',
+    'version': '1.0',
+    'category': 'Banking addons',
+    'license': 'AGPL-3',
+    'summary': "Manage Payment Mode when invoicing from picking",
+    'description': """
+Account Payment Sale Stock
+==========================
+
+This modules copies *Payment Mode* from Sale Order to Invoice when the
+Invoice is generated from the Picking.
+
+Please contact Alexis de Lattre from Akretion <[e-mail]>
+for any help or question about this module.
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com',
+    'depends': ['sale_stock', 'account_payment_sale'],
+    'conflicts': ['account_payment_extension'],
+    'data': [],
+    'auto_install': True,
+    'active': False,
+}

=== added directory 'account_payment_sale_stock/model'
=== added file 'account_payment_sale_stock/model/__init__.py'
--- account_payment_sale_stock/model/__init__.py	1970-01-01 00:00:00 +0000
+++ account_payment_sale_stock/model/__init__.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Sale Stock module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 . import stock

=== added file 'account_payment_sale_stock/model/stock.py'
--- account_payment_sale_stock/model/stock.py	1970-01-01 00:00:00 +0000
+++ account_payment_sale_stock/model/stock.py	2014-06-23 09:47:35 +0000
@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account Payment Sale Stock module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 stock_picking(orm.Model):
+    _inherit = "stock.picking"
+
+    def _prepare_invoice(
+            self, cr, uid, picking, partner, inv_type, journal_id,
+            context=None):
+        """Copy payment mode from sale order to invoice"""
+        invoice_vals = super(stock_picking, self)._prepare_invoice(
+            cr, uid, picking, partner, inv_type, journal_id, context=context)
+        if picking.sale_id:
+            invoice_vals.update({
+                'partner_bank_id':
+                picking.sale_id.payment_mode_id and
+                picking.sale_id.payment_mode_id.bank_id.id or False,
+                'payment_mode_id':
+                picking.sale_id.payment_mode_id.id or False,
+                })
+        return invoice_vals