Merge lp:~extra-addons-commiter/e-commerce-addons/7.0-sale-method into lp:~extra-addons-commiter/e-commerce-addons/7.0

[Guewen Baconnier @ Camptocamp]

[IMP] review of sale_quick_payment for the new release of the connectors:

* split module in sale_payment_method and sale_quick_payment
* generate bare account move lines instead of voucher
* onchange when the payment method is modified
* new method to generate a payment using the payment terms and the payment method

This is part of the migration of the connectors (especially magentoerpconnect for my part) to version 7.0 of OpenERP.

This merge proposal aims to improve / adapt the module sale_quick_payment for this new release of the Magentoerpconnect.

Most of the changes were discussed with Sébastien Beau.

List of changes:

* The module 'sale_quick_payment' has been split in 2 modules:
  - 'sale_payment_method' which is the 'underwater' part of the module, it manages the payment methods and the creation of payments
  - 'sale_quick_payment' depends on the former and adds a wizard to generate the payments from the sale order and display them in the 'Automation Information' tab.
  This split allows to use the automatic payments from the connectors without using the manual wizard.

* Pursuing the voucher's killing spree, the payment generated are no longer vouchers but bare accounting move lines.

* In version 6.1, the default fiscal position was directly set by the connectors. Now, it is set by an onchange (the onchange will also be used to set the workflow process in my next merge proposal). The connectors still have to call the onchange.

* New method to generate a payment respecting the terms of the payment terms. The connectors should call this method when they generate a payment. It will allow a correct credit control.

* Fix: when a method is used in a sale order, it can no longer be deleted (FK 'restrict' instead of 'set null')

@Sébastien: I didn't do the migration, you said me you could do it yourself. I pushed my branch on the group extra-addons-commiter so you should be able to add it here.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hi,

Can I have some reviews on this one please? This will be necessary for the release of the new Magento Connector ;-)

[lp:~extra-addons-commiter/e-commerce-addons/7.0-sale-method]

297. By Guewen Baconnier @ Camptocamp on 2013-09-25

[FIX] fr_FR.po files not loaded, should be named fr.po

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Nitpicking

l35: one space to be removed
l434 and l435 aren't aligned as well
l436: missing #

Or

What about removing those trailing and bothering # as you did in sale_payment_method/sale.py?
:%s/\s\+#$//

in xml files name of the module is named in header comment shouldn't we change it to new name sale_payment_method for this splitted part?

l488 misleader name for view this one is in sale_payment_method and not in sale_quick_payment

l600 + l1222
import of decimal_precision should be
import openerp.addons.decimal_precision as dp

in pay_sale_order.xml there is another
            <field name="type">form</field>
you can remove as you did it in edited xml files

review: Needs Fixing (code, no test)

[lp:~extra-addons-commiter/e-commerce-addons/7.0-sale-method]

298. By Guewen Baconnier @ Camptocamp on 2013-09-26

[CHG] removed the trailing # in the headers

299. By Guewen Baconnier @ Camptocamp on 2013-09-26

[FIX] use explicit relative import

300. By Guewen Baconnier @ Camptocamp on 2013-09-26

[FIX] misleading module name

301. By Guewen Baconnier @ Camptocamp on 2013-09-26

[FIX] misleading module name in views names

302. By Guewen Baconnier @ Camptocamp on 2013-09-26

[CHG] remove trailing # in headers

303. By Guewen Baconnier @ Camptocamp on 2013-09-26

[FIX] imports

304. By Guewen Baconnier @ Camptocamp on 2013-09-26

[FIX] removed deprecated view type

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks for the review, I made the changes.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Thanks for the changes

LGTM

review: Approve

[lp:~extra-addons-commiter/e-commerce-addons/7.0-sale-method]

305. By Sébastien BEAU - http://www.akretion.com on 2013-09-20

[IMP] sale_payment_method add the possibility to add the description when adding a payment

306. By Sébastien BEAU - http://www.akretion.com on 2013-09-20

[IMP] sale_quick_payment : add the posibility to specify the description when adding a payment with the wizard

307. By Sébastien BEAU - http://www.akretion.com on 2013-08-10

[REF] start to refactor sale_payment_method, the aim is to link the sale order to the move line and not the move. Indeed when we import a bank statement and we used the module account_bank_statement_one_move we have 1 one with X customer payment. So we have no choice the sale must be linked to the move lines

308. By Sébastien BEAU - http://www.akretion.com on 2013-09-01

[FIX] fix bug to due previous refactor, compute correctly the amount paid, link the payment with the sale order, and improve the payment view

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

Hi Guewen,
As talk before it's better to link the account_move_line instead of the account_move (indeed a move can have X line and each line can be linked to a specific sale order).
I made the change and also I add the possibility to specify a description.

For the migration script I don't know was will be the best solution because we move three time the data model (payment_id => payment_ids => then account move => then account_move_line). Due to this change the actual migration script is broken (indeed the script will not work because the payment is not a voucher anymore). I propose for now to remove the actual migration script and working on it when a customer will want to migrate from 6.1 to 7. What do you think?

As always thanks for your really good

[lp:~extra-addons-commiter/e-commerce-addons/7.0-sale-method]

309. By Sébastien BEAU - http://www.akretion.com on 2013-10-13

[REF] adapte sale_automatic_workflow due to the change as sale order are linked to a account move line

310. By Sébastien BEAU - http://www.akretion.com on 2013-10-13

[IMP] sle_automatic_workflow : add partial reconciliation

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

I forget to push some change on sale_automatic workflow, now it ok for me

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

I agree with Sebastien's changes.

[Sébastien BEAU - http://www.akretion.com (sebastien.beau)]

review: Approve

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Approve

=== modified file 'sale_automatic_workflow/invoice.py'
--- sale_automatic_workflow/invoice.py	2012-12-26 13:22:11 +0000
+++ sale_automatic_workflow/invoice.py	2013-10-13 16:10:00 +0000
@@ -30,21 +30,41 @@
         'sale_ids': fields.many2many('sale.order', 'sale_order_invoice_rel', 'invoice_id', 'order_id', 'Sale Orders')
     }
 
+    def _get_payment(self, cr, uid, invoice, context=None):
+        if invoice.type == "out_invoice" and invoice.sale_ids:
+            return invoice.sale_ids[0].payment_ids
+        return []
+
     def _can_be_reconciled(self, cr, uid, invoice, context=None):
-        if not (invoice.sale_ids and invoice.sale_ids[0].payment_ids and invoice.move_id):
+        payments = self._get_payment(cr, uid, invoice, context=context)
+        if not (payments and invoice.move_id):
             return False
