From 0d28bfddd6047ad3a3f5e6810d13c0b27312822b Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Tue, 25 Feb 2014 00:19:57 +0100 Subject: [PATCH 01/36] Add 4 new modules to handle payment type and bank accounts: - account_payment_partner - account_payment_sale - account_payment_sale_stock - account_payment_purchase Filter the selection of invoices per payment type. Add active field on payment.mode and payment.mode.type. Add menu entry for Payment Types. --- account_payment_sale/__init__.py | 23 +++++++ account_payment_sale/__openerp__.py | 48 ++++++++++++++ .../i18n/account_payment_sale.pot | 37 +++++++++++ account_payment_sale/model/__init__.py | 23 +++++++ account_payment_sale/model/sale.py | 66 +++++++++++++++++++ account_payment_sale/view/sale.xml | 28 ++++++++ 6 files changed, 225 insertions(+) create mode 100644 account_payment_sale/__init__.py create mode 100644 account_payment_sale/__openerp__.py create mode 100644 account_payment_sale/i18n/account_payment_sale.pot create mode 100644 account_payment_sale/model/__init__.py create mode 100644 account_payment_sale/model/sale.py create mode 100644 account_payment_sale/view/sale.xml diff --git a/account_payment_sale/__init__.py b/account_payment_sale/__init__.py new file mode 100644 index 000000000..83c0dcfe2 --- /dev/null +++ b/account_payment_sale/__init__.py @@ -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 +# +# 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 . +# +############################################################################## + +from . import model diff --git a/account_payment_sale/__openerp__.py b/account_payment_sale/__openerp__.py new file mode 100644 index 000000000..b6cf3b2cb --- /dev/null +++ b/account_payment_sale/__openerp__.py @@ -0,0 +1,48 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Account Payment Sale module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com). +# @author Alexis de Lattre +# +# 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 . +# +############################################################################## + +{ + 'name': 'Account Payment Sale', + 'version': '1.0', + 'category': 'Banking addons', + 'license': 'AGPL-3', + 'summary': "Adds Bank Account and Payment Type on Sale Orders", + 'description': """ +Account Payment Sale +==================== + +This modules adds 2 fields on sale orders : *Bank Account* and *Payment Type*. These fields are 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 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, +} diff --git a/account_payment_sale/i18n/account_payment_sale.pot b/account_payment_sale/i18n/account_payment_sale.pot new file mode 100644 index 000000000..3bb6dd99d --- /dev/null +++ b/account_payment_sale/i18n/account_payment_sale.pot @@ -0,0 +1,37 @@ +# 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-02-24 23:07+0000\n" +"PO-Revision-Date: 2014-02-24 23:07+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_type:0 +msgid "Payment Type" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "" + +#. module: account_payment_sale +#: help:sale.order,partner_bank_receivable:0 +msgid "Select the bank account of your company on which the customer should pay. This field is copied from the partner and will be copied to the customer invoice." +msgstr "" + +#. module: account_payment_sale +#: field:sale.order,partner_bank_receivable:0 +msgid "Receivable Bank Account" +msgstr "" + diff --git a/account_payment_sale/model/__init__.py b/account_payment_sale/model/__init__.py new file mode 100644 index 000000000..079ae1b71 --- /dev/null +++ b/account_payment_sale/model/__init__.py @@ -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 +# +# 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 . +# +############################################################################## + +from . import sale diff --git a/account_payment_sale/model/sale.py b/account_payment_sale/model/sale.py new file mode 100644 index 000000000..3dc8a5e3c --- /dev/null +++ b/account_payment_sale/model/sale.py @@ -0,0 +1,66 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Account Payment Sale module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# 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 . +# +############################################################################## + +from openerp.osv import orm, fields + + +class sale_order(orm.Model): + _inherit = "sale.order" + + _columns = { + 'partner_bank_receivable': fields.many2one( + 'res.partner.bank', 'Receivable Bank Account', + help="Select the bank account of your company on which the " + "customer should pay. This field is copied from the partner " + "and will be copied to the customer invoice."), + 'payment_mode_type': fields.many2one( + 'payment.mode.type', 'Payment Type'), + } + + 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'].update({ + 'partner_bank_receivable': + partner.partner_bank_receivable.id or False, + 'payment_mode_type': + partner.customer_payment_mode_type.id or False, + }) + else: + res['value'].update({ + 'partner_bank_receivable': False, + 'payment_mode_type': 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({ + 'partner_bank_id': order.partner_bank_receivable.id or False, + 'payment_mode_type': order.payment_mode_type.id or False, + }) + return invoice_vals diff --git a/account_payment_sale/view/sale.xml b/account_payment_sale/view/sale.xml new file mode 100644 index 000000000..f54cf8c95 --- /dev/null +++ b/account_payment_sale/view/sale.xml @@ -0,0 +1,28 @@ + + + + + + + + + account_payment_sale.sale_order.form + sale.order + + + + + + + + + + + + From c153ccfa7e1b70d79919098a405dafc523ba9445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Valyi?= Date: Fri, 21 Mar 2014 16:50:25 -0300 Subject: [PATCH 02/36] [REF] wrapping module description lines to keep cool with the PEP-8 extremists --- account_payment_sale/__openerp__.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/account_payment_sale/__openerp__.py b/account_payment_sale/__openerp__.py index b6cf3b2cb..42ba67911 100644 --- a/account_payment_sale/__openerp__.py +++ b/account_payment_sale/__openerp__.py @@ -30,11 +30,18 @@ Account Payment Sale ==================== -This modules adds 2 fields on sale orders : *Bank Account* and *Payment Type*. These fields are copied from partner to sale order and then from sale order to customer invoice. +This modules adds 2 fields on sale orders : *Bank Account* and *Payment Type*. +These fields are 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). +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 for any help or question about this module. +Please contact Alexis de Lattre from Akretion +for any help or question about this module. """, 'author': 'Akretion', 'website': 'http://www.akretion.com', From 1f21a3739da93b79d092ca7c744d2765e9a8b7f7 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Tue, 10 Jun 2014 01:25:34 +0200 Subject: [PATCH 03/36] Update to the new data-model decided during the Open Days 2014. Add demo data. --- account_payment_sale/__openerp__.py | 6 ++--- .../i18n/account_payment_sale.pot | 18 +++---------- account_payment_sale/model/sale.py | 26 +++++-------------- account_payment_sale/view/sale.xml | 6 +---- 4 files changed, 15 insertions(+), 41 deletions(-) diff --git a/account_payment_sale/__openerp__.py b/account_payment_sale/__openerp__.py index 42ba67911..4ed156a33 100644 --- a/account_payment_sale/__openerp__.py +++ b/account_payment_sale/__openerp__.py @@ -25,13 +25,13 @@ 'version': '1.0', 'category': 'Banking addons', 'license': 'AGPL-3', - 'summary': "Adds Bank Account and Payment Type on Sale Orders", + 'summary': "Adds Payment Mode on Sale Orders", 'description': """ Account Payment Sale ==================== -This modules adds 2 fields on sale orders : *Bank Account* and *Payment Type*. -These fields are copied from partner to sale order and then from sale order to +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 diff --git a/account_payment_sale/i18n/account_payment_sale.pot b/account_payment_sale/i18n/account_payment_sale.pot index 3bb6dd99d..75c88ad87 100644 --- a/account_payment_sale/i18n/account_payment_sale.pot +++ b/account_payment_sale/i18n/account_payment_sale.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-24 23:07+0000\n" -"PO-Revision-Date: 2014-02-24 23:07+0000\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" @@ -16,8 +16,8 @@ msgstr "" "Plural-Forms: \n" #. module: account_payment_sale -#: field:sale.order,payment_mode_type:0 -msgid "Payment Type" +#: field:sale.order,payment_mode_id:0 +msgid "Payment Mode" msgstr "" #. module: account_payment_sale @@ -25,13 +25,3 @@ msgstr "" msgid "Sales Order" msgstr "" -#. module: account_payment_sale -#: help:sale.order,partner_bank_receivable:0 -msgid "Select the bank account of your company on which the customer should pay. This field is copied from the partner and will be copied to the customer invoice." -msgstr "" - -#. module: account_payment_sale -#: field:sale.order,partner_bank_receivable:0 -msgid "Receivable Bank Account" -msgstr "" - diff --git a/account_payment_sale/model/sale.py b/account_payment_sale/model/sale.py index 3dc8a5e3c..1c82e9d35 100644 --- a/account_payment_sale/model/sale.py +++ b/account_payment_sale/model/sale.py @@ -27,13 +27,8 @@ class sale_order(orm.Model): _inherit = "sale.order" _columns = { - 'partner_bank_receivable': fields.many2one( - 'res.partner.bank', 'Receivable Bank Account', - help="Select the bank account of your company on which the " - "customer should pay. This field is copied from the partner " - "and will be copied to the customer invoice."), - 'payment_mode_type': fields.many2one( - 'payment.mode.type', 'Payment Type'), + 'payment_mode_id': fields.many2one( + 'payment.mode', 'Payment Mode'), } def onchange_partner_id(self, cr, uid, ids, part, context=None): @@ -42,17 +37,10 @@ class sale_order(orm.Model): if part: partner = self.pool['res.partner'].browse( cr, uid, part, context=context) - res['value'].update({ - 'partner_bank_receivable': - partner.partner_bank_receivable.id or False, - 'payment_mode_type': - partner.customer_payment_mode_type.id or False, - }) + res['value']['payment_mode_id'] = \ + partner.customer_payment_mode.id or False, else: - res['value'].update({ - 'partner_bank_receivable': False, - 'payment_mode_type': False, - }) + res['value']['payment_mode_id'] = False return res def _prepare_invoice(self, cr, uid, order, lines, context=None): @@ -60,7 +48,7 @@ class sale_order(orm.Model): invoice_vals = super(sale_order, self)._prepare_invoice( cr, uid, order, lines, context=context) invoice_vals.update({ - 'partner_bank_id': order.partner_bank_receivable.id or False, - 'payment_mode_type': order.payment_mode_type.id or False, + 'payment_mode_id': order.payment_mode_id.id or False, + 'partner_bank_id': order.payment_mode_id.bank_id.id or False, }) return invoice_vals diff --git a/account_payment_sale/view/sale.xml b/account_payment_sale/view/sale.xml index f54cf8c95..016598e09 100644 --- a/account_payment_sale/view/sale.xml +++ b/account_payment_sale/view/sale.xml @@ -15,11 +15,7 @@ - - - + From ac5fdc02c537243a0194db52c918964b35440e67 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Mon, 23 Jun 2014 11:45:26 +0200 Subject: [PATCH 04/36] Suggested by Stefan Rijnhart : check for the payment_mode_id before asking its bank_id.id --- account_payment_sale/model/sale.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/account_payment_sale/model/sale.py b/account_payment_sale/model/sale.py index 1c82e9d35..5951f96af 100644 --- a/account_payment_sale/model/sale.py +++ b/account_payment_sale/model/sale.py @@ -49,6 +49,7 @@ class sale_order(orm.Model): 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.bank_id.id or False, + 'partner_bank_id': order.payment_mode_id and + order.payment_mode_id.bank_id.id or False, }) return invoice_vals From 7fe7547d892704e9e4a01a025e1ea7ba0b13a716 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of banking-addons-team Date: Fri, 27 Jun 2014 07:13:31 +0000 Subject: [PATCH 05/36] Launchpad automatic translations update. --- account_payment_sale/i18n/nl.po | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 account_payment_sale/i18n/nl.po diff --git a/account_payment_sale/i18n/nl.po b/account_payment_sale/i18n/nl.po new file mode 100644 index 000000000..c5d7923f3 --- /dev/null +++ b/account_payment_sale/i18n/nl.po @@ -0,0 +1,28 @@ +# Dutch translation for banking-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the banking-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: banking-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2014-06-09 23:24+0000\n" +"PO-Revision-Date: 2014-06-26 14:13+0000\n" +"Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-06-27 07:13+0000\n" +"X-Generator: Launchpad (build 17077)\n" + +#. module: account_payment_sale +#: field:sale.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Betaalwijze" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Verkooporder" From ea2a6210b2c2a93e624a1af74491a21d03fecb97 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 10 Sep 2014 12:19:20 +0200 Subject: [PATCH 06/36] Initial adjustments for 8.0 repository --- account_payment_sale/__init__.py | 23 -------- account_payment_sale/__openerp__.py | 55 ------------------- .../i18n/account_payment_sale.pot | 27 --------- account_payment_sale/i18n/nl.po | 28 ---------- account_payment_sale/model/__init__.py | 23 -------- account_payment_sale/model/sale.py | 55 ------------------- account_payment_sale/view/sale.xml | 24 -------- 7 files changed, 235 deletions(-) delete mode 100644 account_payment_sale/__init__.py delete mode 100644 account_payment_sale/__openerp__.py delete mode 100644 account_payment_sale/i18n/account_payment_sale.pot delete mode 100644 account_payment_sale/i18n/nl.po delete mode 100644 account_payment_sale/model/__init__.py delete mode 100644 account_payment_sale/model/sale.py delete mode 100644 account_payment_sale/view/sale.xml diff --git a/account_payment_sale/__init__.py b/account_payment_sale/__init__.py deleted file mode 100644 index 83c0dcfe2..000000000 --- a/account_payment_sale/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Sale module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# 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 . -# -############################################################################## - -from . import model diff --git a/account_payment_sale/__openerp__.py b/account_payment_sale/__openerp__.py deleted file mode 100644 index 4ed156a33..000000000 --- a/account_payment_sale/__openerp__.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Sale module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com). -# @author Alexis de Lattre -# -# 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 . -# -############################################################################## - -{ - '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 -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, -} diff --git a/account_payment_sale/i18n/account_payment_sale.pot b/account_payment_sale/i18n/account_payment_sale.pot deleted file mode 100644 index 75c88ad87..000000000 --- a/account_payment_sale/i18n/account_payment_sale.pot +++ /dev/null @@ -1,27 +0,0 @@ -# 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 "" - diff --git a/account_payment_sale/i18n/nl.po b/account_payment_sale/i18n/nl.po deleted file mode 100644 index c5d7923f3..000000000 --- a/account_payment_sale/i18n/nl.po +++ /dev/null @@ -1,28 +0,0 @@ -# Dutch translation for banking-addons -# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 -# This file is distributed under the same license as the banking-addons package. -# FIRST AUTHOR , 2014. -# -msgid "" -msgstr "" -"Project-Id-Version: banking-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-06-09 23:24+0000\n" -"PO-Revision-Date: 2014-06-26 14:13+0000\n" -"Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" -"Language-Team: Dutch \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-06-27 07:13+0000\n" -"X-Generator: Launchpad (build 17077)\n" - -#. module: account_payment_sale -#: field:sale.order,payment_mode_id:0 -msgid "Payment Mode" -msgstr "Betaalwijze" - -#. module: account_payment_sale -#: model:ir.model,name:account_payment_sale.model_sale_order -msgid "Sales Order" -msgstr "Verkooporder" diff --git a/account_payment_sale/model/__init__.py b/account_payment_sale/model/__init__.py deleted file mode 100644 index 079ae1b71..000000000 --- a/account_payment_sale/model/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Sale module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# 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 . -# -############################################################################## - -from . import sale diff --git a/account_payment_sale/model/sale.py b/account_payment_sale/model/sale.py deleted file mode 100644 index 5951f96af..000000000 --- a/account_payment_sale/model/sale.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Sale module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# 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 . -# -############################################################################## - -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 diff --git a/account_payment_sale/view/sale.xml b/account_payment_sale/view/sale.xml deleted file mode 100644 index 016598e09..000000000 --- a/account_payment_sale/view/sale.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - account_payment_sale.sale_order.form - sale.order - - - - - - - - - - From d94f15af7ab03aa473f817ed83b3aa5ec4b972ef Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 10 Sep 2014 12:48:09 +0200 Subject: [PATCH 07/36] [MIG] Migration and enhancement of all modules involved in SEPA --- account_payment_sale/__init__.py | 23 ++++++++ account_payment_sale/__openerp__.py | 55 +++++++++++++++++++ .../i18n/account_payment_sale.pot | 27 +++++++++ account_payment_sale/i18n/nl.po | 28 ++++++++++ account_payment_sale/model/__init__.py | 23 ++++++++ account_payment_sale/model/sale.py | 55 +++++++++++++++++++ account_payment_sale/models/__init__.py | 24 ++++++++ account_payment_sale/models/sale_order.py | 50 +++++++++++++++++ account_payment_sale/models/stock_picking.py | 40 ++++++++++++++ account_payment_sale/view/sale.xml | 24 ++++++++ .../views/sale_order_view.xml | 24 ++++++++ 11 files changed, 373 insertions(+) create mode 100644 account_payment_sale/__init__.py create mode 100644 account_payment_sale/__openerp__.py create mode 100644 account_payment_sale/i18n/account_payment_sale.pot create mode 100644 account_payment_sale/i18n/nl.po create mode 100644 account_payment_sale/model/__init__.py create mode 100644 account_payment_sale/model/sale.py create mode 100644 account_payment_sale/models/__init__.py create mode 100644 account_payment_sale/models/sale_order.py create mode 100644 account_payment_sale/models/stock_picking.py create mode 100644 account_payment_sale/view/sale.xml create mode 100644 account_payment_sale/views/sale_order_view.xml diff --git a/account_payment_sale/__init__.py b/account_payment_sale/__init__.py new file mode 100644 index 000000000..11323c6e9 --- /dev/null +++ b/account_payment_sale/__init__.py @@ -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 +# +# 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 . +# +############################################################################## + +from . import models diff --git a/account_payment_sale/__openerp__.py b/account_payment_sale/__openerp__.py new file mode 100644 index 000000000..99266a10a --- /dev/null +++ b/account_payment_sale/__openerp__.py @@ -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 +# +# 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 . +# +############################################################################## + +{ + '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*. + """, + 'author': 'Akretion', + 'website': 'http://www.akretion.com', + 'contributors': ['Pedro M. Baeza '], + 'depends': [ + 'sale', + 'stock_account', + 'account_payment_partner' + ], + 'conflicts': ['sale_payment'], + 'data': [ + 'views/sale_order_view.xml', + ], + 'installable': True, +} diff --git a/account_payment_sale/i18n/account_payment_sale.pot b/account_payment_sale/i18n/account_payment_sale.pot new file mode 100644 index 000000000..75c88ad87 --- /dev/null +++ b/account_payment_sale/i18n/account_payment_sale.pot @@ -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 "" + diff --git a/account_payment_sale/i18n/nl.po b/account_payment_sale/i18n/nl.po new file mode 100644 index 000000000..c5d7923f3 --- /dev/null +++ b/account_payment_sale/i18n/nl.po @@ -0,0 +1,28 @@ +# Dutch translation for banking-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the banking-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: banking-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2014-06-09 23:24+0000\n" +"PO-Revision-Date: 2014-06-26 14:13+0000\n" +"Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-06-27 07:13+0000\n" +"X-Generator: Launchpad (build 17077)\n" + +#. module: account_payment_sale +#: field:sale.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Betaalwijze" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Verkooporder" diff --git a/account_payment_sale/model/__init__.py b/account_payment_sale/model/__init__.py new file mode 100644 index 000000000..079ae1b71 --- /dev/null +++ b/account_payment_sale/model/__init__.py @@ -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 +# +# 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 . +# +############################################################################## + +from . import sale diff --git a/account_payment_sale/model/sale.py b/account_payment_sale/model/sale.py new file mode 100644 index 000000000..5951f96af --- /dev/null +++ b/account_payment_sale/model/sale.py @@ -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 +# +# 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 . +# +############################################################################## + +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 diff --git a/account_payment_sale/models/__init__.py b/account_payment_sale/models/__init__.py new file mode 100644 index 000000000..9de52dd65 --- /dev/null +++ b/account_payment_sale/models/__init__.py @@ -0,0 +1,24 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Account Payment Sale module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# 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 . +# +############################################################################## + +from . import sale_order +from . import stock_picking diff --git a/account_payment_sale/models/sale_order.py b/account_payment_sale/models/sale_order.py new file mode 100644 index 000000000..cd93e56d7 --- /dev/null +++ b/account_payment_sale/models/sale_order.py @@ -0,0 +1,50 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Account Payment Sale module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# 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 . +# +############################################################################## + +from openerp import models, fields, api + + +class SaleOrder(models.Model): + _inherit = "sale.order" + + payment_mode_id = fields.Many2one( + 'payment.mode', string='Payment Mode', + domain="[('payment_order_type', '=', 'debit')]") + + @api.multi + def onchange_partner_id(self, partner_id): + res = super(SaleOrder, self).onchange_partner_id(partner_id) + if partner_id: + partner = self.env['res.partner'].browse(partner_id) + res['value']['payment_mode_id'] = partner.customer_payment_mode.id + else: + res['value']['payment_mode_id'] = False + return res + + @api.model + def _prepare_invoice(self, order, lines): + """Copy bank partner from sale order to invoice""" + vals = super(SaleOrder, self)._prepare_invoice(order, lines) + vals['payment_mode_id'] = order.payment_mode_id.id, + vals['partner_bank_id'] = (order.payment_mode_id and + order.payment_mode_id.bank_id.id) + return vals diff --git a/account_payment_sale/models/stock_picking.py b/account_payment_sale/models/stock_picking.py new file mode 100644 index 000000000..f9d48f688 --- /dev/null +++ b/account_payment_sale/models/stock_picking.py @@ -0,0 +1,40 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Account Payment Purchase module for OpenERP +# Copyright (C) 2014 Akretion (http://www.akretion.com) +# @author Alexis de Lattre +# +# 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 . +# +############################################################################## + +from openerp import models, api + + +class StockPicking(models.Model): + _inherit = "stock.picking" + + @api.model + def _create_invoice_from_picking(self, picking, vals): + if picking: + # Search if this picking comes from a sale order + sale_order_obj = self.env['sale.order'] + sale_order = sale_order_obj.search( + [('picking_ids', 'in', picking.id)], limit=1) + if sale_order: + vals['partner_bank_id'] = sale_order.payment_mode_id.bank_id.id + vals['payment_mode_id'] = sale_order.payment_mode_id.id + return super(StockPicking, self)._create_invoice_from_picking(picking, + vals) diff --git a/account_payment_sale/view/sale.xml b/account_payment_sale/view/sale.xml new file mode 100644 index 000000000..016598e09 --- /dev/null +++ b/account_payment_sale/view/sale.xml @@ -0,0 +1,24 @@ + + + + + + + + + account_payment_sale.sale_order.form + sale.order + + + + + + + + + + diff --git a/account_payment_sale/views/sale_order_view.xml b/account_payment_sale/views/sale_order_view.xml new file mode 100644 index 000000000..016598e09 --- /dev/null +++ b/account_payment_sale/views/sale_order_view.xml @@ -0,0 +1,24 @@ + + + + + + + + + account_payment_sale.sale_order.form + sale.order + + + + + + + + + + From b3302ceb2a1455b5a8397546ce2b39acda4a8980 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Tue, 16 Sep 2014 12:28:58 +0200 Subject: [PATCH 08/36] [DEL] Duplicated files --- account_payment_sale/model/__init__.py | 23 ----------- account_payment_sale/model/sale.py | 55 -------------------------- 2 files changed, 78 deletions(-) delete mode 100644 account_payment_sale/model/__init__.py delete mode 100644 account_payment_sale/model/sale.py diff --git a/account_payment_sale/model/__init__.py b/account_payment_sale/model/__init__.py deleted file mode 100644 index 079ae1b71..000000000 --- a/account_payment_sale/model/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Sale module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# 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 . -# -############################################################################## - -from . import sale diff --git a/account_payment_sale/model/sale.py b/account_payment_sale/model/sale.py deleted file mode 100644 index 5951f96af..000000000 --- a/account_payment_sale/model/sale.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Sale module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# 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 . -# -############################################################################## - -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 From 011e4e89caa7e2b56cb51271d082724c08bf57cb Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Tue, 23 Sep 2014 09:24:14 +0200 Subject: [PATCH 09/36] [FIX] account_payment_sale: Check if payment mode is set in the propagation --- account_payment_sale/models/sale_order.py | 7 ++++--- account_payment_sale/models/stock_picking.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/account_payment_sale/models/sale_order.py b/account_payment_sale/models/sale_order.py index cd93e56d7..fa30ccf2d 100644 --- a/account_payment_sale/models/sale_order.py +++ b/account_payment_sale/models/sale_order.py @@ -44,7 +44,8 @@ class SaleOrder(models.Model): def _prepare_invoice(self, order, lines): """Copy bank partner from sale order to invoice""" vals = super(SaleOrder, self)._prepare_invoice(order, lines) - vals['payment_mode_id'] = order.payment_mode_id.id, - vals['partner_bank_id'] = (order.payment_mode_id and - order.payment_mode_id.bank_id.id) + if order.payment_mode_id: + vals['payment_mode_id'] = order.payment_mode_id.id, + vals['partner_bank_id'] = (order.payment_mode_id and + order.payment_mode_id.bank_id.id) return vals diff --git a/account_payment_sale/models/stock_picking.py b/account_payment_sale/models/stock_picking.py index f9d48f688..320952ac5 100644 --- a/account_payment_sale/models/stock_picking.py +++ b/account_payment_sale/models/stock_picking.py @@ -33,7 +33,7 @@ class StockPicking(models.Model): sale_order_obj = self.env['sale.order'] sale_order = sale_order_obj.search( [('picking_ids', 'in', picking.id)], limit=1) - if sale_order: + if sale_order and sale_order.payment_mode_id: vals['partner_bank_id'] = sale_order.payment_mode_id.bank_id.id vals['payment_mode_id'] = sale_order.payment_mode_id.id return super(StockPicking, self)._create_invoice_from_picking(picking, From 84b4a205204dae13439355c54b2e16a7e9ee8bc4 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Tue, 7 Oct 2014 00:09:26 +0200 Subject: [PATCH 10/36] Clean files --- account_payment_sale/models/sale_order.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/account_payment_sale/models/sale_order.py b/account_payment_sale/models/sale_order.py index fa30ccf2d..0906beae0 100644 --- a/account_payment_sale/models/sale_order.py +++ b/account_payment_sale/models/sale_order.py @@ -46,6 +46,5 @@ class SaleOrder(models.Model): vals = super(SaleOrder, self)._prepare_invoice(order, lines) if order.payment_mode_id: vals['payment_mode_id'] = order.payment_mode_id.id, - vals['partner_bank_id'] = (order.payment_mode_id and - order.payment_mode_id.bank_id.id) + vals['partner_bank_id'] = order.payment_mode_id.bank_id.id return vals From cec503cbe7c753312f8173fd468c25e6715516b6 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Fri, 31 Oct 2014 23:54:24 +0100 Subject: [PATCH 11/36] [FIX] account_payment_sale_stock: Split for removing stock dependency on sale [DEL] Remove old translations templates [IMP] More reorder on folder structure --- account_payment_sale/__openerp__.py | 10 ++--- account_payment_sale/models/__init__.py | 5 --- account_payment_sale/models/sale_order.py | 3 +- account_payment_sale/models/stock_picking.py | 40 -------------------- account_payment_sale/view/sale.xml | 24 ------------ 5 files changed, 7 insertions(+), 75 deletions(-) delete mode 100644 account_payment_sale/models/stock_picking.py delete mode 100644 account_payment_sale/view/sale.xml diff --git a/account_payment_sale/__openerp__.py b/account_payment_sale/__openerp__.py index 99266a10a..84d1c9d96 100644 --- a/account_payment_sale/__openerp__.py +++ b/account_payment_sale/__openerp__.py @@ -25,18 +25,18 @@ 'version': '1.0', 'category': 'Banking addons', 'license': 'AGPL-3', - 'summary': "Adds Payment Mode on Sale Orders", + 'summary': "Adds payment mode on sale orders", 'description': """ Account Payment Sale ==================== -This modules adds one field on sale orders : *Payment Mode*. +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 +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 +only module to conflict with *account_payment_extension*; all the SEPA modules in the banking addons conflict with *account_payment_extension*. """, 'author': 'Akretion', @@ -44,7 +44,6 @@ modules in the banking addons conflict with *account_payment_extension*. 'contributors': ['Pedro M. Baeza '], 'depends': [ 'sale', - 'stock_account', 'account_payment_partner' ], 'conflicts': ['sale_payment'], @@ -52,4 +51,5 @@ modules in the banking addons conflict with *account_payment_extension*. 'views/sale_order_view.xml', ], 'installable': True, + 'auto_install': True, } diff --git a/account_payment_sale/models/__init__.py b/account_payment_sale/models/__init__.py index 9de52dd65..814479106 100644 --- a/account_payment_sale/models/__init__.py +++ b/account_payment_sale/models/__init__.py @@ -1,10 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# Account Payment Sale module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# # 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 @@ -21,4 +17,3 @@ ############################################################################## from . import sale_order -from . import stock_picking diff --git a/account_payment_sale/models/sale_order.py b/account_payment_sale/models/sale_order.py index 0906beae0..e1b6a4aad 100644 --- a/account_payment_sale/models/sale_order.py +++ b/account_payment_sale/models/sale_order.py @@ -28,7 +28,8 @@ class SaleOrder(models.Model): payment_mode_id = fields.Many2one( 'payment.mode', string='Payment Mode', - domain="[('payment_order_type', '=', 'debit')]") + domain="['|', ('payment_order_type', '=', 'debit'), " + "('payment_order_type', '=', 'both')]") @api.multi def onchange_partner_id(self, partner_id): diff --git a/account_payment_sale/models/stock_picking.py b/account_payment_sale/models/stock_picking.py deleted file mode 100644 index 320952ac5..000000000 --- a/account_payment_sale/models/stock_picking.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Purchase module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# 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 . -# -############################################################################## - -from openerp import models, api - - -class StockPicking(models.Model): - _inherit = "stock.picking" - - @api.model - def _create_invoice_from_picking(self, picking, vals): - if picking: - # Search if this picking comes from a sale order - sale_order_obj = self.env['sale.order'] - sale_order = sale_order_obj.search( - [('picking_ids', 'in', picking.id)], limit=1) - if sale_order and sale_order.payment_mode_id: - vals['partner_bank_id'] = sale_order.payment_mode_id.bank_id.id - vals['payment_mode_id'] = sale_order.payment_mode_id.id - return super(StockPicking, self)._create_invoice_from_picking(picking, - vals) diff --git a/account_payment_sale/view/sale.xml b/account_payment_sale/view/sale.xml deleted file mode 100644 index 016598e09..000000000 --- a/account_payment_sale/view/sale.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - account_payment_sale.sale_order.form - sale.order - - - - - - - - - - From b39c7221c916194136cd27cfe981dd818ed2ea1a Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sat, 1 Nov 2014 01:48:26 +0100 Subject: [PATCH 12/36] [IMP] Translation template files [IMP] Translations to spanish --- .../i18n/account_payment_sale.pot | 8 +++--- account_payment_sale/i18n/es.po | 27 +++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 account_payment_sale/i18n/es.po diff --git a/account_payment_sale/i18n/account_payment_sale.pot b/account_payment_sale/i18n/account_payment_sale.pot index 75c88ad87..c2d05ec68 100644 --- a/account_payment_sale/i18n/account_payment_sale.pot +++ b/account_payment_sale/i18n/account_payment_sale.pot @@ -1,13 +1,13 @@ -# Translation of OpenERP Server. +# Translation of Odoo Server. # This file contains the translation of the following modules: # * account_payment_sale # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" +"Project-Id-Version: Odoo Server 8.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" +"POT-Creation-Date: 2014-10-31 23:00+0000\n" +"PO-Revision-Date: 2014-10-31 23:00+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/account_payment_sale/i18n/es.po b/account_payment_sale/i18n/es.po new file mode 100644 index 000000000..436919b1e --- /dev/null +++ b/account_payment_sale/i18n/es.po @@ -0,0 +1,27 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-10-31 23:00+0000\n" +"PO-Revision-Date: 2014-10-31 23:00+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 "Modo de pago" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Pedido de venta" + From ac4deb87b3736a199e59a413e035b52c510cd6c6 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Fri, 7 Nov 2014 23:00:34 +0100 Subject: [PATCH 13/36] Use sale_ok and purchase_ok instead of tweaking payment type --- account_payment_sale/models/sale_order.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/account_payment_sale/models/sale_order.py b/account_payment_sale/models/sale_order.py index e1b6a4aad..e96b3cd3b 100644 --- a/account_payment_sale/models/sale_order.py +++ b/account_payment_sale/models/sale_order.py @@ -28,8 +28,7 @@ class SaleOrder(models.Model): payment_mode_id = fields.Many2one( 'payment.mode', string='Payment Mode', - domain="['|', ('payment_order_type', '=', 'debit'), " - "('payment_order_type', '=', 'both')]") + domain="[('sale_ok', '=', True)]") @api.multi def onchange_partner_id(self, partner_id): From e6bf6358557c6e7a7059b31f275b197a995f1bce Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Mon, 19 Jan 2015 22:52:38 +0100 Subject: [PATCH 14/36] Add sale_ok and purchase_ok filters in partner/sale/purchase form views Use widget=selection for payment_mode_id fields Update demo data --- account_payment_sale/views/sale_order_view.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/account_payment_sale/views/sale_order_view.xml b/account_payment_sale/views/sale_order_view.xml index 016598e09..c5f5c65d8 100644 --- a/account_payment_sale/views/sale_order_view.xml +++ b/account_payment_sale/views/sale_order_view.xml @@ -15,7 +15,9 @@ - + From ea8d96a2b8a8cf6aaca3c0d17b76257bb6a15e3d Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Mon, 26 Jan 2015 19:30:24 +0100 Subject: [PATCH 15/36] [FIX] account_payment_sale: Extra comma --- account_payment_sale/models/sale_order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_payment_sale/models/sale_order.py b/account_payment_sale/models/sale_order.py index e96b3cd3b..d8ed2722f 100644 --- a/account_payment_sale/models/sale_order.py +++ b/account_payment_sale/models/sale_order.py @@ -45,6 +45,6 @@ class SaleOrder(models.Model): """Copy bank partner from sale order to invoice""" vals = super(SaleOrder, self)._prepare_invoice(order, lines) if order.payment_mode_id: - vals['payment_mode_id'] = order.payment_mode_id.id, + vals['payment_mode_id'] = order.payment_mode_id.id vals['partner_bank_id'] = order.payment_mode_id.bank_id.id return vals From e27038b44a7f7a776e849343733c8865f60c2991 Mon Sep 17 00:00:00 2001 From: Danimar Ribeiro Date: Fri, 13 Feb 2015 19:18:41 -0200 Subject: [PATCH 16/36] Portuguese translations --- account_payment_sale/i18n/pt_BR.po | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 account_payment_sale/i18n/pt_BR.po diff --git a/account_payment_sale/i18n/pt_BR.po b/account_payment_sale/i18n/pt_BR.po new file mode 100644 index 000000000..9695a2b3c --- /dev/null +++ b/account_payment_sale/i18n/pt_BR.po @@ -0,0 +1,27 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-10-31 23:00+0000\n" +"PO-Revision-Date: 2014-10-31 23:00+0000\n" +"Last-Translator: Danimar Ribeiro \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 "Modo de Pagamento" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Pedido de Venda" + From 1ace747bb918aa8acac6a8158bf8ba1516ccff6e Mon Sep 17 00:00:00 2001 From: Alexandre Fayolle Date: Mon, 2 Mar 2015 17:23:15 +0100 Subject: [PATCH 17/36] Add OCA as author of OCA addons In order to get visibility on https://www.odoo.com/apps the OCA board has decided to add the OCA as author of all the addons maintained as part of the association. --- account_payment_sale/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_payment_sale/__openerp__.py b/account_payment_sale/__openerp__.py index 84d1c9d96..39844aef5 100644 --- a/account_payment_sale/__openerp__.py +++ b/account_payment_sale/__openerp__.py @@ -39,7 +39,7 @@ 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*. """, - 'author': 'Akretion', + 'author': "Akretion,Odoo Community Association (OCA)", 'website': 'http://www.akretion.com', 'contributors': ['Pedro M. Baeza '], 'depends': [ From 9af84b9e4bf67c537e0262970d4006a9a99a0441 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Mon, 25 May 2015 17:14:05 +0200 Subject: [PATCH 18/36] [IMP] Expand authors + manifest cleaning --- account_payment_sale/__openerp__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/account_payment_sale/__openerp__.py b/account_payment_sale/__openerp__.py index 39844aef5..900af5a05 100644 --- a/account_payment_sale/__openerp__.py +++ b/account_payment_sale/__openerp__.py @@ -39,9 +39,10 @@ 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*. """, - 'author': "Akretion,Odoo Community Association (OCA)", - 'website': 'http://www.akretion.com', - 'contributors': ['Pedro M. Baeza '], + 'author': "Akretion, " + "Serv. Tecnol. Avanzados - Pedro M. Baeza, " + "Odoo Community Association (OCA)", + 'website': 'https://github.com/OCA/bank-payment', 'depends': [ 'sale', 'account_payment_partner' From d794851175bf03fa2010cbc788e4a5833f08d8b9 Mon Sep 17 00:00:00 2001 From: Philippe Schmidt Date: Mon, 1 Jun 2015 17:10:58 +0200 Subject: [PATCH 19/36] Add requested descriptions in an OCA README.rst file --- account_payment_sale/README.rst | 81 +++++++++++++++++++++++++++++ account_payment_sale/__openerp__.py | 13 ----- 2 files changed, 81 insertions(+), 13 deletions(-) create mode 100644 account_payment_sale/README.rst diff --git a/account_payment_sale/README.rst b/account_payment_sale/README.rst new file mode 100644 index 000000000..014e8965c --- /dev/null +++ b/account_payment_sale/README.rst @@ -0,0 +1,81 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :alt: License: AGPL-3 + +Account Payment Sale +==================== + +This module should be used when the invoice is based on the sale order. + +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*. + +Installation +============ + +This module depends on : +* purchase +* account_payment_partner + +This modules are parts of the OCA/bank-payment suite. + +Configuration +============= + +There is nothing to configure. + +Usage +===== + +You are able to add a payment mode directly on a partner. +This payment mode is automatically associated to the sale order, then on related invoice. +This default value could be change in a draft sale order or draft invoice. +When you create an direct debit order, only invoices related to chosen payment mode are displayed. +Invoices without any payment mode are displayed to. + +For further information, please visit: + + * https://www.odoo.com/forum/help-1 + +Known issues / Roadmap +====================== + + * ... + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback +`here `_. + +Credits +======= + +Contributors +------------ + +* Pedro M. Baeza +* Alexis de Lattre +* Alexandre Fayolle +* Danimar Ribeiro +* Raphaël Valyi + +Maintainer +---------- + +.. image:: http://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: http://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. + +To contribute to this module, please visit http://odoo-community.org. diff --git a/account_payment_sale/__openerp__.py b/account_payment_sale/__openerp__.py index 900af5a05..08169fe44 100644 --- a/account_payment_sale/__openerp__.py +++ b/account_payment_sale/__openerp__.py @@ -26,19 +26,6 @@ '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*. - """, 'author': "Akretion, " "Serv. Tecnol. Avanzados - Pedro M. Baeza, " "Odoo Community Association (OCA)", From 7df24476c22d64ea7bd9dd2b0452b5f4bf08cf70 Mon Sep 17 00:00:00 2001 From: Philippe Schmidt Date: Fri, 5 Jun 2015 12:31:00 +0200 Subject: [PATCH 20/36] some typo corrections --- account_payment_sale/README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/account_payment_sale/README.rst b/account_payment_sale/README.rst index 014e8965c..456a589ee 100644 --- a/account_payment_sale/README.rst +++ b/account_payment_sale/README.rst @@ -22,7 +22,7 @@ This module depends on : * purchase * account_payment_partner -This modules are parts of the OCA/bank-payment suite. +This module is part of the OCA/bank-payment suite. Configuration ============= @@ -45,7 +45,7 @@ For further information, please visit: Known issues / Roadmap ====================== - * ... + * No known issues. Bug Tracker =========== From 177d76699f1af94c4e4eca9ee0c65c17f328ff53 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Tue, 18 Aug 2015 11:10:50 +0200 Subject: [PATCH 21/36] Add missing default oca icons --- account_payment_sale/static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 account_payment_sale/static/description/icon.png diff --git a/account_payment_sale/static/description/icon.png b/account_payment_sale/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 179ca73ab7535964f4cb9ee2cead2154c4355f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Fri, 9 Oct 2015 09:59:34 +0200 Subject: [PATCH 22/36] [UPD] prefix versions with 8.0 --- account_payment_sale/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_payment_sale/__openerp__.py b/account_payment_sale/__openerp__.py index 08169fe44..99f2f3e90 100644 --- a/account_payment_sale/__openerp__.py +++ b/account_payment_sale/__openerp__.py @@ -22,7 +22,7 @@ { 'name': 'Account Payment Sale', - 'version': '1.0', + 'version': '8.0.1.0.0', 'category': 'Banking addons', 'license': 'AGPL-3', 'summary': "Adds payment mode on sale orders", From d73b93031fea67a1b65c08a06f0889440ccc6f9e Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 14 Oct 2015 03:03:12 +0200 Subject: [PATCH 23/36] [MIG] Make modules uninstallable --- account_payment_sale/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_payment_sale/__openerp__.py b/account_payment_sale/__openerp__.py index 99f2f3e90..7ca0364c2 100644 --- a/account_payment_sale/__openerp__.py +++ b/account_payment_sale/__openerp__.py @@ -38,6 +38,6 @@ 'data': [ 'views/sale_order_view.xml', ], - 'installable': True, + 'installable': False, 'auto_install': True, } From 2df759445cfe6b814b71d6ef25d09d9112af36e7 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Mon, 2 May 2016 11:43:11 +0200 Subject: [PATCH 24/36] Port account_payment_sale to v9 --- account_payment_sale/README.rst | 17 ++---- account_payment_sale/__init__.py | 23 +------- account_payment_sale/__openerp__.py | 29 ++-------- account_payment_sale/models/sale_order.py | 55 +++++++------------ .../views/sale_order_view.xml | 6 +- account_payment_sale/wizard/__init__.py | 3 + .../wizard/sale_make_invoice_advance.py | 24 ++++++++ 7 files changed, 62 insertions(+), 95 deletions(-) create mode 100644 account_payment_sale/wizard/__init__.py create mode 100644 account_payment_sale/wizard/sale_make_invoice_advance.py diff --git a/account_payment_sale/README.rst b/account_payment_sale/README.rst index 456a589ee..95fdacb80 100644 --- a/account_payment_sale/README.rst +++ b/account_payment_sale/README.rst @@ -4,10 +4,8 @@ Account Payment Sale ==================== -This module should be used when the invoice is based on the sale order. - 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 +This field is copied from customer to sale order and then from sale order to customer invoice. This module is similar to the *sale_payment* module; the main difference is @@ -19,7 +17,8 @@ Installation ============ This module depends on : -* purchase + +* sale * account_payment_partner This module is part of the OCA/bank-payment suite. @@ -35,25 +34,19 @@ Usage You are able to add a payment mode directly on a partner. This payment mode is automatically associated to the sale order, then on related invoice. This default value could be change in a draft sale order or draft invoice. -When you create an direct debit order, only invoices related to chosen payment mode are displayed. -Invoices without any payment mode are displayed to. - -For further information, please visit: - - * https://www.odoo.com/forum/help-1 Known issues / Roadmap ====================== * No known issues. - + Bug Tracker =========== Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed feedback -`here `_. +`here `_. Credits ======= diff --git a/account_payment_sale/__init__.py b/account_payment_sale/__init__.py index 11323c6e9..35e7c9600 100644 --- a/account_payment_sale/__init__.py +++ b/account_payment_sale/__init__.py @@ -1,23 +1,4 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Sale module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# 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 . -# -############################################################################## +# -*- coding: utf-8 -*- from . import models +from . import wizard diff --git a/account_payment_sale/__openerp__.py b/account_payment_sale/__openerp__.py index 7ca0364c2..09a9f10d9 100644 --- a/account_payment_sale/__openerp__.py +++ b/account_payment_sale/__openerp__.py @@ -1,28 +1,11 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Sale module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com). -# @author Alexis de Lattre -# -# 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 . -# -############################################################################## +# -*- coding: utf-8 -*- +# © 2014-2016 Akretion (http://www.akretion.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# @author Alexis de Lattre { 'name': 'Account Payment Sale', - 'version': '8.0.1.0.0', + 'version': '9.0.1.0.0', 'category': 'Banking addons', 'license': 'AGPL-3', 'summary': "Adds payment mode on sale orders", @@ -38,6 +21,6 @@ 'data': [ 'views/sale_order_view.xml', ], - 'installable': False, + 'installable': True, 'auto_install': True, } diff --git a/account_payment_sale/models/sale_order.py b/account_payment_sale/models/sale_order.py index d8ed2722f..244165703 100644 --- a/account_payment_sale/models/sale_order.py +++ b/account_payment_sale/models/sale_order.py @@ -1,24 +1,6 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Account Payment Sale module for OpenERP -# Copyright (C) 2014 Akretion (http://www.akretion.com) -# @author Alexis de Lattre -# -# 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 . -# -############################################################################## +# -*- coding: utf-8 -*- +# © 2014-2016 Akretion (Alexis de Lattre ) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from openerp import models, fields, api @@ -27,24 +9,25 @@ class SaleOrder(models.Model): _inherit = "sale.order" payment_mode_id = fields.Many2one( - 'payment.mode', string='Payment Mode', - domain="[('sale_ok', '=', True)]") + 'account.payment.mode', string='Payment Mode', + domain=[('payment_type', '=', 'inbound')]) - @api.multi - def onchange_partner_id(self, partner_id): - res = super(SaleOrder, self).onchange_partner_id(partner_id) - if partner_id: - partner = self.env['res.partner'].browse(partner_id) - res['value']['payment_mode_id'] = partner.customer_payment_mode.id + @api.onchange('partner_id') + def onchange_partner_id(self): + res = super(SaleOrder, self).onchange_partner_id() + if self.partner_id: + self.payment_mode_id = self.partner_id.customer_payment_mode.id else: - res['value']['payment_mode_id'] = False + self.payment_mode_id = False return res - @api.model - def _prepare_invoice(self, order, lines): + @api.multi + def _prepare_invoice(self): """Copy bank partner from sale order to invoice""" - vals = super(SaleOrder, self)._prepare_invoice(order, lines) - if order.payment_mode_id: - vals['payment_mode_id'] = order.payment_mode_id.id - vals['partner_bank_id'] = order.payment_mode_id.bank_id.id + vals = super(SaleOrder, self)._prepare_invoice() + if self.payment_mode_id: + vals['payment_mode_id'] = self.payment_mode_id.id + if self.payment_mode_id.bank_account_link == 'fixed': + vals['partner_bank_id'] =\ + self.payment_mode_id.fixed_journal_id.bank_account_id.id return vals diff --git a/account_payment_sale/views/sale_order_view.xml b/account_payment_sale/views/sale_order_view.xml index c5f5c65d8..c002971d1 100644 --- a/account_payment_sale/views/sale_order_view.xml +++ b/account_payment_sale/views/sale_order_view.xml @@ -1,7 +1,7 @@ @@ -14,9 +14,9 @@ sale.order - + diff --git a/account_payment_sale/wizard/__init__.py b/account_payment_sale/wizard/__init__.py new file mode 100644 index 000000000..1eb17ffa1 --- /dev/null +++ b/account_payment_sale/wizard/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import sale_make_invoice_advance diff --git a/account_payment_sale/wizard/sale_make_invoice_advance.py b/account_payment_sale/wizard/sale_make_invoice_advance.py new file mode 100644 index 000000000..a962e49c5 --- /dev/null +++ b/account_payment_sale/wizard/sale_make_invoice_advance.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# © 2016 Akretion (Alexis de Lattre ) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp import models, api + + +class SaleAdvancePaymentInv(models.TransientModel): + _inherit = 'sale.advance.payment.inv' + + @api.multi + def _create_invoice(self, order, so_line, amount): + """Copy payment mode from sale order to invoice""" + inv = super(SaleAdvancePaymentInv, self)._create_invoice( + order, so_line, amount) + vals = {} + if order.payment_mode_id: + vals['payment_mode_id'] = order.payment_mode_id.id + if order.payment_mode_id.bank_account_link == 'fixed': + vals['partner_bank_id'] =\ + order.payment_mode_id.fixed_journal_id.bank_account_id.id + if vals: + inv.write(vals) + return inv From 35608fa56986cc09d5f47d3307599b6ad2f435a6 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Fri, 6 May 2016 01:16:20 +0200 Subject: [PATCH 25/36] Finalise the wizard of selection of move lines to pay Add button "Add to payment/debit order" on invoice form view Started to integrate payment transfer in account_payment_order (not finished at all though) Various fixes/changes/improvements/... --- account_payment_sale/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_payment_sale/README.rst b/account_payment_sale/README.rst index 95fdacb80..9765013d6 100644 --- a/account_payment_sale/README.rst +++ b/account_payment_sale/README.rst @@ -55,7 +55,7 @@ Contributors ------------ * Pedro M. Baeza -* Alexis de Lattre +* Alexis de Lattre * Alexandre Fayolle * Danimar Ribeiro * Raphaël Valyi From 69884976c1cec37fca1bfa93ec24e098478b775a Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sat, 7 May 2016 23:55:46 +0200 Subject: [PATCH 26/36] Add module account_banking_mandate_sale Add option 'mandate_required' on payment orders Autoselect first valid mandate on customer invoice that have a payment mode 'mandate_required' = True Add option on select move lines to pay wizard to allow selection of litigation moves (unchecked by default), in order to integrate the feature of the module account_payment_blocking --- account_payment_sale/README.rst | 16 ++++++++++++---- account_payment_sale/models/__init__.py | 18 +----------------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/account_payment_sale/README.rst b/account_payment_sale/README.rst index 9765013d6..636eb219c 100644 --- a/account_payment_sale/README.rst +++ b/account_payment_sale/README.rst @@ -35,6 +35,10 @@ You are able to add a payment mode directly on a partner. This payment mode is automatically associated to the sale order, then on related invoice. This default value could be change in a draft sale order or draft invoice. +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/173/9.0 + Known issues / Roadmap ====================== @@ -43,10 +47,14 @@ Known issues / Roadmap Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. -In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed feedback -`here `_. +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed `feedback +`_. Credits ======= diff --git a/account_payment_sale/models/__init__.py b/account_payment_sale/models/__init__.py index 814479106..6064afee1 100644 --- a/account_payment_sale/models/__init__.py +++ b/account_payment_sale/models/__init__.py @@ -1,19 +1,3 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# 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 . -# -############################################################################## +# -*- coding: utf-8 -*- from . import sale_order From 6eced254f5c2bcf2cc80c5817ae3c4b9ff2cd81c Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Sun, 8 May 2016 00:11:26 +0200 Subject: [PATCH 27/36] Add _id suffix on M2O fields customer_payment_mode and supplier_payment_mode (Odoo did the same on all the M2O property fields of res.partner) --- account_payment_sale/models/sale_order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_payment_sale/models/sale_order.py b/account_payment_sale/models/sale_order.py index 244165703..5581ea850 100644 --- a/account_payment_sale/models/sale_order.py +++ b/account_payment_sale/models/sale_order.py @@ -16,7 +16,7 @@ class SaleOrder(models.Model): def onchange_partner_id(self): res = super(SaleOrder, self).onchange_partner_id() if self.partner_id: - self.payment_mode_id = self.partner_id.customer_payment_mode.id + self.payment_mode_id = self.partner_id.customer_payment_mode_id else: self.payment_mode_id = False return res From 58c1310932d1cd9d886a44e4ef8c2b03c368d6cd Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Mon, 23 May 2016 10:42:28 +0200 Subject: [PATCH 28/36] Take into accounts the remarks of Eric Caudal --- account_payment_sale/README.rst | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/account_payment_sale/README.rst b/account_payment_sale/README.rst index 636eb219c..383837d56 100644 --- a/account_payment_sale/README.rst +++ b/account_payment_sale/README.rst @@ -1,6 +1,7 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg :alt: License: AGPL-3 +==================== Account Payment Sale ==================== @@ -50,11 +51,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed `feedback -`_. +help us smashing it by providing a detailed and welcomed feedback. Credits ======= From 816ca21e54f033cd6831553ec90c53cb61a85a32 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Fri, 1 Jul 2016 21:01:13 +0200 Subject: [PATCH 29/36] [IMP] Remove unused POT files --- .../i18n/account_payment_sale.pot | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 account_payment_sale/i18n/account_payment_sale.pot diff --git a/account_payment_sale/i18n/account_payment_sale.pot b/account_payment_sale/i18n/account_payment_sale.pot deleted file mode 100644 index c2d05ec68..000000000 --- a/account_payment_sale/i18n/account_payment_sale.pot +++ /dev/null @@ -1,27 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * account_payment_sale -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-31 23:00+0000\n" -"PO-Revision-Date: 2014-10-31 23:00+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 "" - From 9af3008d9b294b851578225faeb26e695b6a229c Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 2 Jul 2016 03:36:38 -0400 Subject: [PATCH 30/36] OCA Transbot updated translations from Transifex --- account_payment_sale/i18n/de.po | 38 ++++++++++++++++++++++++++++ account_payment_sale/i18n/es.po | 27 ++++++++++++-------- account_payment_sale/i18n/fr.po | 34 +++++++++++++++++++++++++ account_payment_sale/i18n/nl.po | 40 +++++++++++++++++++----------- account_payment_sale/i18n/pt_BR.po | 27 ++++++++++++-------- account_payment_sale/i18n/sl.po | 34 +++++++++++++++++++++++++ 6 files changed, 166 insertions(+), 34 deletions(-) create mode 100644 account_payment_sale/i18n/de.po create mode 100644 account_payment_sale/i18n/fr.po create mode 100644 account_payment_sale/i18n/sl.po diff --git a/account_payment_sale/i18n/de.po b/account_payment_sale/i18n/de.po new file mode 100644 index 000000000..3dd3a06e1 --- /dev/null +++ b/account_payment_sale/i18n/de.po @@ -0,0 +1,38 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (10.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-12-08 01:38+0000\n" +"PO-Revision-Date: 2017-12-07 19:29+0000\n" +"Last-Translator: OCA Transbot \n" +"Language-Team: German (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_payment_sale +#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "Zahlungsmethode:" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id +msgid "Payment Mode" +msgstr "Zahlungsmodus" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "Verkaufsanzahlungsrechnung" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Kundenauftrag" diff --git a/account_payment_sale/i18n/es.po b/account_payment_sale/i18n/es.po index 436919b1e..9204f514a 100644 --- a/account_payment_sale/i18n/es.po +++ b/account_payment_sale/i18n/es.po @@ -1,27 +1,34 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_payment_sale -# +# * account_payment_sale +# +# Translators: +# OCA Transbot , 2016 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-31 23:00+0000\n" -"PO-Revision-Date: 2014-10-31 23:00+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" +"POT-Creation-Date: 2016-07-01 19:28+0000\n" +"PO-Revision-Date: 2016-07-01 19:28+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: account_payment_sale -#: field:sale.order,payment_mode_id:0 +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id msgid "Payment Mode" msgstr "Modo de pago" +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" + #. module: account_payment_sale #: model:ir.model,name:account_payment_sale.model_sale_order msgid "Sales Order" msgstr "Pedido de venta" - diff --git a/account_payment_sale/i18n/fr.po b/account_payment_sale/i18n/fr.po new file mode 100644 index 000000000..f5115596a --- /dev/null +++ b/account_payment_sale/i18n/fr.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-01 19:28+0000\n" +"PO-Revision-Date: 2016-07-01 19:28+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id +msgid "Payment Mode" +msgstr "Mode de paiement" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "" diff --git a/account_payment_sale/i18n/nl.po b/account_payment_sale/i18n/nl.po index c5d7923f3..7dc82d0e3 100644 --- a/account_payment_sale/i18n/nl.po +++ b/account_payment_sale/i18n/nl.po @@ -1,27 +1,39 @@ -# Dutch translation for banking-addons -# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 -# This file is distributed under the same license as the banking-addons package. -# FIRST AUTHOR , 2014. +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale # +# Translators: +# Erwin van der Ploeg , 2016 +# OCA Transbot , 2016 msgid "" msgstr "" -"Project-Id-Version: banking-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2014-06-09 23:24+0000\n" -"PO-Revision-Date: 2014-06-26 14:13+0000\n" -"Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" -"Language-Team: Dutch \n" +"Project-Id-Version: bank-payment (10.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-12-08 01:38+0000\n" +"PO-Revision-Date: 2017-12-19 18:17+0200\n" +"Last-Translator: OCA Transbot \n" +"Language-Team: Dutch (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-06-27 07:13+0000\n" -"X-Generator: Launchpad (build 17077)\n" +"Content-Transfer-Encoding: \n" +"Language: nl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: account_payment_sale -#: field:sale.order,payment_mode_id:0 +#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "Betaalmode:" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id msgid "Payment Mode" msgstr "Betaalwijze" +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "Verkoop Incassofactuur" + #. module: account_payment_sale #: model:ir.model,name:account_payment_sale.model_sale_order msgid "Sales Order" diff --git a/account_payment_sale/i18n/pt_BR.po b/account_payment_sale/i18n/pt_BR.po index 9695a2b3c..81af53d0e 100644 --- a/account_payment_sale/i18n/pt_BR.po +++ b/account_payment_sale/i18n/pt_BR.po @@ -1,27 +1,34 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_payment_sale -# +# * account_payment_sale +# +# Translators: +# OCA Transbot , 2016 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-31 23:00+0000\n" -"PO-Revision-Date: 2014-10-31 23:00+0000\n" -"Last-Translator: Danimar Ribeiro \n" -"Language-Team: \n" +"POT-Creation-Date: 2016-07-01 19:28+0000\n" +"PO-Revision-Date: 2016-07-01 19:28+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: account_payment_sale -#: field:sale.order,payment_mode_id:0 +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id msgid "Payment Mode" msgstr "Modo de Pagamento" +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" + #. module: account_payment_sale #: model:ir.model,name:account_payment_sale.model_sale_order msgid "Sales Order" msgstr "Pedido de Venda" - diff --git a/account_payment_sale/i18n/sl.po b/account_payment_sale/i18n/sl.po new file mode 100644 index 000000000..41885fb3f --- /dev/null +++ b/account_payment_sale/i18n/sl.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-07-01 19:28+0000\n" +"PO-Revision-Date: 2016-07-01 19:28+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id +msgid "Payment Mode" +msgstr "Metoda plačila" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Plačilni nalog" From 8cc9a66ee1eb91df323984fffb37eea6431f90cc Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 6 Oct 2016 14:47:39 +0200 Subject: [PATCH 31/36] [MIG] Make modules uninstallable --- account_payment_sale/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_payment_sale/__openerp__.py b/account_payment_sale/__openerp__.py index 09a9f10d9..adf320b1d 100644 --- a/account_payment_sale/__openerp__.py +++ b/account_payment_sale/__openerp__.py @@ -21,6 +21,6 @@ 'data': [ 'views/sale_order_view.xml', ], - 'installable': True, + 'installable': False, 'auto_install': True, } From cdbcf5136590ad81cee3f9e92d93f83bbd62da58 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 6 Oct 2016 14:47:44 +0200 Subject: [PATCH 32/36] [MIG] Rename manifest files --- account_payment_sale/{__openerp__.py => __manifest__.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename account_payment_sale/{__openerp__.py => __manifest__.py} (100%) diff --git a/account_payment_sale/__openerp__.py b/account_payment_sale/__manifest__.py similarity index 100% rename from account_payment_sale/__openerp__.py rename to account_payment_sale/__manifest__.py From 35c343dd37c2bc6fadef7473ac89e8c3987d5b90 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Thu, 20 Oct 2016 01:41:41 +0200 Subject: [PATCH 33/36] Port almost all modules to v10 (#305) Port almost all modules to v10 * Update to EPC Rulebook v9.2 that start to apply on 2016-11-20 (bug #300) --- account_payment_sale/__manifest__.py | 8 ++--- account_payment_sale/i18n/ca.po | 33 ++++++++++++++++++ account_payment_sale/i18n/da_DK.po | 33 ++++++++++++++++++ account_payment_sale/i18n/de.po | 4 +-- account_payment_sale/i18n/es.po | 12 +++---- account_payment_sale/i18n/nl_NL.po | 34 +++++++++++++++++++ account_payment_sale/models/sale_order.py | 2 +- .../views/sale_order_view.xml | 14 ++++---- .../wizard/sale_make_invoice_advance.py | 2 +- 9 files changed, 120 insertions(+), 22 deletions(-) create mode 100644 account_payment_sale/i18n/ca.po create mode 100644 account_payment_sale/i18n/da_DK.po create mode 100644 account_payment_sale/i18n/nl_NL.po diff --git a/account_payment_sale/__manifest__.py b/account_payment_sale/__manifest__.py index adf320b1d..c2b3ee8af 100644 --- a/account_payment_sale/__manifest__.py +++ b/account_payment_sale/__manifest__.py @@ -5,22 +5,22 @@ { 'name': 'Account Payment Sale', - 'version': '9.0.1.0.0', + 'version': '10.0.1.0.0', 'category': 'Banking addons', 'license': 'AGPL-3', 'summary': "Adds payment mode on sale orders", 'author': "Akretion, " - "Serv. Tecnol. Avanzados - Pedro M. Baeza, " + "Tecnativa, " "Odoo Community Association (OCA)", 'website': 'https://github.com/OCA/bank-payment', 'depends': [ 'sale', - 'account_payment_partner' + 'account_payment_partner', ], 'conflicts': ['sale_payment'], 'data': [ 'views/sale_order_view.xml', ], - 'installable': False, + 'installable': True, 'auto_install': True, } diff --git a/account_payment_sale/i18n/ca.po b/account_payment_sale/i18n/ca.po new file mode 100644 index 000000000..ff9f9a6ef --- /dev/null +++ b/account_payment_sale/i18n/ca.po @@ -0,0 +1,33 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (10.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-08-18 00:42+0000\n" +"PO-Revision-Date: 2016-10-19 23:47+0000\n" +"Last-Translator: <>\n" +"Language-Team: Catalan (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id +msgid "Payment Mode" +msgstr "Mode de pagament" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "" diff --git a/account_payment_sale/i18n/da_DK.po b/account_payment_sale/i18n/da_DK.po new file mode 100644 index 000000000..c2269c35e --- /dev/null +++ b/account_payment_sale/i18n/da_DK.po @@ -0,0 +1,33 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (10.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-08-18 00:42+0000\n" +"PO-Revision-Date: 2016-10-19 23:47+0000\n" +"Last-Translator: <>\n" +"Language-Team: Danish (Denmark) (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/da_DK/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: da_DK\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id +msgid "Payment Mode" +msgstr "Betalingsform" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "" diff --git a/account_payment_sale/i18n/de.po b/account_payment_sale/i18n/de.po index 3dd3a06e1..e1c1ee956 100644 --- a/account_payment_sale/i18n/de.po +++ b/account_payment_sale/i18n/de.po @@ -1,14 +1,14 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * account_payment_sale -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: bank-payment (10.0)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-08 01:38+0000\n" -"PO-Revision-Date: 2017-12-07 19:29+0000\n" +"PO-Revision-Date: 2017-12-19 18:19+0200\n" "Last-Translator: OCA Transbot \n" "Language-Team: German (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/de/)\n" "MIME-Version: 1.0\n" diff --git a/account_payment_sale/i18n/es.po b/account_payment_sale/i18n/es.po index 9204f514a..0937de79b 100644 --- a/account_payment_sale/i18n/es.po +++ b/account_payment_sale/i18n/es.po @@ -6,12 +6,12 @@ # OCA Transbot , 2016 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: bank-payment (10.0)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-01 19:28+0000\n" -"PO-Revision-Date: 2016-07-01 19:28+0000\n" -"Last-Translator: OCA Transbot , 2016\n" -"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"POT-Creation-Date: 2016-12-24 00:21+0000\n" +"PO-Revision-Date: 2016-12-27 12:50+0000\n" +"Last-Translator: Pedro M. Baeza \n" +"Language-Team: Spanish (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -26,7 +26,7 @@ msgstr "Modo de pago" #. module: account_payment_sale #: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv msgid "Sales Advance Payment Invoice" -msgstr "" +msgstr "Ventas. Anticipo pago factura" #. module: account_payment_sale #: model:ir.model,name:account_payment_sale.model_sale_order diff --git a/account_payment_sale/i18n/nl_NL.po b/account_payment_sale/i18n/nl_NL.po new file mode 100644 index 000000000..51069b6f2 --- /dev/null +++ b/account_payment_sale/i18n/nl_NL.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_sale +# +# Translators: +# Peter Hageman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (10.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-08-18 00:42+0000\n" +"PO-Revision-Date: 2017-11-20 14:01+0000\n" +"Last-Translator: Peter Hageman \n" +"Language-Team: Dutch (Netherlands) (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_payment_sale +#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id +msgid "Payment Mode" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" + +#. module: account_payment_sale +#: model:ir.model,name:account_payment_sale.model_sale_order +msgid "Sales Order" +msgstr "Verkooporder" diff --git a/account_payment_sale/models/sale_order.py b/account_payment_sale/models/sale_order.py index 5581ea850..2335db5c3 100644 --- a/account_payment_sale/models/sale_order.py +++ b/account_payment_sale/models/sale_order.py @@ -2,7 +2,7 @@ # © 2014-2016 Akretion (Alexis de Lattre ) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp import models, fields, api +from odoo import models, fields, api class SaleOrder(models.Model): diff --git a/account_payment_sale/views/sale_order_view.xml b/account_payment_sale/views/sale_order_view.xml index c002971d1..005849e83 100644 --- a/account_payment_sale/views/sale_order_view.xml +++ b/account_payment_sale/views/sale_order_view.xml @@ -1,13 +1,11 @@ - - - + + account_payment_sale.sale_order.form @@ -22,5 +20,5 @@ - - + + diff --git a/account_payment_sale/wizard/sale_make_invoice_advance.py b/account_payment_sale/wizard/sale_make_invoice_advance.py index a962e49c5..376a10fa0 100644 --- a/account_payment_sale/wizard/sale_make_invoice_advance.py +++ b/account_payment_sale/wizard/sale_make_invoice_advance.py @@ -2,7 +2,7 @@ # © 2016 Akretion (Alexis de Lattre ) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp import models, api +from odoo import models, api class SaleAdvancePaymentInv(models.TransientModel): From 331ad9c954d1e6c77fa2ed6a46ea07a1517914d4 Mon Sep 17 00:00:00 2001 From: cubells Date: Thu, 30 Nov 2017 17:15:21 +0100 Subject: [PATCH 34/36] [IMP] account_payment_sale: add payment mode to sale report --- account_payment_sale/__manifest__.py | 3 ++- account_payment_sale/i18n/ca.po | 5 +++++ account_payment_sale/i18n/da_DK.po | 5 +++++ account_payment_sale/i18n/es.po | 14 ++++++++++---- account_payment_sale/i18n/fr.po | 5 +++++ account_payment_sale/i18n/nl_NL.po | 5 +++++ account_payment_sale/i18n/pt_BR.po | 5 +++++ account_payment_sale/i18n/sl.po | 5 +++++ .../views/sale_report_templates.xml | 13 +++++++++++++ 9 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 account_payment_sale/views/sale_report_templates.xml diff --git a/account_payment_sale/__manifest__.py b/account_payment_sale/__manifest__.py index c2b3ee8af..ecc25f3fc 100644 --- a/account_payment_sale/__manifest__.py +++ b/account_payment_sale/__manifest__.py @@ -5,7 +5,7 @@ { 'name': 'Account Payment Sale', - 'version': '10.0.1.0.0', + 'version': '10.0.1.1.0', 'category': 'Banking addons', 'license': 'AGPL-3', 'summary': "Adds payment mode on sale orders", @@ -20,6 +20,7 @@ 'conflicts': ['sale_payment'], 'data': [ 'views/sale_order_view.xml', + 'views/sale_report_templates.xml', ], 'installable': True, 'auto_install': True, diff --git a/account_payment_sale/i18n/ca.po b/account_payment_sale/i18n/ca.po index ff9f9a6ef..1e5167262 100644 --- a/account_payment_sale/i18n/ca.po +++ b/account_payment_sale/i18n/ca.po @@ -17,6 +17,11 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: account_payment_sale +#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "Mode de pagament:" + #. module: account_payment_sale #: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id msgid "Payment Mode" diff --git a/account_payment_sale/i18n/da_DK.po b/account_payment_sale/i18n/da_DK.po index c2269c35e..061573839 100644 --- a/account_payment_sale/i18n/da_DK.po +++ b/account_payment_sale/i18n/da_DK.po @@ -17,6 +17,11 @@ msgstr "" "Language: da_DK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: account_payment_sale +#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "" + #. module: account_payment_sale #: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id msgid "Payment Mode" diff --git a/account_payment_sale/i18n/es.po b/account_payment_sale/i18n/es.po index 0937de79b..914dff763 100644 --- a/account_payment_sale/i18n/es.po +++ b/account_payment_sale/i18n/es.po @@ -1,23 +1,29 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * account_payment_sale -# +# # Translators: # OCA Transbot , 2016 msgid "" msgstr "" "Project-Id-Version: bank-payment (10.0)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-24 00:21+0000\n" +"POT-Creation-Date: 2017-11-30 16:09+0000\n" "PO-Revision-Date: 2016-12-27 12:50+0000\n" "Last-Translator: Pedro M. Baeza \n" -"Language-Team: Spanish (http://www.transifex.com/oca/OCA-bank-payment-10-0/language/es/)\n" +"Language-Team: Spanish (http://www.transifex.com/oca/OCA-bank-payment-10-0/" +"language/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: account_payment_sale +#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "Modo de pago:" + #. module: account_payment_sale #: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id msgid "Payment Mode" diff --git a/account_payment_sale/i18n/fr.po b/account_payment_sale/i18n/fr.po index f5115596a..616d09fa3 100644 --- a/account_payment_sale/i18n/fr.po +++ b/account_payment_sale/i18n/fr.po @@ -18,6 +18,11 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#. module: account_payment_sale +#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "" + #. module: account_payment_sale #: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id msgid "Payment Mode" diff --git a/account_payment_sale/i18n/nl_NL.po b/account_payment_sale/i18n/nl_NL.po index 51069b6f2..e176fe415 100644 --- a/account_payment_sale/i18n/nl_NL.po +++ b/account_payment_sale/i18n/nl_NL.po @@ -18,6 +18,11 @@ msgstr "" "Language: nl_NL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: account_payment_sale +#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "" + #. module: account_payment_sale #: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id msgid "Payment Mode" diff --git a/account_payment_sale/i18n/pt_BR.po b/account_payment_sale/i18n/pt_BR.po index 81af53d0e..9d012c1d1 100644 --- a/account_payment_sale/i18n/pt_BR.po +++ b/account_payment_sale/i18n/pt_BR.po @@ -18,6 +18,11 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#. module: account_payment_sale +#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "" + #. module: account_payment_sale #: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id msgid "Payment Mode" diff --git a/account_payment_sale/i18n/sl.po b/account_payment_sale/i18n/sl.po index 41885fb3f..4fdac894b 100644 --- a/account_payment_sale/i18n/sl.po +++ b/account_payment_sale/i18n/sl.po @@ -18,6 +18,11 @@ msgstr "" "Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +#. module: account_payment_sale +#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode +msgid "Payment Mode:" +msgstr "" + #. module: account_payment_sale #: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id msgid "Payment Mode" diff --git a/account_payment_sale/views/sale_report_templates.xml b/account_payment_sale/views/sale_report_templates.xml new file mode 100644 index 000000000..3e1609234 --- /dev/null +++ b/account_payment_sale/views/sale_report_templates.xml @@ -0,0 +1,13 @@ + + + + + + From 2f7a69c49229aee992b9113114fe0de9106e7cfd Mon Sep 17 00:00:00 2001 From: Artem Kostyuk Date: Tue, 19 Dec 2017 17:45:19 +0200 Subject: [PATCH 35/36] [MIG] account_payment_sale: Migrate to 11.0 --- account_payment_sale/README.rst | 11 +++------- account_payment_sale/__init__.py | 2 -- account_payment_sale/__manifest__.py | 7 ++---- account_payment_sale/models/__init__.py | 2 -- account_payment_sale/models/sale_order.py | 22 ++++++++++--------- .../views/sale_report_templates.xml | 2 +- account_payment_sale/wizard/__init__.py | 2 -- .../wizard/sale_make_invoice_advance.py | 13 +++-------- 8 files changed, 21 insertions(+), 40 deletions(-) diff --git a/account_payment_sale/README.rst b/account_payment_sale/README.rst index 383837d56..7832cea6c 100644 --- a/account_payment_sale/README.rst +++ b/account_payment_sale/README.rst @@ -33,17 +33,12 @@ Usage ===== You are able to add a payment mode directly on a partner. -This payment mode is automatically associated to the sale order, then on related invoice. -This default value could be change in a draft sale order or draft invoice. +This payment mode is automatically associated to the sale order, then on related invoice. +This default value can be changed in a draft sale order or draft invoice. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/173/9.0 - -Known issues / Roadmap -====================== - - * No known issues. + :target: https://runbot.odoo-community.org/runbot/173/11.0 Bug Tracker =========== diff --git a/account_payment_sale/__init__.py b/account_payment_sale/__init__.py index 35e7c9600..9b4296142 100644 --- a/account_payment_sale/__init__.py +++ b/account_payment_sale/__init__.py @@ -1,4 +1,2 @@ -# -*- coding: utf-8 -*- - from . import models from . import wizard diff --git a/account_payment_sale/__manifest__.py b/account_payment_sale/__manifest__.py index ecc25f3fc..bc8340864 100644 --- a/account_payment_sale/__manifest__.py +++ b/account_payment_sale/__manifest__.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- -# © 2014-2016 Akretion (http://www.akretion.com) +# Copyright 2014-2016 Akretion (http://www.akretion.com) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # @author Alexis de Lattre { 'name': 'Account Payment Sale', - 'version': '10.0.1.1.0', + 'version': '11.0.1.0.0', 'category': 'Banking addons', 'license': 'AGPL-3', 'summary': "Adds payment mode on sale orders", @@ -17,11 +16,9 @@ 'sale', 'account_payment_partner', ], - 'conflicts': ['sale_payment'], 'data': [ 'views/sale_order_view.xml', 'views/sale_report_templates.xml', ], - 'installable': True, 'auto_install': True, } diff --git a/account_payment_sale/models/__init__.py b/account_payment_sale/models/__init__.py index 6064afee1..6aacb7531 100644 --- a/account_payment_sale/models/__init__.py +++ b/account_payment_sale/models/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import sale_order diff --git a/account_payment_sale/models/sale_order.py b/account_payment_sale/models/sale_order.py index 2335db5c3..900c3f302 100644 --- a/account_payment_sale/models/sale_order.py +++ b/account_payment_sale/models/sale_order.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# © 2014-2016 Akretion (Alexis de Lattre ) +# Copyright 2014-2016 Akretion - Alexis de Lattre # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import models, fields, api @@ -12,9 +11,17 @@ class SaleOrder(models.Model): 'account.payment.mode', string='Payment Mode', domain=[('payment_type', '=', 'inbound')]) + def _get_payment_mode_vals(self, vals): + if self.payment_mode_id: + vals['payment_mode_id'] = self.payment_mode_id.id + if self.payment_mode_id.bank_account_link == 'fixed': + vals['partner_bank_id'] =\ + self.payment_mode_id.fixed_journal_id.bank_account_id.id + return vals + @api.onchange('partner_id') def onchange_partner_id(self): - res = super(SaleOrder, self).onchange_partner_id() + res = super().onchange_partner_id() if self.partner_id: self.payment_mode_id = self.partner_id.customer_payment_mode_id else: @@ -24,10 +31,5 @@ class SaleOrder(models.Model): @api.multi def _prepare_invoice(self): """Copy bank partner from sale order to invoice""" - vals = super(SaleOrder, self)._prepare_invoice() - if self.payment_mode_id: - vals['payment_mode_id'] = self.payment_mode_id.id - if self.payment_mode_id.bank_account_link == 'fixed': - vals['partner_bank_id'] =\ - self.payment_mode_id.fixed_journal_id.bank_account_id.id - return vals + vals = super()._prepare_invoice() + return self._get_payment_mode_vals(vals) diff --git a/account_payment_sale/views/sale_report_templates.xml b/account_payment_sale/views/sale_report_templates.xml index 3e1609234..183d06e93 100644 --- a/account_payment_sale/views/sale_report_templates.xml +++ b/account_payment_sale/views/sale_report_templates.xml @@ -3,7 +3,7 @@