From 564ed609873674d005684a238e769d421a4f3b07 Mon Sep 17 00:00:00 2001 From: jesusVMayor Date: Thu, 4 Aug 2016 10:36:44 +0200 Subject: [PATCH 1/3] account_payment_purchase: set correctly payment mode in purchases created from procurement. --- .../models/procurement_order.py | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 account_payment_purchase/models/procurement_order.py diff --git a/account_payment_purchase/models/procurement_order.py b/account_payment_purchase/models/procurement_order.py new file mode 100644 index 000000000..2e685323e --- /dev/null +++ b/account_payment_purchase/models/procurement_order.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# (c) 2015 Serv. Tecnol. Avanzados - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from openerp import api, models + + +class ProcurementOrder(models.Model): + _inherit = "procurement.order" + + @api.model + def create_procurement_purchase_order(self, procurement, po_vals, + line_vals): + """Propagate payment mode on MTO/drop shipping.""" + if po_vals.get('partner_id'): + partner = self.env['res.partner'].browse(po_vals['partner_id']) + po_vals['payment_mode_id'] = partner.with_context( + force_company=procurement.company_id.id).\ + supplier_payment_mode.id + po_vals['supplier_partner_bank_id'] = ( + self.env['purchase.order']._get_default_supplier_partner_bank( + partner)) + return super(ProcurementOrder, self).create_procurement_purchase_order( + procurement, po_vals, line_vals) From e1e9290a41546c59b74da33e631fdaa2c35cf9aa Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 20 Aug 2016 00:57:59 -0400 Subject: [PATCH 2/3] OCA Transbot updated translations from Transifex --- account_payment_purchase/i18n/es_MX.po | 51 ++++++++++++++++++++++++++ account_payment_purchase/i18n/fi.po | 51 ++++++++++++++++++++++++++ account_payment_purchase/i18n/fr_FR.po | 51 ++++++++++++++++++++++++++ account_payment_purchase/i18n/hr.po | 51 ++++++++++++++++++++++++++ account_payment_purchase/i18n/it.po | 51 ++++++++++++++++++++++++++ account_payment_purchase/i18n/pt_PT.po | 51 ++++++++++++++++++++++++++ account_payment_purchase/i18n/tr.po | 51 ++++++++++++++++++++++++++ account_payment_purchase/i18n/tr_TR.po | 51 ++++++++++++++++++++++++++ 8 files changed, 408 insertions(+) create mode 100644 account_payment_purchase/i18n/es_MX.po create mode 100644 account_payment_purchase/i18n/fi.po create mode 100644 account_payment_purchase/i18n/fr_FR.po create mode 100644 account_payment_purchase/i18n/hr.po create mode 100644 account_payment_purchase/i18n/it.po create mode 100644 account_payment_purchase/i18n/pt_PT.po create mode 100644 account_payment_purchase/i18n/tr.po create mode 100644 account_payment_purchase/i18n/tr_TR.po diff --git a/account_payment_purchase/i18n/es_MX.po b/account_payment_purchase/i18n/es_MX.po new file mode 100644 index 000000000..97e9e2e9d --- /dev/null +++ b/account_payment_purchase/i18n/es_MX.po @@ -0,0 +1,51 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-01 18:13+0000\n" +"PO-Revision-Date: 2016-04-06 00:16+0000\n" +"Last-Translator: <>\n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/es_MX/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_payment_purchase +#: field:purchase.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_stock_picking +msgid "Picking List" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_procurement_order +msgid "Procurement" +msgstr "Contratación" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_purchase_order +msgid "Purchase Order" +msgstr "" + +#. module: account_payment_purchase +#: help:purchase.order,supplier_partner_bank_id:0 +msgid "" +"Select the bank account of your supplier on which your company should send " +"the payment. This field is copied from the partner and will be copied to the" +" supplier invoice." +msgstr "" + +#. module: account_payment_purchase +#: field:purchase.order,supplier_partner_bank_id:0 +msgid "Supplier Bank Account" +msgstr "" diff --git a/account_payment_purchase/i18n/fi.po b/account_payment_purchase/i18n/fi.po new file mode 100644 index 000000000..37b89e03d --- /dev/null +++ b/account_payment_purchase/i18n/fi.po @@ -0,0 +1,51 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-03-03 11:43+0000\n" +"PO-Revision-Date: 2016-04-06 00:16+0000\n" +"Last-Translator: <>\n" +"Language-Team: Finnish (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/fi/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_payment_purchase +#: field:purchase.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Maksutapa" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_stock_picking +msgid "Picking List" +msgstr "Keräilylista" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_procurement_order +msgid "Procurement" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_purchase_order +msgid "Purchase Order" +msgstr "Ostotilaus" + +#. module: account_payment_purchase +#: help:purchase.order,supplier_partner_bank_id:0 +msgid "" +"Select the bank account of your supplier on which your company should send " +"the payment. This field is copied from the partner and will be copied to the" +" supplier invoice." +msgstr "" + +#. module: account_payment_purchase +#: field:purchase.order,supplier_partner_bank_id:0 +msgid "Supplier Bank Account" +msgstr "" diff --git a/account_payment_purchase/i18n/fr_FR.po b/account_payment_purchase/i18n/fr_FR.po new file mode 100644 index 000000000..ac6fd345f --- /dev/null +++ b/account_payment_purchase/i18n/fr_FR.po @@ -0,0 +1,51 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-21 01:10+0000\n" +"PO-Revision-Date: 2016-04-06 00:16+0000\n" +"Last-Translator: <>\n" +"Language-Team: French (France) (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/fr_FR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr_FR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: account_payment_purchase +#: field:purchase.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_stock_picking +msgid "Picking List" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_procurement_order +msgid "Procurement" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_purchase_order +msgid "Purchase Order" +msgstr "Bon de commande" + +#. module: account_payment_purchase +#: help:purchase.order,supplier_partner_bank_id:0 +msgid "" +"Select the bank account of your supplier on which your company should send " +"the payment. This field is copied from the partner and will be copied to the" +" supplier invoice." +msgstr "" + +#. module: account_payment_purchase +#: field:purchase.order,supplier_partner_bank_id:0 +msgid "Supplier Bank Account" +msgstr "" diff --git a/account_payment_purchase/i18n/hr.po b/account_payment_purchase/i18n/hr.po new file mode 100644 index 000000000..30635dfed --- /dev/null +++ b/account_payment_purchase/i18n/hr.po @@ -0,0 +1,51 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-09-21 10:50+0000\n" +"PO-Revision-Date: 2016-04-06 00:16+0000\n" +"Last-Translator: <>\n" +"Language-Team: Croatian (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: account_payment_purchase +#: field:purchase.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_stock_picking +msgid "Picking List" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_procurement_order +msgid "Procurement" +msgstr "Nabava" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_purchase_order +msgid "Purchase Order" +msgstr "" + +#. module: account_payment_purchase +#: help:purchase.order,supplier_partner_bank_id:0 +msgid "" +"Select the bank account of your supplier on which your company should send " +"the payment. This field is copied from the partner and will be copied to the" +" supplier invoice." +msgstr "" + +#. module: account_payment_purchase +#: field:purchase.order,supplier_partner_bank_id:0 +msgid "Supplier Bank Account" +msgstr "" diff --git a/account_payment_purchase/i18n/it.po b/account_payment_purchase/i18n/it.po new file mode 100644 index 000000000..bdb4f7703 --- /dev/null +++ b/account_payment_purchase/i18n/it.po @@ -0,0 +1,51 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-09-21 10:50+0000\n" +"PO-Revision-Date: 2016-04-06 00:16+0000\n" +"Last-Translator: <>\n" +"Language-Team: Italian (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_payment_purchase +#: field:purchase.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Modo di pagamento" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_stock_picking +msgid "Picking List" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_procurement_order +msgid "Procurement" +msgstr "Approvvigionamento" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_purchase_order +msgid "Purchase Order" +msgstr "" + +#. module: account_payment_purchase +#: help:purchase.order,supplier_partner_bank_id:0 +msgid "" +"Select the bank account of your supplier on which your company should send " +"the payment. This field is copied from the partner and will be copied to the" +" supplier invoice." +msgstr "" + +#. module: account_payment_purchase +#: field:purchase.order,supplier_partner_bank_id:0 +msgid "Supplier Bank Account" +msgstr "" diff --git a/account_payment_purchase/i18n/pt_PT.po b/account_payment_purchase/i18n/pt_PT.po new file mode 100644 index 000000000..dbfa579db --- /dev/null +++ b/account_payment_purchase/i18n/pt_PT.po @@ -0,0 +1,51 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-31 01:24+0000\n" +"PO-Revision-Date: 2016-04-06 00:16+0000\n" +"Last-Translator: <>\n" +"Language-Team: Portuguese (Portugal) (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/pt_PT/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: pt_PT\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: account_payment_purchase +#: field:purchase.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_stock_picking +msgid "Picking List" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_procurement_order +msgid "Procurement" +msgstr "Aquisições" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_purchase_order +msgid "Purchase Order" +msgstr "" + +#. module: account_payment_purchase +#: help:purchase.order,supplier_partner_bank_id:0 +msgid "" +"Select the bank account of your supplier on which your company should send " +"the payment. This field is copied from the partner and will be copied to the" +" supplier invoice." +msgstr "" + +#. module: account_payment_purchase +#: field:purchase.order,supplier_partner_bank_id:0 +msgid "Supplier Bank Account" +msgstr "" diff --git a/account_payment_purchase/i18n/tr.po b/account_payment_purchase/i18n/tr.po new file mode 100644 index 000000000..a8c9bdabb --- /dev/null +++ b/account_payment_purchase/i18n/tr.po @@ -0,0 +1,51 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-31 01:24+0000\n" +"PO-Revision-Date: 2016-04-06 00:16+0000\n" +"Last-Translator: <>\n" +"Language-Team: Turkish (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/tr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: tr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: account_payment_purchase +#: field:purchase.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_stock_picking +msgid "Picking List" +msgstr "Toplama Listesi" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_procurement_order +msgid "Procurement" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_purchase_order +msgid "Purchase Order" +msgstr "" + +#. module: account_payment_purchase +#: help:purchase.order,supplier_partner_bank_id:0 +msgid "" +"Select the bank account of your supplier on which your company should send " +"the payment. This field is copied from the partner and will be copied to the" +" supplier invoice." +msgstr "" + +#. module: account_payment_purchase +#: field:purchase.order,supplier_partner_bank_id:0 +msgid "Supplier Bank Account" +msgstr "" diff --git a/account_payment_purchase/i18n/tr_TR.po b/account_payment_purchase/i18n/tr_TR.po new file mode 100644 index 000000000..59d1d68ed --- /dev/null +++ b/account_payment_purchase/i18n/tr_TR.po @@ -0,0 +1,51 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-31 01:24+0000\n" +"PO-Revision-Date: 2016-04-06 00:16+0000\n" +"Last-Translator: <>\n" +"Language-Team: Turkish (Turkey) (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/tr_TR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: tr_TR\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. module: account_payment_purchase +#: field:purchase.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_stock_picking +msgid "Picking List" +msgstr "Seçim listesi" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_procurement_order +msgid "Procurement" +msgstr "Satın alma" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_purchase_order +msgid "Purchase Order" +msgstr "" + +#. module: account_payment_purchase +#: help:purchase.order,supplier_partner_bank_id:0 +msgid "" +"Select the bank account of your supplier on which your company should send " +"the payment. This field is copied from the partner and will be copied to the" +" supplier invoice." +msgstr "" + +#. module: account_payment_purchase +#: field:purchase.order,supplier_partner_bank_id:0 +msgid "Supplier Bank Account" +msgstr "" From 4066f4028a50dc9164c70d88706b4377439a9948 Mon Sep 17 00:00:00 2001 From: cubells Date: Mon, 10 Apr 2017 18:35:20 +0200 Subject: [PATCH 3/3] [9.0][MIG] account_payment_purchase module --- account_payment_purchase/README.rst | 89 +++++++++++ account_payment_purchase/__init__.py | 5 + account_payment_purchase/__openerp__.py | 25 +++ account_payment_purchase/i18n/de.po | 51 ++++++ account_payment_purchase/i18n/es.po | 64 ++++++++ account_payment_purchase/i18n/fr.po | 51 ++++++ account_payment_purchase/i18n/it.po | 6 +- account_payment_purchase/i18n/nl.po | 49 ++++++ account_payment_purchase/i18n/pt_BR.po | 52 ++++++ account_payment_purchase/i18n/sl.po | 52 ++++++ account_payment_purchase/i18n/zh_CN.po | 51 ++++++ account_payment_purchase/models/__init__.py | 7 + .../models/account_invoice.py | 32 ++++ .../models/procurement_order.py | 21 ++- .../models/purchase_order.py | 40 +++++ .../static/description/icon.png | Bin 0 -> 9455 bytes account_payment_purchase/tests/__init__.py | 5 + .../tests/test_account_payment_purchase.py | 148 ++++++++++++++++++ .../views/purchase_order_view.xml | 21 +++ 19 files changed, 754 insertions(+), 15 deletions(-) create mode 100644 account_payment_purchase/README.rst create mode 100644 account_payment_purchase/__init__.py create mode 100644 account_payment_purchase/__openerp__.py create mode 100644 account_payment_purchase/i18n/de.po create mode 100644 account_payment_purchase/i18n/es.po create mode 100644 account_payment_purchase/i18n/fr.po create mode 100644 account_payment_purchase/i18n/nl.po create mode 100644 account_payment_purchase/i18n/pt_BR.po create mode 100644 account_payment_purchase/i18n/sl.po create mode 100644 account_payment_purchase/i18n/zh_CN.po create mode 100644 account_payment_purchase/models/__init__.py create mode 100644 account_payment_purchase/models/account_invoice.py create mode 100644 account_payment_purchase/models/purchase_order.py create mode 100644 account_payment_purchase/static/description/icon.png create mode 100644 account_payment_purchase/tests/__init__.py create mode 100644 account_payment_purchase/tests/test_account_payment_purchase.py create mode 100644 account_payment_purchase/views/purchase_order_view.xml diff --git a/account_payment_purchase/README.rst b/account_payment_purchase/README.rst new file mode 100644 index 000000000..b5f403209 --- /dev/null +++ b/account_payment_purchase/README.rst @@ -0,0 +1,89 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +======================== +Account Payment Purchase +======================== + +This module adds 2 fields on purchase orders: *Bank Account* and *Payment +Mode*. These fields are copied from partner to purchase order and then from +purchase order to supplier invoice. + +This module is similar to the *purchase_payment* module; the main difference +is that it doesn't depend on the *account_payment_extension* module (it's not +the only module to conflict with *account_payment_extension*; all the SEPA +modules in the banking addons conflict with *account_payment_extension*). + +Installation +============ + +This module depends on : +- purchase +- account_payment_partner + +This module is part 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 purchase order, then on +related invoice. +This default value could be change in a draft purchase or draft invoice. +When you create a payment order, only invoices related to chosen payment mode +are displayed. +Invoices without any payment mode are displayed too. + + +This module doesn't add any feature, but it is used by several other modules. + +.. 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. + +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. + +Credits +======= + +Contributors +------------ + +* Pedro M. Baeza +* Alexis de Lattre +* Alexandre Fayolle +* Danimar Ribeiro +* Raphaël Valyi +* Vicent Cubells + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://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 https://odoo-community.org. diff --git a/account_payment_purchase/__init__.py b/account_payment_purchase/__init__.py new file mode 100644 index 000000000..59f15b0fb --- /dev/null +++ b/account_payment_purchase/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Akretion (). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import models diff --git a/account_payment_purchase/__openerp__.py b/account_payment_purchase/__openerp__.py new file mode 100644 index 000000000..089a02898 --- /dev/null +++ b/account_payment_purchase/__openerp__.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Akretion (). +# Copyright 2017 Tecnativa - Vicent Cubells +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + 'name': 'Account Payment Purchase', + 'version': '9.0.1.0.0', + 'category': 'Banking addons', + 'license': 'AGPL-3', + 'summary': "Adds Bank Account and Payment Mode on Purchase Orders", + 'author': "Akretion, " + "Tecnativa, " + "Odoo Community Association (OCA)", + 'website': 'http://www.akretion.com', + 'depends': [ + 'purchase', + 'account_payment_partner' + ], + 'data': [ + 'views/purchase_order_view.xml', + ], + 'installable': True, + 'auto_install': True, +} diff --git a/account_payment_purchase/i18n/de.po b/account_payment_purchase/i18n/de.po new file mode 100644 index 000000000..8a82c851b --- /dev/null +++ b/account_payment_purchase/i18n/de.po @@ -0,0 +1,51 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-10 17:00+0000\n" +"PO-Revision-Date: 2016-04-06 00:16+0000\n" +"Last-Translator: <>\n" +"Language-Team: German (http://www.transifex.com/oca/OCA-bank-payment-8-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_purchase +#: field:purchase.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Zahlweise" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_stock_picking +msgid "Picking List" +msgstr "Pickliste" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_procurement_order +msgid "Procurement" +msgstr "Beschaffung" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_purchase_order +msgid "Purchase Order" +msgstr "Bestellauftrag" + +#. module: account_payment_purchase +#: help:purchase.order,supplier_partner_bank_id:0 +msgid "" +"Select the bank account of your supplier on which your company should send " +"the payment. This field is copied from the partner and will be copied to the" +" supplier invoice." +msgstr "" + +#. module: account_payment_purchase +#: field:purchase.order,supplier_partner_bank_id:0 +msgid "Supplier Bank Account" +msgstr "" diff --git a/account_payment_purchase/i18n/es.po b/account_payment_purchase/i18n/es.po new file mode 100644 index 000000000..4c48a59ed --- /dev/null +++ b/account_payment_purchase/i18n/es.po @@ -0,0 +1,64 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-11-20 00:07+0000\n" +"PO-Revision-Date: 2016-10-14 01:51+0000\n" +"Last-Translator: OCA Transbot \n" +"Language-Team: Spanish (http://www.transifex.com/oca/OCA-bank-payment-8-0/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_purchase +#: field:purchase.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Modo de pago" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_stock_picking +msgid "Picking List" +msgstr "Albarán" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_procurement_order +msgid "Procurement" +msgstr "Abastecimiento" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_purchase_order +msgid "Purchase Order" +msgstr "Pedido de compra" + +#. module: account_payment_purchase +#: help:purchase.order,supplier_partner_bank_id:0 +msgid "" +"Select the bank account of your supplier on which your company should send " +"the payment. This field is copied from the partner and will be copied to the" +" supplier invoice." +msgstr "Seleccione la cuenta bancaria de su proveedor a la que la compañía debe enviar el pago. Este campo se copia del proveedor si está rellenado, y se trasladará a la factura de proveedor." + +#. module: account_payment_purchase +#: field:purchase.order,supplier_partner_bank_id:0 +msgid "Supplier Bank Account" +msgstr "Cuenta bancaria del proveedor" + +#. module: account_payment_purchase +#: code:addons/account_payment_purchase/models/account_invoice.py:22 +#, python-format +msgid "Selected purchase order have different payment mode." +msgstr "El pedido de compra tiene diferente modo de pago." + +#. module: account_payment_purchase +#: code:addons/account_payment_purchase/models/account_invoice.py:29 +#, python-format +msgid "Selected purchase order have different supplier bank." +msgstr "El pedido de compra tiene diferente banco de proveedor." + diff --git a/account_payment_purchase/i18n/fr.po b/account_payment_purchase/i18n/fr.po new file mode 100644 index 000000000..6a3d075ac --- /dev/null +++ b/account_payment_purchase/i18n/fr.po @@ -0,0 +1,51 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-10 17:00+0000\n" +"PO-Revision-Date: 2016-12-23 11:34+0000\n" +"Last-Translator: OCA Transbot \n" +"Language-Team: French (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/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_purchase +#: field:purchase.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Mode de paiement" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_stock_picking +msgid "Picking List" +msgstr "Bon de livraison" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_procurement_order +msgid "Procurement" +msgstr "Procurement" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_purchase_order +msgid "Purchase Order" +msgstr "Bon de commande" + +#. module: account_payment_purchase +#: help:purchase.order,supplier_partner_bank_id:0 +msgid "" +"Select the bank account of your supplier on which your company should send " +"the payment. This field is copied from the partner and will be copied to the" +" supplier invoice." +msgstr "Selectionnez le compte bancaire du fournisseur sur lequel votre société devra effectuer le règlement. Ce champ est copié depuis le partenaire et sera recopié sur la facture fournisseur." + +#. module: account_payment_purchase +#: field:purchase.order,supplier_partner_bank_id:0 +msgid "Supplier Bank Account" +msgstr "Compte bancaire du fournisseur" diff --git a/account_payment_purchase/i18n/it.po b/account_payment_purchase/i18n/it.po index bdb4f7703..850d2a07f 100644 --- a/account_payment_purchase/i18n/it.po +++ b/account_payment_purchase/i18n/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bank-payment (8.0)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-21 10:50+0000\n" +"POT-Creation-Date: 2016-11-20 00:07+0000\n" "PO-Revision-Date: 2016-04-06 00:16+0000\n" "Last-Translator: <>\n" "Language-Team: Italian (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/it/)\n" @@ -25,7 +25,7 @@ msgstr "Modo di pagamento" #. module: account_payment_purchase #: model:ir.model,name:account_payment_purchase.model_stock_picking msgid "Picking List" -msgstr "" +msgstr "Lista Picking" #. module: account_payment_purchase #: model:ir.model,name:account_payment_purchase.model_procurement_order @@ -35,7 +35,7 @@ msgstr "Approvvigionamento" #. module: account_payment_purchase #: model:ir.model,name:account_payment_purchase.model_purchase_order msgid "Purchase Order" -msgstr "" +msgstr "Ordine Acquisto" #. module: account_payment_purchase #: help:purchase.order,supplier_partner_bank_id:0 diff --git a/account_payment_purchase/i18n/nl.po b/account_payment_purchase/i18n/nl.po new file mode 100644 index 000000000..07115b8af --- /dev/null +++ b/account_payment_purchase/i18n/nl.po @@ -0,0 +1,49 @@ +# 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:23+0000\n" +"PO-Revision-Date: 2014-06-26 14:15+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_purchase +#: field:purchase.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Betaalwijze" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_stock_picking +msgid "Picking List" +msgstr "Verzamellijst" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_purchase_order +msgid "Purchase Order" +msgstr "Inkooporder" + +#. module: account_payment_purchase +#: help:purchase.order,supplier_partner_bank_id:0 +msgid "" +"Select the bank account of your supplier on which your company should send " +"the payment. This field is copied from the partner and will be copied to the " +"supplier invoice." +msgstr "" +"Selecteer de bankrekening van de leverancier waarop uw bedrijf de betaling " +"moet sturen. Dit veld wordt gekopieerd van de leverancier en wordt " +"gekopieerd naar de inkoopfactuur." + +#. module: account_payment_purchase +#: field:purchase.order,supplier_partner_bank_id:0 +msgid "Supplier Bank Account" +msgstr "Bankrekening leverancier" diff --git a/account_payment_purchase/i18n/pt_BR.po b/account_payment_purchase/i18n/pt_BR.po new file mode 100644 index 000000000..1241e9a20 --- /dev/null +++ b/account_payment_purchase/i18n/pt_BR.po @@ -0,0 +1,52 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase +# +# Translators: +# danimaribeiro , 2016 +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-04-08 00:46+0000\n" +"PO-Revision-Date: 2016-04-06 01:03+0000\n" +"Last-Translator: danimaribeiro \n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/pt_BR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: account_payment_purchase +#: field:purchase.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Modo de Pagamento" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_stock_picking +msgid "Picking List" +msgstr "Lista de Separação" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_procurement_order +msgid "Procurement" +msgstr "Aquisição" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_purchase_order +msgid "Purchase Order" +msgstr "Pedido de Compra" + +#. module: account_payment_purchase +#: help:purchase.order,supplier_partner_bank_id:0 +msgid "" +"Select the bank account of your supplier on which your company should send " +"the payment. This field is copied from the partner and will be copied to the" +" supplier invoice." +msgstr "Selecione a conta bancária do seu fornecedor para a qual sua empresa deve mandar o pagamento. Este campo é copiado do parceiro e será copiado para a fatura do fornecedor." + +#. module: account_payment_purchase +#: field:purchase.order,supplier_partner_bank_id:0 +msgid "Supplier Bank Account" +msgstr "Conta Bancária do Fornecedor" diff --git a/account_payment_purchase/i18n/sl.po b/account_payment_purchase/i18n/sl.po new file mode 100644 index 000000000..f3b0b47dd --- /dev/null +++ b/account_payment_purchase/i18n/sl.po @@ -0,0 +1,52 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase +# +# Translators: +# Matjaž Mozetič , 2016 +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-04-08 00:46+0000\n" +"PO-Revision-Date: 2016-04-08 05:50+0000\n" +"Last-Translator: Matjaž Mozetič \n" +"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/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_purchase +#: field:purchase.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Metoda plačila" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_stock_picking +msgid "Picking List" +msgstr "Zbirni seznam" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_procurement_order +msgid "Procurement" +msgstr "Oskrba" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_purchase_order +msgid "Purchase Order" +msgstr "Nabavni nalog" + +#. module: account_payment_purchase +#: help:purchase.order,supplier_partner_bank_id:0 +msgid "" +"Select the bank account of your supplier on which your company should send " +"the payment. This field is copied from the partner and will be copied to the" +" supplier invoice." +msgstr "Izberite bančni račun dobavitelja, na katerega bo vaša družba izvedla nakazilo. To polje se kopira iz partnerja in bo kopirano na prejeti račun." + +#. module: account_payment_purchase +#: field:purchase.order,supplier_partner_bank_id:0 +msgid "Supplier Bank Account" +msgstr "Bančni račun dobavitelja" diff --git a/account_payment_purchase/i18n/zh_CN.po b/account_payment_purchase/i18n/zh_CN.po new file mode 100644 index 000000000..ed9bafe26 --- /dev/null +++ b/account_payment_purchase/i18n/zh_CN.po @@ -0,0 +1,51 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_purchase +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-payment (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-10 17:00+0000\n" +"PO-Revision-Date: 2016-04-06 00:16+0000\n" +"Last-Translator: <>\n" +"Language-Team: Chinese (China) (http://www.transifex.com/oca/OCA-bank-payment-8-0/language/zh_CN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. module: account_payment_purchase +#: field:purchase.order,payment_mode_id:0 +msgid "Payment Mode" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_stock_picking +msgid "Picking List" +msgstr "" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_procurement_order +msgid "Procurement" +msgstr "补货" + +#. module: account_payment_purchase +#: model:ir.model,name:account_payment_purchase.model_purchase_order +msgid "Purchase Order" +msgstr "" + +#. module: account_payment_purchase +#: help:purchase.order,supplier_partner_bank_id:0 +msgid "" +"Select the bank account of your supplier on which your company should send " +"the payment. This field is copied from the partner and will be copied to the" +" supplier invoice." +msgstr "" + +#. module: account_payment_purchase +#: field:purchase.order,supplier_partner_bank_id:0 +msgid "Supplier Bank Account" +msgstr "" diff --git a/account_payment_purchase/models/__init__.py b/account_payment_purchase/models/__init__.py new file mode 100644 index 000000000..29a6c4cc8 --- /dev/null +++ b/account_payment_purchase/models/__init__.py @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Akretion (). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import procurement_order +from . import purchase_order +from . import account_invoice diff --git a/account_payment_purchase/models/account_invoice.py b/account_payment_purchase/models/account_invoice.py new file mode 100644 index 000000000..36b70aacb --- /dev/null +++ b/account_payment_purchase/models/account_invoice.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Akretion (). +# Copyright 2017 Tecnativa - Vicent Cubells. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import _, api, models + + +class AccountInvoice(models.Model): + _inherit = "account.invoice" + + @api.onchange('purchase_id') + def purchase_order_change(self): + new_mode = self.purchase_id.payment_mode_id.id or False + new_bank = self.purchase_id.supplier_partner_bank_id.id or False + res = super(AccountInvoice, self).purchase_order_change() + if self.payment_mode_id and self.payment_mode_id.id != new_mode: + res['warning'] = { + 'title': _('Warning'), + 'message': _('Selected purchase order have different ' + 'payment mode.'), + } + return res + if self.partner_bank_id and self.partner_bank_id.id != new_bank: + res['warning'] = { + 'title': _('Warning'), + 'message': _('Selected purchase order have different ' + 'supplier bank.'), + } + return res + self.payment_mode_id = new_mode + self.partner_bank_id = new_bank diff --git a/account_payment_purchase/models/procurement_order.py b/account_payment_purchase/models/procurement_order.py index 2e685323e..e8fd073cf 100644 --- a/account_payment_purchase/models/procurement_order.py +++ b/account_payment_purchase/models/procurement_order.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# (c) 2015 Serv. Tecnol. Avanzados - Pedro M. Baeza +# Copyright 2015 Tecnativa - Pedro M. Baeza # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html from openerp import api, models @@ -8,17 +8,14 @@ from openerp import api, models class ProcurementOrder(models.Model): _inherit = "procurement.order" - @api.model - def create_procurement_purchase_order(self, procurement, po_vals, - line_vals): + @api.multi + def _prepare_purchase_order(self, partner): """Propagate payment mode on MTO/drop shipping.""" - if po_vals.get('partner_id'): - partner = self.env['res.partner'].browse(po_vals['partner_id']) - po_vals['payment_mode_id'] = partner.with_context( - force_company=procurement.company_id.id).\ - supplier_payment_mode.id - po_vals['supplier_partner_bank_id'] = ( + values = super(ProcurementOrder, self)._prepare_purchase_order(partner) + if partner: + values['payment_mode_id'] = partner.with_context( + force_company=self.company_id.id).supplier_payment_mode_id.id + values['supplier_partner_bank_id'] = ( self.env['purchase.order']._get_default_supplier_partner_bank( partner)) - return super(ProcurementOrder, self).create_procurement_purchase_order( - procurement, po_vals, line_vals) + return values diff --git a/account_payment_purchase/models/purchase_order.py b/account_payment_purchase/models/purchase_order.py new file mode 100644 index 000000000..5cc4c8cb3 --- /dev/null +++ b/account_payment_purchase/models/purchase_order.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Akretion (). +# Copyright 2017 Tecnativa - Vicent Cubells. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import api, fields, models + + +class PurchaseOrder(models.Model): + _inherit = "purchase.order" + + supplier_partner_bank_id = fields.Many2one( + comodel_name='res.partner.bank', + string='Supplier Bank Account', + domain="[('partner_id', '=', partner_id)]", + help="Select the bank account of your supplier on which your company " + "should send the payment. This field is copied from the partner " + "and will be copied to the supplier invoice.", + ) + payment_mode_id = fields.Many2one( + comodel_name='account.payment.mode', + string='Payment Mode', + domain="[('payment_type', '=', 'outbound')]", + ) + + @api.model + def _get_default_supplier_partner_bank(self, partner): + """This function is designed to be inherited""" + return partner.bank_ids and partner.bank_ids[0].id or False + + @api.onchange('partner_id') + def onchange_partner_id(self): + super(PurchaseOrder, self).onchange_partner_id() + if self.partner_id: + self.supplier_partner_bank_id = \ + self._get_default_supplier_partner_bank(self.partner_id) + self.payment_mode_id = self.partner_id.supplier_payment_mode_id + else: + self.supplier_partner_bank_id = False + self.payment_mode_id = False diff --git a/account_payment_purchase/static/description/icon.png b/account_payment_purchase/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 diff --git a/account_payment_purchase/tests/__init__.py b/account_payment_purchase/tests/__init__.py new file mode 100644 index 000000000..5af37be3f --- /dev/null +++ b/account_payment_purchase/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2013-2015 Tecnativa - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from . import test_account_payment_purchase diff --git a/account_payment_purchase/tests/test_account_payment_purchase.py b/account_payment_purchase/tests/test_account_payment_purchase.py new file mode 100644 index 000000000..2235f3a68 --- /dev/null +++ b/account_payment_purchase/tests/test_account_payment_purchase.py @@ -0,0 +1,148 @@ +# -*- coding: utf-8 -*- +# Copyright 2013-2015 Tecnativa - Pedro M. Baeza +# Copyright 2017 Tecnativa - Vicent Cubells +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from openerp import fields +from openerp.tests import common + + +class TestAccountPaymentPurchase(common.SavepointCase): + @classmethod + def setUpClass(cls): + super(TestAccountPaymentPurchase, cls).setUpClass() + cls.bank = cls.env['res.partner.bank'].create( + {'bank_name': 'Test bank', + 'acc_number': '1234567890'}) + cls.bank2 = cls.env['res.partner.bank'].create( + {'bank_name': 'Test bank #2', + 'acc_number': '0123456789'}) + cls.journal = cls.env['account.journal'].create( + {'name': 'Test journal', + 'code': 'TEST', + 'type': 'general'}) + cls.payment_mode = cls.env['account.payment.mode'].create( + {'name': 'Test payment mode', + 'fixed_journal_id': cls.journal.id, + 'bank_account_link': 'variable', + 'payment_method_id': cls.env.ref( + 'account.account_payment_method_manual_in').id}) + cls.partner = cls.env['res.partner'].create( + {'name': 'Test partner', + 'supplier_payment_mode_id': cls.payment_mode.id}) + cls.uom_id = cls.env.ref('product.product_uom_unit').id + cls.mto_product = cls.env['product.product'].create( + {'name': 'Test buy product', + 'type': 'product', + 'uom_id': cls.uom_id, + 'uom_po_id': cls.uom_id, + 'seller_ids': [(0, 0, {'name': cls.partner.id})]}) + cls.purchase = cls.env['purchase.order'].create( + {'partner_id': cls.partner.id, + 'payment_mode_id': cls.payment_mode.id, + 'order_line': [(0, 0, {'name': 'Test line', + 'product_qty': 1.0, + 'product_id': cls.mto_product.id, + 'product_uom': cls.uom_id, + 'date_planned': fields.Date.today(), + 'price_unit': 1.0})]}) + + def test_onchange_partner_id_purchase_order(self): + self.purchase.onchange_partner_id() + self.assertEqual(self.purchase.payment_mode_id, self.payment_mode) + + def test_purchase_order_invoicing(self): + self.purchase.button_confirm() + picking = self.purchase.picking_ids[0] + picking.force_assign() + picking.pack_operation_product_ids.write({'qty_done': 1.0}) + picking.do_new_transfer() + + invoice = self.env['account.invoice'].create({ + 'partner_id': self.partner.id, + 'purchase_id': self.purchase.id, + 'account_id': self.partner.property_account_payable_id.id, + }) + invoice.purchase_order_change() + self.assertEqual( + self.purchase.invoice_ids[0].payment_mode_id, self.payment_mode) + + def test_picking_from_purchase_order_invoicing(self): + # Test payment mode + stockable_product = self.env['product.product'].create( + {'name': 'Test stockable product', + 'type': 'product'}) + self.purchase.order_line[0].product_id = stockable_product.id + self.purchase.button_confirm() + picking = self.purchase.picking_ids[0] + picking.force_assign() + picking.pack_operation_product_ids.write({'qty_done': 1.0}) + picking.do_new_transfer() + + invoice = self.env['account.invoice'].create({ + 'partner_id': self.partner.id, + 'purchase_id': self.purchase.id, + 'account_id': self.partner.property_account_payable_id.id, + }) + invoice.purchase_order_change() + self.assertEqual(invoice.payment_mode_id, self.payment_mode) + purchase2 = self.purchase.copy() + payment_mode2 = self.payment_mode.copy() + purchase2.payment_mode_id = payment_mode2.id + purchase2.button_confirm() + picking = purchase2.picking_ids[0] + picking.force_assign() + picking.pack_operation_product_ids.write({'qty_done': 1.0}) + picking.do_new_transfer() + invoice.purchase_id = purchase2.id + result = invoice.purchase_order_change() + self.assertEqual(result['warning']['title'], 'Warning') + + def test_picking_from_purchase_order_invoicing_bank(self): + # Test patner_bank + stockable_product = self.env['product.product'].create( + {'name': 'Test stockable product', + 'type': 'product'}) + self.purchase.order_line[0].product_id = stockable_product.id + self.purchase.payment_mode_id = False + self.purchase.supplier_partner_bank_id = self.bank.id + self.purchase.button_confirm() + picking = self.purchase.picking_ids[0] + picking.force_assign() + picking.pack_operation_product_ids.write({'qty_done': 1.0}) + picking.do_new_transfer() + + invoice = self.env['account.invoice'].create({ + 'partner_id': self.partner.id, + 'purchase_id': self.purchase.id, + 'account_id': self.partner.property_account_payable_id.id, + }) + invoice.purchase_order_change() + self.assertEqual(invoice.partner_bank_id, self.bank) + purchase2 = self.purchase.copy() + purchase2.supplier_partner_bank_id = self.bank2.id + purchase2.button_confirm() + picking = purchase2.picking_ids[0] + picking.force_assign() + picking.pack_operation_product_ids.write({'qty_done': 1.0}) + picking.do_new_transfer() + invoice.purchase_id = purchase2.id + result = invoice.purchase_order_change() + self.assertEqual(result['warning']['title'], 'Warning') + + def test_procurement_buy_payment_mode(self): + route = self.env.ref('purchase.route_warehouse0_buy') + rule = self.env['procurement.rule'].search( + [('route_id', '=', route.id)], limit=1) + procurement_order = self.env['procurement.order'].create({ + 'product_id': self.mto_product.id, + 'rule_id': rule.id, + 'location_id': self.env['stock.location'].search([], limit=1).id, + 'warehouse_id': self.env['stock.warehouse'].search([], limit=1).id, + 'product_qty': 1, + 'product_uom': self.mto_product.uom_id.id, + 'name': 'Procurement order test', + }) + procurement_order.run() + self.assertEqual( + procurement_order.purchase_id.payment_mode_id, self.payment_mode) diff --git a/account_payment_purchase/views/purchase_order_view.xml b/account_payment_purchase/views/purchase_order_view.xml new file mode 100644 index 000000000..8f8713acc --- /dev/null +++ b/account_payment_purchase/views/purchase_order_view.xml @@ -0,0 +1,21 @@ + + + + + + account_payment_purchase.purchase_order.form + purchase.order + + + + + + + + + +