-        #Check currency
-        for payment in invoice.sale_ids[0].payment_ids:
-            for move in payment.move_ids:
-                if (move.currency_id.id or invoice.company_id.currency_id.id) != invoice.currency_id.id:
-                    return False
+        # Check currency
+        company_currency_id = invoice.company_id.currency_id.id
+        for payment in payments:
+            currency_id = payment.currency_id.id or company_currency_id
+            if currency_id != invoice.currency_id.id:
+                return False
         return True
 
-    def _get_sum_invoice_move_line(self, cr, uid, move_lines, context=None):
-        return self._get_sum_move_line(cr, uid, move_lines, 'debit', context=None)
-
-    def _get_sum_payment_move_line(self, cr, uid, move_lines, context=None):
-        return self._get_sum_move_line(cr, uid, move_lines, 'credit', context=None)
+    def _get_sum_invoice_move_line(self, cr, uid, move_lines,\
+                                  invoice_type, context=None):
+        if invoice_type in ['in_refund', 'out_invoice']:
+            line_type = 'debit'
+        else:
+            line_type = 'credit'
+        return self._get_sum_move_line(cr, uid, move_lines,\
+                                       line_type, context=None)
+
+    def _get_sum_payment_move_line(self, cr, uid, move_lines,\
+                                   invoice_type, context=None):
+        if invoice_type in ['in_refund', 'out_invoice']:
+            line_type = 'credit'
+        else:
+            line_type = 'debit'
+        return self._get_sum_move_line(cr, uid, move_lines,\
+                                       line_type, context=None)
+
 
     def _get_sum_move_line(self, cr, uid, move_lines, line_type, context=None):
         res = {
@@ -93,20 +113,24 @@
         obj_move_line = self.pool.get('account.move.line')
         for invoice in self.browse(cr, uid, ids, context=context):
             use_currency = invoice.currency_id.id != invoice.company_id.currency_id.id
+            reconcile = False
+            payment_move_lines = self._get_payment(cr, uid, invoice, context=context)
+            res_payment = self._get_sum_payment_move_line(cr, uid, payment_move_line, invoice.type, context=context)
+            res_invoice = self._get_sum_invoice_move_line(cr, uid, invoice.move_id.line_id, invoice.type, context=context)
+            line_ids = res_invoice['line_ids'] + res_payment['line_ids']
             if self._can_be_reconciled(cr, uid, invoice, context=context):
-                payment_move_line = []
-                for payment in invoice.sale_ids[0].payment_ids:
-                    payment_move_line += payment.move_ids
-                res_payment = self._get_sum_payment_move_line(cr, uid, payment_move_line, context=context)
-                res_invoice = self._get_sum_invoice_move_line(cr, uid, invoice.move_id.line_id, context=context)
-                line_ids = res_invoice['line_ids'] + res_payment['line_ids']
                 if not use_currency:
                     balance = abs(res_invoice['total_amount']-res_payment['total_amount'])
                     if line_ids and not round(balance, precision):
                         obj_move_line.reconcile(cr, uid, line_ids, context=context)
+                        reconcile=True
                 else:
                     balance = abs(res_invoice['total_amount_currency']-res_payment['total_amount_currency'])
                     if line_ids and not round(balance, precision):
                         kwargs = self._prepare_write_off(cr, uid, invoice, res_invoice, res_payment, context=context)
                         obj_move_line.reconcile(cr, uid, line_ids, **kwargs)
+                        reconcile = True
+            unreconciled_payment = [line for line in payment_move_lines if not line.reconcile_partial_id] 
+            if not reconcile and unreconciled_payment:
+                move_line_obj.reconcile_partial(cr, uid, line_ids, context=context)
         return True
 
=== renamed directory 'sale_quick_payment' => 'sale_payment_method'
=== modified file 'sale_payment_method/__init__.py'
--- sale_quick_payment/__init__.py	2012-12-26 13:13:25 +0000
+++ sale_payment_method/__init__.py	2013-10-13 16:10:00 +0000
@@ -1,26 +1,24 @@
-# -*- encoding: utf-8 -*-
-#################################################################################
-#                                                                               #
-#    sale_quick_payment for OpenERP                                             #
-#    Copyright (C) 2011 Akretion Sébastien BEAU <[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/>.      #
-#                                                                               #
-#################################################################################
-
-
-import sale
-import payment_method
-import wizard
-import account_voucher
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    sale_payment_method for OpenERP
+#    Copyright (C) 2011 Akretion Sébastien BEAU <[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
+from . import payment_method
+from . import account_move
 
=== modified file 'sale_payment_method/__openerp__.py'
--- sale_quick_payment/__openerp__.py	2012-12-26 13:22:58 +0000
+++ sale_payment_method/__openerp__.py	2013-10-13 16:10:00 +0000
@@ -1,54 +1,49 @@
-# -*- encoding: utf-8 -*-
-###############################################################################
-#                                                                             #
-#   sale_quick_payment for OpenERP                                            #
-#   Copyright (C) 2011 Akretion Sébastien BEAU <[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/>.     #
-#                                                                             #
-###############################################################################
-
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#   sale_payment_method for OpenERP
+#   Copyright (C) 2011 Akretion Sébastien BEAU <[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': 'sale_quick_payment',
-    'version': '0.1',
+    'name': 'Sale Payment Method',
+    'version': '0.2',
     'category': 'Generic Modules/Others',
     'license': 'AGPL-3',
     'description': """
-    Sale Quick Payment give the posibility to paid an sale order.
-    The payment will be linked to the sale order
-    If you install the module Sale Automatic Workflow you can forbid the validation
-    of an unpaid order and also the Invoice will be automatically reconciled with
-    the payment.
-    This module was design for e-commerce sector.
-    """,
+Sale Payment Method
+===================
+
+This module adds low-level features used for instance by modules:
+
+- Sale Automatic Workflow
+- Sale Quick Payment
+
+It adds a payment method on the sales orders and allow to register
+payments entries on sales orders.
+""",
     'author': 'Akretion',
     'website': 'http://www.akretion.com/',
-    'depends': [
-        'sale_exceptions',
-        'account_voucher',
-        ], 
-    'init_xml': [],
-    'update_xml': [
-            'wizard/pay_sale_order.xml',
-            'sale_view.xml',
-            'payment_method_view.xml',
-            'security/ir.model.access.csv',
-            'settings/sale.exception.csv',
-    ],
-    'demo_xml': [],
+    'depends': ['sale',
+                ],
+    'data': ['sale_view.xml',
+             'payment_method_view.xml',
+             'security/ir.model.access.csv',
+             ],
+    'demo': [],
     'installable': True,
-    'active': False,
 }
-
 
=== added file 'sale_payment_method/account_move.py'
--- sale_payment_method/account_move.py	1970-01-01 00:00:00 +0000
+++ sale_payment_method/account_move.py	2013-10-13 16:10:00 +0000
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2013 Camptocamp SA
+#
+#    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_move_line(orm.Model):
+    _inherit = 'account.move.line'
+
+    _columns = {
+        'sale_ids': fields.many2many('sale.order', string='Sales Orders'),
+    }
 
=== added directory 'sale_payment_method/i18n'
=== added file 'sale_payment_method/i18n/fr.po'
--- sale_payment_method/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ sale_payment_method/i18n/fr.po	2013-10-13 16:10:00 +0000
@@ -0,0 +1,142 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_payment_method
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-02 07:06+0000\n"
+"PO-Revision-Date: 2013-05-02 07:06+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: sale_payment_method
+#: view:sale.order:0
+msgid "Automation Information"
+msgstr "Informations d'automatisation"
+
+#. module: sale_payment_method
+#: help:payment.method,journal_id:0
+msgid "If a journal a selected, when a payment is recorded on a backend, payment entries will be created in this journal. "
+msgstr "Si un journal est sélectionné, lorsqu'un paiement est enregistré sur le backend, des lignes de paiement seront générées dans ce journal."
+
+#. module: sale_payment_method
+#: view:payment.method:0
+msgid "Even if the E-commerce backend receives a payment for a sale order,\n"
+"                                no payment entries will be generated."
+msgstr "Même si le backend e-commerce reçoit un payment pour un bon de commande, aucune ligne de paiement ne sera générée."
+
+#. module: sale_payment_method
+#: view:payment.method:0
+msgid "Default Values"
+msgstr "Valeurs par défaut"
+
+#. module: sale_payment_method
+#: model:ir.model,name:sale_payment_method.model_payment_method
+#: field:sale.order,payment_method_id:0
+msgid "Payment Method"
+msgstr "Méthode de paiement"
+
+#. module: sale_payment_method
+#: view:sale.order:0
+msgid "View Automatic Payment"
+msgstr "Voir les paiements automatiques"
+
+#. module: sale_payment_method
+#: help:sale.order,payment_exists:0
+msgid "It indicates that sales order has at least one payment."
+msgstr "Indique que la commande a reçu au moins un paiement."
+
+#. module: sale_payment_method
+#: field:payment.method,journal_id:0
+msgid "Journal"
+msgstr "Journal"
+
+#. module: sale_payment_method
+#: model:ir.actions.act_window,name:sale_payment_method.act_payment_method_form
+#: model:ir.ui.menu,name:sale_payment_method.menu_action_paymetn_method_form
+msgid "Payment Methods "
+msgstr "Méthodes de paiement"
+
+#. module: sale_payment_method
+#: field:account.move,order_ids:0
+msgid "Sales Orders"
+msgstr "Bons de commande"
+
+#. module: sale_payment_method
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Autres informations"
+
+#. module: sale_payment_method
+#: view:payment.method:0
+msgid "Payment Methods"
+msgstr "Méthodes de paiement"
+
+#. module: sale_payment_method
+#: field:payment.method,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: sale_payment_method
+#: field:sale.order,payment_ids:0
+msgid "Payments Entries"
+msgstr "Écritures de paiement"
+
+#. module: sale_payment_method
+#: view:payment.method:0
+msgid "When the E-commerce backend will receive a payment for a sale order,\n"
+"                                payment entries will be generated in the selected journal."
+msgstr "Lorsque le backend e-commerce reçoit un paiement pour la commande,\n"
+"                                des écritures de paiement sont générées dans le journal sélectionné."
+
+#. module: sale_payment_method
+#: view:payment.method:0
+msgid "Journal for payment"
+msgstr "Journal pour le paiement"
+
+#. module: sale_payment_method
+#: field:sale.order,residual:0
+msgid "Balance"
+msgstr "Solde"
+
+#. module: sale_payment_method
+#: model:ir.model,name:sale_payment_method.model_account_move
+msgid "Account Entry"
+msgstr "Ecriture"
+
+#. module: sale_payment_method
+#: help:payment.method,payment_term_id:0
+msgid "Default payment term of a sale order using this method."
+msgstr "Condition de règlement par défaut pour les commandes utilisant cette méthode."
+
+#. module: sale_payment_method
+#: field:payment.method,payment_term_id:0
+msgid "Payment Term"
+msgstr "Condition de règlement"
+
+#. module: sale_payment_method
+#: view:sale.order:0
+msgid "Create Invoice"
+msgstr "Créer la facture"
+
+#. module: sale_payment_method
+#: help:payment.method,name:0
+msgid "The name of the method on the backend"
+msgstr "Nom de la méthode sur le backend"
+
+#. module: sale_payment_method
+#: model:ir.model,name:sale_payment_method.model_sale_order
+msgid "Sales Order"
+msgstr "Bon de commande"
+
+#. module: sale_payment_method
+#: field:sale.order,payment_exists:0
+msgid "Has automatic payment"
+msgstr "A un paiement automatique"
+
 
=== added file 'sale_payment_method/i18n/sale_payment_method.pot'
--- sale_payment_method/i18n/sale_payment_method.pot	1970-01-01 00:00:00 +0000
+++ sale_payment_method/i18n/sale_payment_method.pot	2013-10-13 16:10:00 +0000
@@ -0,0 +1,141 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_payment_method
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-02 07:06+0000\n"
+"PO-Revision-Date: 2013-05-02 07:06+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: sale_payment_method
+#: view:sale.order:0
+msgid "Automation Information"
+msgstr ""
+
+#. module: sale_payment_method
+#: help:payment.method,journal_id:0
+msgid "If a journal a selected, when a payment is recorded on a backend, payment entries will be created in this journal. "
+msgstr ""
+
+#. module: sale_payment_method
+#: view:payment.method:0
+msgid "Even if the E-commerce backend receives a payment for a sale order,\n"
+"                                no payment entries will be generated."
+msgstr ""
+
+#. module: sale_payment_method
+#: view:payment.method:0
+msgid "Default Values"
+msgstr ""
+
+#. module: sale_payment_method
+#: model:ir.model,name:sale_payment_method.model_payment_method
+#: field:sale.order,payment_method_id:0
+msgid "Payment Method"
+msgstr ""
+
+#. module: sale_payment_method
+#: view:sale.order:0
+msgid "View Automatic Payment"
+msgstr ""
+
+#. module: sale_payment_method
+#: help:sale.order,payment_exists:0
+msgid "It indicates that sales order has at least one payment."
+msgstr ""
+
+#. module: sale_payment_method
+#: field:payment.method,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: sale_payment_method
+#: model:ir.actions.act_window,name:sale_payment_method.act_payment_method_form
+#: model:ir.ui.menu,name:sale_payment_method.menu_action_paymetn_method_form
+msgid "Payment Methods "
+msgstr ""
+
+#. module: sale_payment_method
+#: field:account.move,order_ids:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale_payment_method
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale_payment_method
+#: view:payment.method:0
+msgid "Payment Methods"
+msgstr ""
+
+#. module: sale_payment_method
+#: field:payment.method,name:0
+msgid "Name"
+msgstr ""
+
+#. module: sale_payment_method
+#: field:sale.order,payment_ids:0
+msgid "Payments Entries"
+msgstr ""
+
+#. module: sale_payment_method
+#: view:payment.method:0
+msgid "When the E-commerce backend will receive a payment for a sale order,\n"
+"                                payment entries will be generated in the selected journal."
+msgstr ""
+
+#. module: sale_payment_method
+#: view:payment.method:0
+msgid "Journal for payment"
+msgstr ""
+
+#. module: sale_payment_method
+#: field:sale.order,residual:0
+msgid "Balance"
+msgstr ""
+
+#. module: sale_payment_method
+#: model:ir.model,name:sale_payment_method.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: sale_payment_method
+#: help:payment.method,payment_term_id:0
+msgid "Default payment term of a sale order using this method."
+msgstr ""
+
+#. module: sale_payment_method
+#: field:payment.method,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: sale_payment_method
+#: view:sale.order:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale_payment_method
+#: help:payment.method,name:0
+msgid "The name of the method on the backend"
+msgstr ""
+
+#. module: sale_payment_method
+#: model:ir.model,name:sale_payment_method.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_payment_method
+#: field:sale.order,payment_exists:0
+msgid "Has automatic payment"
+msgstr ""
+
 
=== modified file 'sale_payment_method/migrations/0.1/post-migration.py'
--- sale_quick_payment/migrations/0.1/post-migration.py	2012-12-26 13:13:25 +0000
+++ sale_payment_method/migrations/0.1/post-migration.py	2013-10-13 16:10:00 +0000
@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-###############################################################################
+##############################################################################
 #
 #   sale_quick_payment for OpenERP
 #   Copyright (C) 2012-TODAY Akretion <http://www.akretion.com>.
@@ -18,7 +18,7 @@
 #   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/>.
 #
-###############################################################################
+##############################################################################
 
 """ r0.1: Migration 6.1 => 7.0.0.1
     migrate the field payment_id from one2many to payment_ids many2many
 
=== modified file 'sale_payment_method/payment_method.py'
--- sale_quick_payment/payment_method.py	2012-08-21 13:57:44 +0000
+++ sale_payment_method/payment_method.py	2013-10-13 16:10:00 +0000
@@ -1,38 +1,43 @@
-# -*- encoding: utf-8 -*-
-###############################################################################
-#                                                                             #
-#   sale_quick_payment for OpenERP                                  #
-#   Copyright (C) 2011 Akretion Sébastien BEAU <[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.orm import Model
-from openerp.osv import fields
-import netsvc
-
-
-class payment_method(Model):
-    
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#   sale_quick_payment for OpenERP
+#   Copyright (C) 2011 Akretion Sébastien BEAU <[e-mail]>
+#   Copyright 2013 Camptocamp SA (Guewen Baconnier)
+#
+#   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 fields, orm
+
+
+class payment_method(orm.Model):
     _name = "payment.method"
-    _description = "payment method"
-    
+    _description = "Payment Method"
 
     _columns = {
-        'name': fields.char('Name', size=64),
-        'journal_id': fields.many2one('account.journal', 'Journal'),
-        'payment_term_id': fields.many2one('account.payment.term', 'Payment Term'),
+        'name': fields.char('Name',
+                            help="The name of the method on the backend"),
+        'journal_id': fields.many2one(
+            'account.journal',
+            'Journal',
+            help="If a journal a selected, when a payment is recorded "
+                 "on a backend, payment entries will be created in this "
+                 "journal. "),
+        'payment_term_id': fields.many2one(
+            'account.payment.term',
+            'Payment Term',
+             help="Default payment term of a sale order using this method."),
     }
-
 
=== modified file 'sale_payment_method/payment_method_view.xml'
--- sale_quick_payment/payment_method_view.xml	2012-04-22 12:48:34 +0000
+++ sale_payment_method/payment_method_view.xml	2013-10-13 16:10:00 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  sale_quick_payment for OpenERP
+  sale_payment_method for OpenERP
   Copyright (C) 2011 Akretion Sébastien BEAU <[e-mail]>
   The licence is in the file __openerp__.py
 -->
@@ -8,28 +8,41 @@
 <openerp>
     <data>
 
-        <!-- VIEW FOR THE OBJECT : payment_method -->
         <record id="payment_method_view_form" model="ir.ui.view">
-            <field name="name">sale_quick_payment.payment_method.view_form</field>
+            <field name="name">sale_payment_method.payment_method.view_form</field>
             <field name="model">payment.method</field>
-            <field eval="16" name="priority"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="payment_method">
-                    <field name="name" />
-                    <field name="journal_id" />
-                    <field name="payment_term_id" />
+                <form string="Payment Methods" version="7.0">
+                    <h1>
+                        <field name="name" class="oe_inline"/>
+                    </h1>
+                    <group name="general">
+                        <group name="config">
+                            <field name="journal_id" string="Journal for payment"/>
+                        </group>
+                        <group name="payment_help" class="oe_grey" col="1">
+                            <p attrs="{'invisible': [('journal_id', '=', False)]}">
+                                When the E-commerce backend will receive a payment for a sale order,
+                                payment entries will be generated in the selected journal.
+                            </p>
+                            <p attrs="{'invisible': [('journal_id', '!=', False)]}">
+                                Even if the E-commerce backend receives a payment for a sale order,
+                                no payment entries will be generated.
+                            </p>
+                        </group>
+                    </group>
+                    <group string="Default Values">
+                        <field name="payment_term_id" />
+                    </group>
                 </form>
             </field>
         </record>
 
         <record id="payment_method_view_tree" model="ir.ui.view">
-            <field name="name">sale_quick_payment.payment_method.view_tree</field>
+            <field name="name">sale_payment_method.payment_method.view_tree</field>
             <field name="model">payment.method</field>
-            <field eval="16" name="priority"/>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="payment_method">
+                <tree string="Payment Methods">
                     <field name="name" />
                     <field name="journal_id" />
                     <field name="payment_term_id" />
@@ -37,9 +50,8 @@
             </field>
         </record>
 
-
         <record id="act_payment_method_form" model="ir.actions.act_window">
-            <field name="name">Customer Payment Method</field>
+            <field name="name">Payment Methods </field>
             <field name="res_model">payment.method</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
 
=== modified file 'sale_payment_method/sale.py'
--- sale_quick_payment/sale.py	2012-12-26 09:32:43 +0000
+++ sale_payment_method/sale.py	2013-10-13 16:10:00 +0000
@@ -1,165 +1,296 @@
-# -*- encoding: utf-8 -*-
-###############################################################################
-#                                                                             #
-#   sale_quick_payment for OpenERP                                  #
-#   Copyright (C) 2011 Akretion Sébastien BEAU <[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/>.     #
-#                                                                             #
-###############################################################################
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier, Sébastien Beau
+#    Copyright (C) 2011 Akretion Sébastien BEAU <[e-mail]>
+#    Copyright 2013 Camptocamp SA (Guewen Baconnier)
+#
+#    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.orm import Model
-from openerp.osv import fields
-from openerp.osv.osv import except_osv
-import netsvc
+from openerp.osv import orm, fields, osv
+from openerp.tools.translate import _
 from collections import Iterable
-from openerp.tools.translate import _
-import decimal_precision as dp
-
-class sale_order(Model):
-    _inherit = "sale.order"
-
-    def _get_order_from_voucher(self, cr, uid, ids, context=None):
-        result = []
-        for voucher in self.pool.get('account.voucher').browse(cr, uid, ids, context=context):
-            for order in voucher.order_ids:
-                result.append(order.id)
-        return list(set(result))
+import openerp.addons.decimal_precision as dp
+
+
+class sale_order(orm.Model):
+    _inherit = 'sale.order'
+
+    def _get_order_from_move(self, cr, uid, ids, context=None):
+        result = set()
+        move_obj = self.pool.get('account.move')
+        for move in move_obj.browse(cr, uid, ids, context=context):
+            for order in move.order_ids:
+                result.add(order.id)
+        return list(result)
 
     def _get_order_from_line(self, cr, uid, ids, context=None):
-        return self.pool.get('sale.order')._get_order(cr, uid, ids, context=context)
+        so_obj = self.pool.get('sale.order')
+        return so_obj._get_order(cr, uid, ids, context=context)
 
-    def _amount_residual(self, cr, uid, ids, field_name, args, context=None):
+    def _get_amount(self, cr, uid, ids, fields, args, context=None):
         res = {}
-        #TODO add here the support of multi-currency payment if need
         for order in self.browse(cr, uid, ids, context=context):
-            res[order.id] = order.amount_total
-            for payment in order.payment_ids:
-                if payment.state == 'posted':
-                    res[order.id] -= payment.amount
+            #TODO add support when payment is linked to many order
+            paid_amount = 0
+            for line in order.payment_ids:    
+                paid_amount += line.credit - line.debit
+            res[order.id] = {
+                    'amount_paid': paid_amount, 
+                    'residual': order.amount_total - paid_amount,
+                    }
+        return res
+
+    def _payment_exists(self, cursor, user, ids, name, arg, context=None):
+        res = {}
+        for sale in self.browse(cursor, user, ids, context=context):
+            res[sale.id] = bool(sale.payment_ids)
         return res
 
     _columns = {
-        'payment_ids': fields.many2many('account.voucher', string='Payments'),
-        'payment_method_id': fields.many2one('payment.method', 'Payment Method'),
-        'residual': fields.function(_amount_residual, digits_compute=dp.get_precision('Account'), string='Balance',
-            store = {
-                'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line', 'payment_ids'], 10),
-                'sale.order.line': (_get_order_from_line, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 20),
-                'account.voucher': (_get_order_from_voucher, ['amount'], 30),
-            },
-            ),
+        'payment_ids': fields.many2many('account.move.line',
+                                        string='Payments Entries'),
+        'payment_method_id': fields.many2one('payment.method',
+                                             'Payment Method',
+                                             ondelete='restrict'),
+        'residual': fields.function(
+            _get_amount,
+            digits_compute=dp.get_precision('Account'),
+            string='Balance',
+            store=False,
+            multi='payment'),
+        'amount_paid': fields.function(
+            _get_amount,
+            digits_compute=dp.get_precision('Account'),
+            string='Amount Paid',
+            store=False,
+            multi='payment'),
+        'payment_exists': fields.function(
+            _payment_exists,
+            string='Has automatic payment',
+            type='boolean',
+            help="It indicates that sales order has at least one payment."),
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
-        if not default:
+        if default is None:
             default = {}
-        default.update({
-            'payment_ids': False,
-        })
-        return super(sale_order, self).copy(cr, uid, id, default, context=context)
-
-    def pay_sale_order(self, cr, uid, sale_id, journal_id, amount, date, context=None):
-        """
-        Generate a voucher for the payment
-
-        It will try to match with the invoice of the order by
-        matching the payment ref and the invoice origin.
-
-        The invoice does not necessarily exists at this point, so if yes,
-        it will be matched in the voucher, otherwise, the voucher won't
-        have any invoice lines and the payment lines will be reconciled
-        later with "auto-reconcile" if the option is used.
-
-        """
-        if isinstance(sale_id, Iterable):
-            sale_id = sale_id[0]
-
-        voucher_obj = self.pool.get('account.voucher')
-        voucher_line_obj = self.pool.get('account.voucher.line')
-        move_line_obj = self.pool.get('account.move.line')
-        sale = self.browse(cr, uid, sale_id, context=context)
-
-        journal = self.pool.get('account.journal').browse(
-            cr, uid, journal_id, context=context)
-
-        voucher_vals = {'reference': sale.name,
-                        'journal_id': journal_id,
-                        'period_id': self.pool.get('account.period').find(cr, uid, dt=date,
-                                                                          context=context)[0],
-                        'amount': amount,
-                        'date': date,
-                        'partner_id': sale.partner_id.id,
-                        'account_id': journal.default_credit_account_id.id,
-                        'currency_id': journal.company_id.currency_id.id,
-                        'company_id': journal.company_id.id,
-                        'type': 'receipt', }
-
-        # Set the payment rate if currency are different
-        if journal.currency.id and journal.company_id.currency_id.id != journal.currency.id:
-            currency_id = journal.company_id.currency_id.id
-            payment_rate_currency_id = journal.currency.id
-
-            currency_obj = self.pool.get('res.currency')
-            ctx= context.copy()
-            ctx.update({'date': date})
-            tmp = currency_obj.browse(cr, uid, payment_rate_currency_id, context=ctx).rate
-            payment_rate = tmp / currency_obj.browse(cr, uid, currency_id, context=ctx).rate
-            voucher_vals.update({
-                'payment_rate_currency_id': payment_rate_currency_id,
-                'payment_rate': payment_rate,
-            })
-
-        voucher_id = voucher_obj.create(cr, uid, voucher_vals, context=context)
-
-        # call on change to search the invoice lines
-        onchange_voucher = voucher_obj.onchange_partner_id(
-            cr, uid, [],
-            partner_id=sale.partner_id.id,
-            journal_id=journal.id,
-            amount=amount,
-            currency_id=journal.company_id.currency_id.id,
-            ttype='receipt',
-            date=date,
-            context=context)['value']
-
-        # keep in the voucher only the move line of the
-        # invoice (eventually) created for this order
-        matching_line = {}
-        if onchange_voucher.get('line_cr_ids'):
-            voucher_lines = onchange_voucher['line_cr_ids']
-            line_ids = [line['move_line_id'] for line in voucher_lines]
-            matching_ids = [line.id for line
-                            in move_line_obj.browse(
-                                cr, uid, line_ids, context=context)
-                            if line.ref == sale.name]
-            matching_lines = [line for line
-                              in voucher_lines
-                              if line['move_line_id'] in matching_ids]
-            if matching_lines:
-                matching_line = matching_lines[0]
-                matching_line.update({
-                    'amount': amount,
-                    'voucher_id': voucher_id,
-                })
-
-        if matching_line:
-            voucher_line_obj.create(cr, uid, matching_line, context=context)
-
-        wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(
-            uid, 'account.voucher', voucher_id, 'proforma_voucher', cr)
-        sale.write({'payment_ids': [(4,voucher_id)]}, context=context)
-        return True
-
+        default['payment_ids'] = False
+        return super(sale_order, self).copy(cr, uid, id,
+                                            default, context=context)
+
+    def automatic_payment(self, cr, uid, ids, amount=None, context=None):
+        """ Create the payment entries to pay a sale order, respecting
+        the payment terms.
+        If no amount is defined, it will pay the residual amount of the sale
+        order. """
+        if isinstance(ids, Iterable):
+            assert len(ids) == 1, "one sale order at a time can be paid"
+            ids = ids[0]
+        sale = self.browse(cr, uid, ids, context=context)
+        method = sale.payment_method_id
+        if not method:
+            raise osv.except_osv(
+                _('Configuration Error'),
+                _("An automatic payment can not be created for the sale "
+                  "order %s because it has no payment method.") % sale.name)
+
+        if not method.journal_id:
+            raise osv.except_osv(
+                _('Configuration Error'),
+                _("An automatic payment should be created for the sale order %s "
+                  "but the payment method '%s' has no journal defined.") %
+                (sale.name, method.name))
+
+        journal = method.journal_id
+        date = sale.date_order
+        if amount is None:
+            amount = sale.residual
+        if sale.payment_term:
+            term_obj = self.pool.get('account.payment.term')
+            amounts = term_obj.compute(cr, uid, sale.payment_term.id,
+                                       amount, date_ref=date,
+                                       context=context)
+        else:
+            amounts = [(date, amount)]
+
+        # reversed is cosmetic, compute returns terms in the 'wrong' order
+        for date, amount in reversed(amounts):
+            self._add_payment(cr, uid, sale, journal,
+                              amount, date, context=context)
+        return True
+
+    def add_payment(self, cr, uid, ids, journal_id, amount,
+                    date=None, description=None, context=None):
+        """ Generate payment move lines of a certain amount linked
+        with the sale order. """
+        if isinstance(ids, Iterable):
+            assert len(ids) == 1, "one sale order at a time can be paid"
+            ids = ids[0]
+        journal_obj = self.pool.get('account.journal')
+
+        sale = self.browse(cr, uid, ids, context=context)
+        if date is None:
+            date = sale.date_order
+        journal = journal_obj.browse(cr, uid, journal_id, context=context)
+        self._add_payment(cr, uid, sale, journal, amount, date, description, context=context)
+        return True
+
+    def _add_payment(self, cr, uid, sale, journal, amount, date, description, context=None):
+        """ Generate move lines entries to pay the sale order. """
+        move_obj = self.pool.get('account.move')
+        period_obj = self.pool.get('account.period')
+        period_id = period_obj.find(cr, uid, dt=date, context=context)[0]
+        period = period_obj.browse(cr, uid, period_id, context=context)
+        move_name = description or self._get_payment_move_name(cr, uid, journal,
+                                                period, context=context)
+        move_vals = self._prepare_payment_move(cr, uid, move_name, sale,
+                                               journal, period, date,
+                                               context=context)
+        move_lines = self._prepare_payment_move_line(cr, uid, move_name, sale,
+                                                     journal, period, amount,
+                                                     date, context=context)
+
+        move_vals['line_id'] = [(0, 0, line) for line in move_lines]
+        move_obj.create(cr, uid, move_vals, context=context)
+
+    def _get_payment_move_name(self, cr, uid, journal, period, context=None):
+        if context is None:
+            context = {}
+        seq_obj = self.pool.get('ir.sequence')
+        sequence = journal.sequence_id
+
+        if not sequence:
+            raise osv.except_osv(
+                _('Configuration Error'),
+                _('Please define a sequence on the journal %s.') %
+                journal.name)
+        if not sequence.active:
+            raise osv.except_osv(
+                _('Configuration Error'),
+                _('Please activate the sequence of the journal %s.') %
+                journal.name)
+
+        ctx = context.copy()
+        ctx['fiscalyear_id'] = period.fiscalyear_id.id
+        name = seq_obj.next_by_id(cr, uid, sequence.id, context=ctx)
+        return name
+
+    def _prepare_payment_move(self, cr, uid, move_name, sale, journal,
+                              period, date, context=None):
+        return {'name': move_name,
+                'journal_id': journal.id,
+                'date': date,
+                'ref': sale.name,
+                'period_id': period.id,
+                }
+
+    def _prepare_payment_move_line(self, cr, uid, move_name, sale, journal,
+                                   period, amount, date, context=None):
+        """ """
+        partner_obj = self.pool.get('res.partner')
+        currency_obj = self.pool.get('res.currency')
+        partner = partner_obj._find_accounting_partner(sale.partner_id)
+
+        company = journal.company_id
+
+        currency_id = False
+        amount_currency = 0.0
+        if journal.currency and journal.currency.id != company.currency_id.id:
+            currency_id = journal.currency.id
+            amount_currency, amount = (amount,
+                                       currency_obj.compute(cr, uid,
+                                                            currency_id,
+                                                            company.currency_id.id,
+                                                            amount,
+                                                            context=context))
+
+        # payment line (bank / cash)
+        debit_line = {
+            'name': move_name,
+            'debit': amount,
+            'credit': 0.0,
+            'account_id': journal.default_credit_account_id.id,
+            'journal_id': journal.id,
+            'period_id': period.id,
+            'partner_id': partner.id,
+            'date': date,
+            'amount_currency': amount_currency,
+            'currency_id': currency_id,
+        }
+
+        # payment line (receivable)
+        credit_line = {
+            'name': move_name,
+            'debit': 0.0,
+            'credit': amount,
+            'account_id': partner.property_account_receivable.id,
+            'journal_id': journal.id,
+            'period_id': period.id,
+            'partner_id': partner.id,
+            'date': date,
+            'amount_currency': -amount_currency,
+            'currency_id': currency_id,
+            'sale_ids': [(4, sale.id)],
+        }
+        return debit_line, credit_line
+
+    def onchange_payment_method_id(self, cr, uid, ids, payment_method_id, context=None):
+        if not payment_method_id:
+            return {}
+        result = {}
+        method_obj = self.pool.get('payment.method')
+        method = method_obj.browse(cr, uid, payment_method_id, context=context)
+        if method.payment_term_id:
+            result['payment_term'] = method.payment_term_id.id
+        return {'value': result}
+
+    def action_view_payments(self, cr, uid, ids, context=None):
+        """ Return an action to display the payment linked
+        with the sale order """
+
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+
+        payment_ids = []
+        for so in self.browse(cr, uid, ids, context=context):
+            payment_ids += [move.id for move in so.payment_ids]
+
+        ref = mod_obj.get_object_reference(cr, uid, 'account',
+                                           'action_move_journal_line')
+        action_id = False
+        if ref:
+            __, action_id = ref
+        action = act_obj.read(cr, uid, [action_id], context=context)[0]
+
+        # choose the view_mode accordingly
+        if len(payment_ids) > 1:
+            action['domain'] = str([('id', 'in', payment_ids)])
+        else:
+            ref = mod_obj.get_object_reference(cr, uid, 'account',
+                                               'view_move_form')
+            action['views'] = [(ref[1] if ref else False, 'form')]
+            action['res_id'] = payment_ids[0] if payment_ids else False
+        return action
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        for sale in self.browse(cr, uid, ids, context=context):
+            if sale.payment_ids:
+                raise osv.except_osv(
+                    _('Cannot cancel this sales order!'),
+                    _('Automatic payment entries are linked '
+                      'with the sale order.'))
+        return super(sale_order, self).action_cancel(cr, uid, ids, context=context)
 
=== modified file 'sale_payment_method/sale_view.xml'
--- sale_quick_payment/sale_view.xml	2012-12-26 13:13:25 +0000
+++ sale_payment_method/sale_view.xml	2013-10-13 16:10:00 +0000
@@ -1,48 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  sale_quick_payment for OpenERP
+  sale_payment_method for OpenERP
   Copyright (C) 2011 Akretion Sébastien BEAU <[e-mail]>
   The licence is in the file __openerp__.py
 -->
 
 <openerp>
     <data>
-    
+
         <!-- INHERITED VIEW FOR THE OBJECT : sale_order -->
 
         <record id="sale_order_view_form" model="ir.ui.view">
-            <field name="name">sale_quick_payment.sale_order.view_form</field>
+            <field name="name">sale.order.view.form</field>
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form" />
-            <field eval="16" name="priority"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <button name="print_quotation" position="after">
-                    <button name="%(open_pay_sale_order)d" string="Register Payments" type="action" states="draft,sent"/>
-                </button>
                 <page string="Other Information" position="after">
                     <page name="automation_information" string="Automation Information">
                         <group name="payment_information" colspan="4">
-                            <field name="payment_method_id" />
-                            <group name="payments" colspan="4">
-                                <separator string="Payments" colspan="4"/>
-                                <field name="payment_ids" nolabel="1" />
-                            </group>
+                            <field name="payment_method_id"
+                              on_change="onchange_payment_method_id(payment_method_id)"/>
                         </group>
                     </page>
                 </page>
                 <field name="amount_total" position="after">
                     <field name="residual" invisible="1"/>
                 </field>
+
+                <button string="Create Invoice" position="after">
+                    <field name="payment_exists" invisible="1"/>
+                    <button name="action_view_payments"
+                        string="View Automatic Payment"
+                        type="object" class="oe_highlight"
+                        attrs="{'invisible': [('payment_exists', '=', False)]}"
+                        groups="base.group_user"/>
+                </button>
             </field>
         </record>
 
         <record id="sale_order_view_tree" model="ir.ui.view">
-            <field name="name">sale_quick_payment.sale_order.view_tree</field>
+            <field name="name">sale.order.view.tree</field>
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_tree" />
-            <field eval="16" name="priority"/>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <field name="state" position="after">
                     <field name="payment_method_id" />
@@ -50,5 +49,30 @@
             </field>
         </record>
 
+        <record id="view_quotation_tree" model="ir.ui.view">
+            <field name="name">sale.order.view.tree</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_quotation_tree" />
+            <field name="arch" type="xml">
+                <field name="amount_total" position="after">
+                    <field name="amount_paid"/>
+                    <field name="payment_method_id"/>
+                </field>
+            </field>
+        </record>
+
+
+        <record id="view_sales_order_filter" model="ir.ui.view">
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_sales_order_filter"/>
+            <field name="arch" type="xml">
+                <filter name="my_sale_orders_filter" position="before">
+                    <filter string="With Payment" domain="[('payment_ids','!=',False)]" help="Order With Payment"  name="with_payment"/>
+                    <separator/>
+                </filter>
+            </field>
+        </record>
+
+
     </data>
 </openerp>
 
=== added directory 'sale_quick_payment'
=== added file 'sale_quick_payment/__init__.py'
--- sale_quick_payment/__init__.py	1970-01-01 00:00:00 +0000
+++ sale_quick_payment/__init__.py	2013-10-13 16:10:00 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    sale_quick_payment for OpenERP
+#    Copyright (C) 2011 Akretion Sébastien BEAU <[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 wizard
 
=== added file 'sale_quick_payment/__openerp__.py'
--- sale_quick_payment/__openerp__.py	1970-01-01 00:00:00 +0000
+++ sale_quick_payment/__openerp__.py	2013-10-13 16:10:00 +0000
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#   sale_payment_method for OpenERP
+#   Copyright (C) 2011 Akretion Sébastien BEAU <[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': 'Sale Quick Payment',
+    'version': '0.2',
+    'category': 'Generic Modules/Others',
+    'license': 'AGPL-3',
+    'description': """
+Sale Quick Payment
+==================
+
+Sale Quick Payment gives the possibility to pay a sale order from the
+sale order itself.
+
+The payment will be linked to the sale order.
+
+If you install the module Sale Automatic Workflow, you can forbid the
+validation of an unpaid order and the invoice will be automatically
+reconciled with the payment.
+
+This module was originally designed for the e-commerce sector, but it
+does not preclude to use it in other sectors.
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com/',
+    'depends': ['sale_payment_method',
+                'sale_exceptions',
+                ],
+    'data': ['wizard/pay_sale_order.xml',
+             'sale_view.xml',
+             'settings/sale.exception.csv',
+             ],
+    'demo': [],
+    'installable': True,
+}
 
=== removed file 'sale_quick_payment/account_voucher.py'
--- sale_quick_payment/account_voucher.py	2012-12-26 09:32:43 +0000
+++ sale_quick_payment/account_voucher.py	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-# -*- encoding: utf-8 -*-
-###############################################################################
-#
-#   sale_quick_payment for OpenERP
-#   Copyright (C) 2012-TODAY Akretion <http://www.akretion.com>.
-#     All Rights Reserved
-#     @author Sébastien BEAU <[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.orm import Model
-from openerp.osv import fields
-
-class payment_method(Model):
-    _inherit = "account.voucher"
-
-    _columns = {
-        'order_ids': fields.many2many('sale.order', string='Sale Order'),
-    }
-
-
 
=== added file 'sale_quick_payment/sale_view.xml'
--- sale_quick_payment/sale_view.xml	1970-01-01 00:00:00 +0000
+++ sale_quick_payment/sale_view.xml	2013-10-13 16:10:00 +0000
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  sale_quick_payment for OpenERP
+  Copyright (C) 2011 Akretion Sébastien BEAU <[e-mail]>
+  The licence is in the file __openerp__.py
+-->
+
+<openerp>
+    <data>
+
+        <!-- INHERITED VIEW FOR THE OBJECT : sale_order -->
+
+        <record id="sale_order_view_form" model="ir.ui.view">
+            <field name="name">sale_quick_payment.sale_order.view_form</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale_payment_method.sale_order_view_form" />
+            <field name="arch" type="xml">
+                <button name="print_quotation" position="after">
+                  <button name="%(open_pay_sale_order)d"
+                      string="Register Payments"
+                      type="action" states="draft,sent"/>
+                </button>
+                <field name="payment_method_id" position="after" >
+                    <group name="payments" string="Generated Payments" colspan="4">
+                        <field name="payment_ids" nolabel="1">
+                            <tree string="Payment">
+                                <field name="date"/>
+                                <field name="journal_id"/>
+                                <field name="partner_id"/>
+                                <field name="debit"/>
+                                <field name="credit"/>
+                            </tree>
+                        </field>
+                    </group>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>
 
=== renamed directory 'sale_quick_payment/settings' => 'sale_quick_payment/settings'
=== renamed directory 'sale_quick_payment/wizard' => 'sale_quick_payment/wizard'
=== modified file 'sale_quick_payment/wizard/__init__.py'
--- sale_quick_payment/wizard/__init__.py	2012-04-22 12:48:34 +0000
+++ sale_quick_payment/wizard/__init__.py	2013-10-13 16:10:00 +0000
@@ -1,1 +1,1 @@
-import pay_sale_order
+from . import pay_sale_order
 
=== modified file 'sale_quick_payment/wizard/pay_sale_order.py'
--- sale_quick_payment/wizard/pay_sale_order.py	2012-12-26 09:32:43 +0000
+++ sale_quick_payment/wizard/pay_sale_order.py	2013-10-13 16:10:00 +0000
@@ -1,47 +1,47 @@
-# -*- encoding: utf-8 -*-
-#################################################################################
-#                                                                               #
-#    Magentoerpconnect for OpenERP                                              #
-#    Copyright (C) 2011 Akretion Sébastien BEAU <[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.orm import TransientModel
-from openerp.osv import fields
-import decimal_precision as dp
-from datetime import datetime
-
-#TODO add button on sale_form header instead of more button
-
-class pay_sale_order(TransientModel):
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    sale_quick_payment for OpenERP
+#    Copyright (C) 2011 Akretion Sébastien BEAU <[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
+import openerp.addons.decimal_precision as dp
+
+
+class pay_sale_order(orm.TransientModel):
     _name = 'pay.sale.order'
     _description = 'Wizard to generate a payment from the sale order'
 
     _columns = {
         'journal_id': fields.many2one('account.journal', 'Journal'),
-        'amount': fields.float('Amount', digits_compute=dp.get_precision('Sale Price')),
+        'amount': fields.float('Amount',
+                               digits_compute=dp.get_precision('Sale Price')),
         'date': fields.datetime('Payment Date'),
-        }
+        'description': fields.char('Description', size=64),
+    }
 
     def _get_journal_id(self, cr, uid, context=None):
         if context is None:
             context = {}
         if context.get('active_id'):
-            order = self.pool.get('sale.order').browse(cr, uid, context['active_id'], context=context)
+            sale_obj = self.pool.get('sale.order')
+            order = sale_obj.browse(cr, uid, context['active_id'],
+                                    context=context)
             if order.payment_method_id:
                 return order.payment_method_id.journal_id.id
         return False
@@ -50,7 +50,9 @@
         if context is None:
             context = {}
         if context.get('active_id'):
-            order = self.pool.get('sale.order').browse(cr, uid, context['active_id'], context=context)
+            sale_obj = self.pool.get('sale.order')
+            order = sale_obj.browse(cr, uid, context['active_id'],
+                                    context=context)
             return order.residual
         return False
 
@@ -61,25 +63,22 @@
     }
 
     def pay_sale_order(self, cr, uid, ids, context=None):
-        """
-        Pay the sale order
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of account chart’s IDs
-        @return: dictionary of Product list window for a given attributs set
-        """
+        """ Pay the sale order """
         wizard = self.browse(cr, uid, ids[0], context=context)
-        self.pool.get('sale.order').pay_sale_order(cr, uid, context['active_id'], wizard.journal_id.id, wizard.amount, wizard.date, context=context)
+        sale_obj = self.pool.get('sale.order')
+        sale_obj.add_payment(cr, uid,
+                             context['active_id'],
+                             wizard.journal_id.id,
+                             wizard.amount,
+                             wizard.date,
+                             description=wizard.description,
+                             context=context)
         return {'type': 'ir.actions.act_window_close'}
 
     def pay_sale_order_and_confirm(self, cr, uid, ids, context=None):
-        """
-        Pay the sale order
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of account chart’s IDs
-        @return: dictionary of Product list window for a given attributs set
-        """
+        """ Pay the sale order """
         self.pay_sale_order(cr, uid, ids, context=context)
-        return self.pool.get('sale.order').action_button_confirm(cr, uid, [context['active_id']], context=context)
-    
+        sale_obj = self.pool.get('sale.order')
+        return sale_obj.action_button_confirm(cr, uid,
+                                              [context['active_id']],
+                                              context=context)
 
=== modified file 'sale_quick_payment/wizard/pay_sale_order.xml'
--- sale_quick_payment/wizard/pay_sale_order.xml	2012-12-26 09:32:43 +0000
+++ sale_quick_payment/wizard/pay_sale_order.xml	2013-10-13 16:10:00 +0000
@@ -4,10 +4,10 @@
         <record model="ir.ui.view" id="pay_sale_order_view">
             <field name="name">pay.sale.order.view</field>
             <field name="model">pay.sale.order</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Pay Sale Order" version="7.0">
                     <group>
+                        <field name="description" string="Description"/>
                         <field name="journal_id" string="Journal"/>
                         <field name="amount" string="Paid Amount"/>
                         <field name="date" string="Date"/>