From 75c6a5f9d0a310ad1cf2774b5b7b7e84e8ae553d Mon Sep 17 00:00:00 2001 From: AngelMoya-Domatix Date: Wed, 14 Oct 2015 11:18:05 +0200 Subject: [PATCH 01/45] contract_payment_mode module --- contract_payment_mode/README.rst | 52 +++++++++++++++++++ contract_payment_mode/__init__.py | 2 + contract_payment_mode/__openerp__.py | 40 ++++++++++++++ .../i18n/contract_payment_mode.pot | 27 ++++++++++ contract_payment_mode/i18n/es.po | 27 ++++++++++ contract_payment_mode/models/__init__.py | 2 + contract_payment_mode/models/contract.py | 33 ++++++++++++ .../test/contract_payment_mode.yml | 49 +++++++++++++++++ contract_payment_mode/views/contract_view.xml | 42 +++++++++++++++ 9 files changed, 274 insertions(+) create mode 100644 contract_payment_mode/README.rst create mode 100644 contract_payment_mode/__init__.py create mode 100644 contract_payment_mode/__openerp__.py create mode 100644 contract_payment_mode/i18n/contract_payment_mode.pot create mode 100644 contract_payment_mode/i18n/es.po create mode 100644 contract_payment_mode/models/__init__.py create mode 100644 contract_payment_mode/models/contract.py create mode 100644 contract_payment_mode/test/contract_payment_mode.yml create mode 100644 contract_payment_mode/views/contract_view.xml diff --git a/contract_payment_mode/README.rst b/contract_payment_mode/README.rst new file mode 100644 index 0000000000..5d4ee46c0e --- /dev/null +++ b/contract_payment_mode/README.rst @@ -0,0 +1,52 @@ +.. 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 + +===================== +Contract Payment Mode +===================== + +This module allows to set a payment mode on contract for creating the invoices with this payment mode. + +Usage +===== + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/110/8.0 + +For further information, please visit: + +* https://www.odoo.com/forum/help-1 + +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 +------------ + +* Ángel Moya + + +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/contract_payment_mode/__init__.py b/contract_payment_mode/__init__.py new file mode 100644 index 0000000000..a0fdc10fe1 --- /dev/null +++ b/contract_payment_mode/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import models diff --git a/contract_payment_mode/__openerp__.py b/contract_payment_mode/__openerp__.py new file mode 100644 index 0000000000..1eee7c8b63 --- /dev/null +++ b/contract_payment_mode/__openerp__.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- + +############################################################################### +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2015 Domatix (). +# +# 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': 'Contract Payment Mode', + 'summary': 'Payment mode in contracts and their invoices', + 'version': '8.0.1.0.0', + 'author': 'Domatix, Odoo Community Association (OCA)', + 'website': 'http://www.domatix.com', + 'depends': [ + 'account_analytic_analysis', + 'account_payment_partner'], + 'category': 'Sales Management', + 'license': 'AGPL-3', + 'data': [ + 'views/contract_view.xml', + ], + 'test': ['test/contract_payment_mode.yml'], + 'installable': True, + 'auto_install': True, +} diff --git a/contract_payment_mode/i18n/contract_payment_mode.pot b/contract_payment_mode/i18n/contract_payment_mode.pot new file mode 100644 index 0000000000..e366d91d99 --- /dev/null +++ b/contract_payment_mode/i18n/contract_payment_mode.pot @@ -0,0 +1,27 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-10-16 08:32+0000\n" +"PO-Revision-Date: 2015-10-16 08:32+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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "" + +#. module: contract_payment_mode +#: field:account.analytic.account,payment_mode_id:0 +msgid "Payment Mode" +msgstr "" + diff --git a/contract_payment_mode/i18n/es.po b/contract_payment_mode/i18n/es.po new file mode 100644 index 0000000000..de6fc59af4 --- /dev/null +++ b/contract_payment_mode/i18n/es.po @@ -0,0 +1,27 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-10-16 08:32+0000\n" +"PO-Revision-Date: 2015-10-16 08:32+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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Cuenta analítica" + +#. module: contract_payment_mode +#: field:account.analytic.account,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Modo de pago" + diff --git a/contract_payment_mode/models/__init__.py b/contract_payment_mode/models/__init__.py new file mode 100644 index 0000000000..b82ea8779b --- /dev/null +++ b/contract_payment_mode/models/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import contract diff --git a/contract_payment_mode/models/contract.py b/contract_payment_mode/models/contract.py new file mode 100644 index 0000000000..8d1b31a50f --- /dev/null +++ b/contract_payment_mode/models/contract.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +from openerp import models, fields, api + + +class AccountAnalyticAccount(models.Model): + _inherit = 'account.analytic.account' + + payment_mode_id = fields.Many2one( + 'payment.mode', + string='Payment Mode', + domain="[('type', '=', 'sale')]") + + @api.multi + def on_change_partner_id(self, partner_id, name): + res = super(AccountAnalyticAccount, self).on_change_partner_id( + partner_id, + name) + partner = self.env['res.partner'].browse(partner_id) + if partner and partner.customer_payment_mode: + res['value']['payment_mode_id'] = partner.customer_payment_mode.id + return res + + @api.model + def _prepare_invoice_data(self, contract): + invoice_vals = super(AccountAnalyticAccount, self).\ + _prepare_invoice_data( + contract) + if contract.payment_mode_id: + invoice_vals['payment_mode_id'] = contract.payment_mode_id.id + invoice_vals['partner_bank_id'] = \ + contract.payment_mode_id.bank_id.id + + return invoice_vals diff --git a/contract_payment_mode/test/contract_payment_mode.yml b/contract_payment_mode/test/contract_payment_mode.yml new file mode 100644 index 0000000000..465b24460f --- /dev/null +++ b/contract_payment_mode/test/contract_payment_mode.yml @@ -0,0 +1,49 @@ +- + In order to test payment mode in contract, I create a contract with custom payment mode. + Then, I generate Invoices from contract and test this payment mode. + First create custom payment mode. +- + !record {model: payment.mode, id: custom_payment_mode}: + name: Custom Payment Mode + journal: account.bank_journal + bank_id: account_payment.partner_bank_1 + company_id: base.main_company + type: account_banking_payment_export.manual_bank_tranfer +- + I create a contract with custom payment mode +- + !record {model: account.analytic.account, id: contract_custom_payment}: + name: Maintenance of Servers + company_id: base.main_company + partner_id: base.main_partner + payment_mode_id: custom_payment_mode + type: contract + recurring_invoices : 1 + recurring_interval : 1 + recurring_invoice_line_ids: + - quantity: 2.0 + price_unit: 100.0 + name: Database Administration 25 + product_id: product.product_product_consultant + uom_id: product.product_uom_hour +- + I test the payment mode in contract +- + !python {model: account.analytic.account}: | + aid = ref('contract_payment_mode.contract_custom_payment') + contract = self.browse(cr, uid, aid,context=context) + assert contract.payment_mode_id.id == ref('contract_payment_mode.custom_payment_mode'), "Payment Mode is not correct in contract" +- + I generate all invoices from contracts having recurring invoicing +- + !python {model: account.analytic.account}: | + self.recurring_create_invoice(cr, uid, []) +- + I test the generated invoice for custom payment contract +- + !python {model: account.invoice}: | + aid = ref('contract_payment_mode.contract_custom_payment') + ids = self.search(cr, uid, [('invoice_line.account_analytic_id','=',aid)], context=context) + assert len(ids)>=1, 'No invoice created for the custom paymetn mode contract' + for invoice in self.browse(cr, uid, ids,context=context): + assert invoice.payment_mode_id.id == ref('contract_payment_mode.custom_payment_mode'), "Payment Mode is not correct in invoice" diff --git a/contract_payment_mode/views/contract_view.xml b/contract_payment_mode/views/contract_view.xml new file mode 100644 index 0000000000..4f488e4526 --- /dev/null +++ b/contract_payment_mode/views/contract_view.xml @@ -0,0 +1,42 @@ + + + + + + account.analytic.account.payment.form + account.analytic.account + + + + + + + + + + + account.analytic.account.payment.list + account.analytic.account + + + + + + + + + + + account.analytic.account.payment.search + account.analytic.account + + + + + + + + + + \ No newline at end of file From 6467dfe3c2ffab363f4d34bedfab4753585ad0a2 Mon Sep 17 00:00:00 2001 From: Antonio Espinosa Date: Wed, 27 Jan 2016 13:54:21 +0100 Subject: [PATCH 02/45] contract_payment_mode: Several fixes+imps: * Copy partner payment mode to contracts when installing * Filter payment modes for sales * Adding tests --- contract_payment_mode/README.rst | 1 + contract_payment_mode/__init__.py | 4 ++ contract_payment_mode/__openerp__.py | 1 + contract_payment_mode/hooks.py | 27 +++++++++++++ contract_payment_mode/models/contract.py | 5 +-- contract_payment_mode/tests/__init__.py | 5 +++ .../tests/test_contract_payment_init.py | 40 +++++++++++++++++++ 7 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 contract_payment_mode/hooks.py create mode 100644 contract_payment_mode/tests/__init__.py create mode 100644 contract_payment_mode/tests/test_contract_payment_init.py diff --git a/contract_payment_mode/README.rst b/contract_payment_mode/README.rst index 5d4ee46c0e..09e27ba1fa 100644 --- a/contract_payment_mode/README.rst +++ b/contract_payment_mode/README.rst @@ -34,6 +34,7 @@ Contributors ------------ * Ángel Moya +* Antonio Espinosa Maintainer diff --git a/contract_payment_mode/__init__.py b/contract_payment_mode/__init__.py index a0fdc10fe1..753e6ceed7 100644 --- a/contract_payment_mode/__init__.py +++ b/contract_payment_mode/__init__.py @@ -1,2 +1,6 @@ # -*- coding: utf-8 -*- +# © 2016 Antiun Ingenieria S.L. - Antonio Espinosa +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + from . import models +from .hooks import post_init_hook diff --git a/contract_payment_mode/__openerp__.py b/contract_payment_mode/__openerp__.py index 1eee7c8b63..f9c12929d1 100644 --- a/contract_payment_mode/__openerp__.py +++ b/contract_payment_mode/__openerp__.py @@ -35,6 +35,7 @@ 'views/contract_view.xml', ], 'test': ['test/contract_payment_mode.yml'], + 'post_init_hook': 'post_init_hook', 'installable': True, 'auto_install': True, } diff --git a/contract_payment_mode/hooks.py b/contract_payment_mode/hooks.py new file mode 100644 index 0000000000..5e68b6c391 --- /dev/null +++ b/contract_payment_mode/hooks.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# © 2016 Antiun Ingenieria S.L. - Antonio Espinosa +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import api, SUPERUSER_ID +import logging + +_logger = logging.getLogger(__name__) + + +def post_init_hook(cr, registry): + """Copy payment mode from partner to the new field at contract.""" + with api.Environment.manage(): + env = api.Environment(cr, SUPERUSER_ID, {}) + m_contract = env['account.analytic.account'] + contracts = m_contract.search([ + ('type', '=', 'contract'), + ('payment_mode_id', '=', False), + ]) + if contracts: + _logger.info('Setting payment mode: %d contracts' % + len(contracts)) + for contract in contracts: + payment_mode = contract.partner_id.customer_payment_mode + if payment_mode: + contract.payment_mode_id = payment_mode.id + _logger.info('Setting payment mode: Done') diff --git a/contract_payment_mode/models/contract.py b/contract_payment_mode/models/contract.py index 8d1b31a50f..0aa60e893f 100644 --- a/contract_payment_mode/models/contract.py +++ b/contract_payment_mode/models/contract.py @@ -8,7 +8,7 @@ class AccountAnalyticAccount(models.Model): payment_mode_id = fields.Many2one( 'payment.mode', string='Payment Mode', - domain="[('type', '=', 'sale')]") + domain="[('sale_ok', '=', True)]") @api.multi def on_change_partner_id(self, partner_id, name): @@ -23,8 +23,7 @@ def on_change_partner_id(self, partner_id, name): @api.model def _prepare_invoice_data(self, contract): invoice_vals = super(AccountAnalyticAccount, self).\ - _prepare_invoice_data( - contract) + _prepare_invoice_data(contract) if contract.payment_mode_id: invoice_vals['payment_mode_id'] = contract.payment_mode_id.id invoice_vals['partner_bank_id'] = \ diff --git a/contract_payment_mode/tests/__init__.py b/contract_payment_mode/tests/__init__.py new file mode 100644 index 0000000000..be86a7bf3f --- /dev/null +++ b/contract_payment_mode/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# © 2016 Antiun Ingenieria S.L. - Antonio Espinosa +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import test_contract_payment_init diff --git a/contract_payment_mode/tests/test_contract_payment_init.py b/contract_payment_mode/tests/test_contract_payment_init.py new file mode 100644 index 0000000000..2056a162d8 --- /dev/null +++ b/contract_payment_mode/tests/test_contract_payment_init.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +# © 2015 Antiun Ingenieria S.L. - Antonio Espinosa +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp.tests.common import TransactionCase +from ..hooks import post_init_hook + + +class TestContractPaymentInit(TransactionCase): + # Use case : Prepare some data for current test case + def setUp(self): + super(TestContractPaymentInit, self).setUp() + self.payment_mode = self.env.ref('account_payment.payment_mode_1') + self.partner = self.env['res.partner'].create({ + 'name': 'Test contract partner', + 'customer_payment_mode': self.payment_mode.id, + }) + + def _contract_payment_mode_id(self, contract_id): + contract = self.env['account.analytic.account'].search([ + ('id', '=', contract_id), + ]) + return contract.payment_mode_id.id + + def test_post_init_hook(self): + contract = self.env['account.analytic.account'].create({ + 'name': 'Test contract', + 'type': 'contract', + 'partner_id': self.partner.id, + 'payment_mode_id': self.payment_mode.id, + }) + self.assertEqual(self._contract_payment_mode_id(contract.id), + self.payment_mode.id) + + contract.payment_mode_id = False + self.assertEqual(self._contract_payment_mode_id(contract.id), False) + + post_init_hook(self.cr, self.env) + self.assertEqual(self._contract_payment_mode_id(contract.id), + self.payment_mode.id) From 9821081b2a321791e0041f906148f87a5d747122 Mon Sep 17 00:00:00 2001 From: Javi Melendez Date: Mon, 25 Apr 2016 09:48:15 +0200 Subject: [PATCH 03/45] contract_payment_mode: get bank account from partner (#30) in recurring invoice --- contract_payment_mode/models/contract.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contract_payment_mode/models/contract.py b/contract_payment_mode/models/contract.py index 0aa60e893f..1d25566730 100644 --- a/contract_payment_mode/models/contract.py +++ b/contract_payment_mode/models/contract.py @@ -26,7 +26,8 @@ def _prepare_invoice_data(self, contract): _prepare_invoice_data(contract) if contract.payment_mode_id: invoice_vals['payment_mode_id'] = contract.payment_mode_id.id - invoice_vals['partner_bank_id'] = \ - contract.payment_mode_id.bank_id.id + invoice_vals['partner_bank_id'] = ( + contract.partner_id.bank_ids[:1].id or + contract.payment_mode_id.bank_id.id) return invoice_vals From ce0be17f76ec4ef4d69d7524a7e9f1f7ee8fc1c3 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 7 Nov 2015 23:19:16 -0500 Subject: [PATCH 04/45] OCA Transbot updated translations from Transifex --- contract_payment_mode/i18n/ca.po | 28 ++++++++++++++++++++++++++++ contract_payment_mode/i18n/de.po | 29 +++++++++++++++++++++++++++++ contract_payment_mode/i18n/el_GR.po | 28 ++++++++++++++++++++++++++++ contract_payment_mode/i18n/es_MX.po | 28 ++++++++++++++++++++++++++++ contract_payment_mode/i18n/fi.po | 29 +++++++++++++++++++++++++++++ contract_payment_mode/i18n/fr.po | 29 +++++++++++++++++++++++++++++ contract_payment_mode/i18n/pt_BR.po | 29 +++++++++++++++++++++++++++++ contract_payment_mode/i18n/sk_SK.po | 28 ++++++++++++++++++++++++++++ contract_payment_mode/i18n/sl.po | 29 +++++++++++++++++++++++++++++ 9 files changed, 257 insertions(+) create mode 100644 contract_payment_mode/i18n/ca.po create mode 100644 contract_payment_mode/i18n/de.po create mode 100644 contract_payment_mode/i18n/el_GR.po create mode 100644 contract_payment_mode/i18n/es_MX.po create mode 100644 contract_payment_mode/i18n/fi.po create mode 100644 contract_payment_mode/i18n/fr.po create mode 100644 contract_payment_mode/i18n/pt_BR.po create mode 100644 contract_payment_mode/i18n/sk_SK.po create mode 100644 contract_payment_mode/i18n/sl.po diff --git a/contract_payment_mode/i18n/ca.po b/contract_payment_mode/i18n/ca.po new file mode 100644 index 0000000000..acfc4e7944 --- /dev/null +++ b/contract_payment_mode/i18n/ca.po @@ -0,0 +1,28 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: contract (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-20 18:39+0000\n" +"PO-Revision-Date: 2015-11-07 12:33+0000\n" +"Last-Translator: <>\n" +"Language-Team: Catalan (http://www.transifex.com/oca/OCA-contract-8-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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Compte analític" + +#. module: contract_payment_mode +#: field:account.analytic.account,payment_mode_id:0 +msgid "Payment Mode" +msgstr "" diff --git a/contract_payment_mode/i18n/de.po b/contract_payment_mode/i18n/de.po new file mode 100644 index 0000000000..a447c68831 --- /dev/null +++ b/contract_payment_mode/i18n/de.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# Rudolf Schnapka , 2015 +msgid "" +msgstr "" +"Project-Id-Version: contract (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-11-30 01:38+0000\n" +"PO-Revision-Date: 2015-11-25 09:20+0000\n" +"Last-Translator: Rudolf Schnapka \n" +"Language-Team: German (http://www.transifex.com/oca/OCA-contract-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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Kostenstelle" + +#. module: contract_payment_mode +#: field:account.analytic.account,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Zahlweise" diff --git a/contract_payment_mode/i18n/el_GR.po b/contract_payment_mode/i18n/el_GR.po new file mode 100644 index 0000000000..158f6686d4 --- /dev/null +++ b/contract_payment_mode/i18n/el_GR.po @@ -0,0 +1,28 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: contract (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-11-07 03:42+0000\n" +"PO-Revision-Date: 2015-11-07 12:33+0000\n" +"Last-Translator: <>\n" +"Language-Team: Greek (Greece) (http://www.transifex.com/oca/OCA-contract-8-0/language/el_GR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: el_GR\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Αναλυτικός Λογαριασμός" + +#. module: contract_payment_mode +#: field:account.analytic.account,payment_mode_id:0 +msgid "Payment Mode" +msgstr "" diff --git a/contract_payment_mode/i18n/es_MX.po b/contract_payment_mode/i18n/es_MX.po new file mode 100644 index 0000000000..2d638f415d --- /dev/null +++ b/contract_payment_mode/i18n/es_MX.po @@ -0,0 +1,28 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: contract (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-03 01:11+0000\n" +"PO-Revision-Date: 2015-11-07 12:33+0000\n" +"Last-Translator: <>\n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/oca/OCA-contract-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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Cuenta analítica" + +#. module: contract_payment_mode +#: field:account.analytic.account,payment_mode_id:0 +msgid "Payment Mode" +msgstr "" diff --git a/contract_payment_mode/i18n/fi.po b/contract_payment_mode/i18n/fi.po new file mode 100644 index 0000000000..a8774cdc27 --- /dev/null +++ b/contract_payment_mode/i18n/fi.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# Jarmo Kortetjärvi , 2016 +msgid "" +msgstr "" +"Project-Id-Version: contract (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-05-28 11:00+0000\n" +"PO-Revision-Date: 2016-07-08 10:45+0000\n" +"Last-Translator: Jarmo Kortetjärvi \n" +"Language-Team: Finnish (http://www.transifex.com/oca/OCA-contract-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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Analyyttinen tili" + +#. module: contract_payment_mode +#: field:account.analytic.account,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Maksutapa" diff --git a/contract_payment_mode/i18n/fr.po b/contract_payment_mode/i18n/fr.po new file mode 100644 index 0000000000..2f73f80b2d --- /dev/null +++ b/contract_payment_mode/i18n/fr.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# Christophe CHAUVET , 2016 +msgid "" +msgstr "" +"Project-Id-Version: contract (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-04-30 10:34+0000\n" +"PO-Revision-Date: 2016-05-19 16:11+0000\n" +"Last-Translator: Christophe CHAUVET \n" +"Language-Team: French (http://www.transifex.com/oca/OCA-contract-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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Compte analytique" + +#. module: contract_payment_mode +#: field:account.analytic.account,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Mode de paiement" diff --git a/contract_payment_mode/i18n/pt_BR.po b/contract_payment_mode/i18n/pt_BR.po new file mode 100644 index 0000000000..028007082b --- /dev/null +++ b/contract_payment_mode/i18n/pt_BR.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# danimaribeiro , 2016 +msgid "" +msgstr "" +"Project-Id-Version: contract (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-08 01:39+0000\n" +"PO-Revision-Date: 2016-03-05 18:19+0000\n" +"Last-Translator: danimaribeiro \n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-contract-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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Conta Analítica" + +#. module: contract_payment_mode +#: field:account.analytic.account,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Modo de pagamento" diff --git a/contract_payment_mode/i18n/sk_SK.po b/contract_payment_mode/i18n/sk_SK.po new file mode 100644 index 0000000000..ed203d2945 --- /dev/null +++ b/contract_payment_mode/i18n/sk_SK.po @@ -0,0 +1,28 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: contract (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-05-21 10:53+0000\n" +"PO-Revision-Date: 2015-11-07 12:33+0000\n" +"Last-Translator: <>\n" +"Language-Team: Slovak (Slovakia) (http://www.transifex.com/oca/OCA-contract-8-0/language/sk_SK/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sk_SK\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Analytický účet" + +#. module: contract_payment_mode +#: field:account.analytic.account,payment_mode_id:0 +msgid "Payment Mode" +msgstr "" diff --git a/contract_payment_mode/i18n/sl.po b/contract_payment_mode/i18n/sl.po new file mode 100644 index 0000000000..36bd545756 --- /dev/null +++ b/contract_payment_mode/i18n/sl.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# Matjaž Mozetič , 2015 +msgid "" +msgstr "" +"Project-Id-Version: contract (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-11-13 18:42+0000\n" +"PO-Revision-Date: 2015-11-08 05:37+0000\n" +"Last-Translator: Matjaž Mozetič \n" +"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-contract-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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Analitični konto" + +#. module: contract_payment_mode +#: field:account.analytic.account,payment_mode_id:0 +msgid "Payment Mode" +msgstr "Način plačila" From 891da070cc9f822d7c5281daa608bfce8e5a75dd Mon Sep 17 00:00:00 2001 From: cubells Date: Tue, 28 Mar 2017 14:52:12 +0200 Subject: [PATCH 05/45] contract_payment_mode: Migration to 9.0 --- contract_payment_mode/README.rst | 38 ++++++--- contract_payment_mode/__init__.py | 2 +- contract_payment_mode/__openerp__.py | 36 +++----- contract_payment_mode/hooks.py | 5 +- .../i18n/contract_payment_mode.pot | 27 ------ contract_payment_mode/models/contract.py | 28 +++---- .../test/contract_payment_mode.yml | 49 ----------- contract_payment_mode/tests/__init__.py | 4 +- .../tests/test_contract_payment.py | 83 +++++++++++++++++++ .../tests/test_contract_payment_init.py | 40 --------- contract_payment_mode/views/contract_view.xml | 67 +++++++-------- 11 files changed, 168 insertions(+), 211 deletions(-) delete mode 100644 contract_payment_mode/i18n/contract_payment_mode.pot delete mode 100644 contract_payment_mode/test/contract_payment_mode.yml create mode 100644 contract_payment_mode/tests/test_contract_payment.py delete mode 100644 contract_payment_mode/tests/test_contract_payment_init.py diff --git a/contract_payment_mode/README.rst b/contract_payment_mode/README.rst index 09e27ba1fa..c28b1c278c 100644 --- a/contract_payment_mode/README.rst +++ b/contract_payment_mode/README.rst @@ -6,26 +6,39 @@ Contract Payment Mode ===================== -This module allows to set a payment mode on contract for creating the invoices with this payment mode. +This module allows to set a payment mode on contract for creating the invoices +with this payment mode. + +Configuration +============= + +Your user should be a Sales Manager or Accountant. Usage ===== -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/110/8.0 +#. Go to *Sales > Sales > Contracts*. +#. Create one. +#. Select a partner to which invoice. +#. If the partner has a payment mode, this payment mode is selected here. +#. If not, or if you want another payment mode, you can change it in the + corresponding field. +#. Click on **Generate recurring invoices automatically** checkbox. +#. Add a product to invoice. +#. If you create an invoice, new invoice will have the selected payment mode. -For further information, please visit: -* https://www.odoo.com/forum/help-1 +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/110/9.0 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 `_. +In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smash it by providing detailed and welcomed feedback. Credits ======= @@ -35,14 +48,15 @@ Contributors * Ángel Moya * Antonio Espinosa +* Vicent Cubells Maintainer ---------- -.. image:: http://odoo-community.org/logo.png +.. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association - :target: http://odoo-community.org + :target: https://odoo-community.org This module is maintained by the OCA. @@ -50,4 +64,4 @@ 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. +To contribute to this module, please visit https://odoo-community.org. diff --git a/contract_payment_mode/__init__.py b/contract_payment_mode/__init__.py index 753e6ceed7..ca40b1d9f3 100644 --- a/contract_payment_mode/__init__.py +++ b/contract_payment_mode/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2016 Antiun Ingenieria S.L. - Antonio Espinosa +# Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/contract_payment_mode/__openerp__.py b/contract_payment_mode/__openerp__.py index f9c12929d1..8b0c2a5b70 100644 --- a/contract_payment_mode/__openerp__.py +++ b/contract_payment_mode/__openerp__.py @@ -1,40 +1,26 @@ # -*- coding: utf-8 -*- - -############################################################################### -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2015 Domatix (). -# -# 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 . -# -############################################################################### +# Copyright 2015 Domatix () +# Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa +# Copyright 2017 Tecnativa - Vicent Cubells +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Contract Payment Mode', 'summary': 'Payment mode in contracts and their invoices', - 'version': '8.0.1.0.0', - 'author': 'Domatix, Odoo Community Association (OCA)', + 'version': '9.0.1.0.0', + 'author': 'Domatix, ' + 'Tecnativa, ' + 'Odoo Community Association (OCA)', 'website': 'http://www.domatix.com', 'depends': [ - 'account_analytic_analysis', - 'account_payment_partner'], + 'contract', + 'account_payment_partner' + ], 'category': 'Sales Management', 'license': 'AGPL-3', 'data': [ 'views/contract_view.xml', ], - 'test': ['test/contract_payment_mode.yml'], 'post_init_hook': 'post_init_hook', 'installable': True, 'auto_install': True, diff --git a/contract_payment_mode/hooks.py b/contract_payment_mode/hooks.py index 5e68b6c391..1a5795eefe 100644 --- a/contract_payment_mode/hooks.py +++ b/contract_payment_mode/hooks.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2016 Antiun Ingenieria S.L. - Antonio Espinosa +# Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from openerp import api, SUPERUSER_ID @@ -14,14 +14,13 @@ def post_init_hook(cr, registry): env = api.Environment(cr, SUPERUSER_ID, {}) m_contract = env['account.analytic.account'] contracts = m_contract.search([ - ('type', '=', 'contract'), ('payment_mode_id', '=', False), ]) if contracts: _logger.info('Setting payment mode: %d contracts' % len(contracts)) for contract in contracts: - payment_mode = contract.partner_id.customer_payment_mode + payment_mode = contract.partner_id.customer_payment_mode_id if payment_mode: contract.payment_mode_id = payment_mode.id _logger.info('Setting payment mode: Done') diff --git a/contract_payment_mode/i18n/contract_payment_mode.pot b/contract_payment_mode/i18n/contract_payment_mode.pot deleted file mode 100644 index e366d91d99..0000000000 --- a/contract_payment_mode/i18n/contract_payment_mode.pot +++ /dev/null @@ -1,27 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * contract_payment_mode -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-16 08:32+0000\n" -"PO-Revision-Date: 2015-10-16 08:32+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: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "" - -#. module: contract_payment_mode -#: field:account.analytic.account,payment_mode_id:0 -msgid "Payment Mode" -msgstr "" - diff --git a/contract_payment_mode/models/contract.py b/contract_payment_mode/models/contract.py index 1d25566730..60ab668419 100644 --- a/contract_payment_mode/models/contract.py +++ b/contract_payment_mode/models/contract.py @@ -1,33 +1,27 @@ # -*- coding: utf-8 -*- -from openerp import models, fields, api +from openerp import api, fields, models class AccountAnalyticAccount(models.Model): _inherit = 'account.analytic.account' payment_mode_id = fields.Many2one( - 'payment.mode', + comodel_name='account.payment.mode', string='Payment Mode', - domain="[('sale_ok', '=', True)]") + domain=[('payment_type', '=', 'inbound')], + ) - @api.multi - def on_change_partner_id(self, partner_id, name): - res = super(AccountAnalyticAccount, self).on_change_partner_id( - partner_id, - name) - partner = self.env['res.partner'].browse(partner_id) - if partner and partner.customer_payment_mode: - res['value']['payment_mode_id'] = partner.customer_payment_mode.id - return res + @api.onchange('partner_id') + def on_change_partner_id(self): + if self.partner_id.customer_payment_mode_id: + self.payment_mode_id = self.partner_id.customer_payment_mode_id.id @api.model def _prepare_invoice_data(self, contract): - invoice_vals = super(AccountAnalyticAccount, self).\ - _prepare_invoice_data(contract) + invoice_vals = super(AccountAnalyticAccount, self)._prepare_invoice() if contract.payment_mode_id: invoice_vals['payment_mode_id'] = contract.payment_mode_id.id invoice_vals['partner_bank_id'] = ( - contract.partner_id.bank_ids[:1].id or - contract.payment_mode_id.bank_id.id) - + contract.partner_id.bank_ids[:1].id + ) return invoice_vals diff --git a/contract_payment_mode/test/contract_payment_mode.yml b/contract_payment_mode/test/contract_payment_mode.yml deleted file mode 100644 index 465b24460f..0000000000 --- a/contract_payment_mode/test/contract_payment_mode.yml +++ /dev/null @@ -1,49 +0,0 @@ -- - In order to test payment mode in contract, I create a contract with custom payment mode. - Then, I generate Invoices from contract and test this payment mode. - First create custom payment mode. -- - !record {model: payment.mode, id: custom_payment_mode}: - name: Custom Payment Mode - journal: account.bank_journal - bank_id: account_payment.partner_bank_1 - company_id: base.main_company - type: account_banking_payment_export.manual_bank_tranfer -- - I create a contract with custom payment mode -- - !record {model: account.analytic.account, id: contract_custom_payment}: - name: Maintenance of Servers - company_id: base.main_company - partner_id: base.main_partner - payment_mode_id: custom_payment_mode - type: contract - recurring_invoices : 1 - recurring_interval : 1 - recurring_invoice_line_ids: - - quantity: 2.0 - price_unit: 100.0 - name: Database Administration 25 - product_id: product.product_product_consultant - uom_id: product.product_uom_hour -- - I test the payment mode in contract -- - !python {model: account.analytic.account}: | - aid = ref('contract_payment_mode.contract_custom_payment') - contract = self.browse(cr, uid, aid,context=context) - assert contract.payment_mode_id.id == ref('contract_payment_mode.custom_payment_mode'), "Payment Mode is not correct in contract" -- - I generate all invoices from contracts having recurring invoicing -- - !python {model: account.analytic.account}: | - self.recurring_create_invoice(cr, uid, []) -- - I test the generated invoice for custom payment contract -- - !python {model: account.invoice}: | - aid = ref('contract_payment_mode.contract_custom_payment') - ids = self.search(cr, uid, [('invoice_line.account_analytic_id','=',aid)], context=context) - assert len(ids)>=1, 'No invoice created for the custom paymetn mode contract' - for invoice in self.browse(cr, uid, ids,context=context): - assert invoice.payment_mode_id.id == ref('contract_payment_mode.custom_payment_mode'), "Payment Mode is not correct in invoice" diff --git a/contract_payment_mode/tests/__init__.py b/contract_payment_mode/tests/__init__.py index be86a7bf3f..3715e52336 100644 --- a/contract_payment_mode/tests/__init__.py +++ b/contract_payment_mode/tests/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# © 2016 Antiun Ingenieria S.L. - Antonio Espinosa +# Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from . import test_contract_payment_init +from . import test_contract_payment diff --git a/contract_payment_mode/tests/test_contract_payment.py b/contract_payment_mode/tests/test_contract_payment.py new file mode 100644 index 0000000000..d5c41106aa --- /dev/null +++ b/contract_payment_mode/tests/test_contract_payment.py @@ -0,0 +1,83 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 Antiun Ingenieria S.L. - Antonio Espinosa +# Copyright 2017 Tecnativa - Vicent Cubells +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp.tests import common +from ..hooks import post_init_hook + + +class TestContractPaymentInit(common.SavepointCase): + @classmethod + def setUpClass(cls): + super(TestContractPaymentInit, cls).setUpClass() + + cls.payment_method = cls.env.ref( + 'account.account_payment_method_manual_in') + cls.payment_mode = cls.env.ref( + 'account_payment_mode.payment_mode_inbound_ct1') + cls.partner = cls.env['res.partner'].create({ + 'name': 'Test contract partner', + 'customer_payment_mode_id': cls.payment_mode, + }) + cls.product = cls.env['product.product'].create({ + 'name': 'Custom Service', + 'type': 'service', + 'uom_id': cls.env.ref('product.product_uom_hour').id, + 'uom_po_id': cls.env.ref('product.product_uom_hour').id, + 'sale_ok': True, + }) + cls.contract = cls.env['account.analytic.account'].create({ + 'name': 'Maintenance of Servers', + }) + + def _contract_payment_mode_id(self, contract_id): + contract = self.env['account.analytic.account'].search([ + ('id', '=', contract_id), + ]) + return contract.payment_mode_id.id + + def test_post_init_hook(self): + contract = self.env['account.analytic.account'].create({ + 'name': 'Test contract', + 'partner_id': self.partner.id, + 'payment_mode_id': self.payment_mode.id, + }) + self.assertEqual(self._contract_payment_mode_id(contract.id), + self.payment_mode.id) + + contract.payment_mode_id = False + self.assertEqual(self._contract_payment_mode_id(contract.id), False) + + post_init_hook(self.cr, self.env) + self.assertEqual(self._contract_payment_mode_id(contract.id), + self.payment_mode.id) + + def test_contract_and_invoices(self): + self.contract.write({'partner_id': self.partner.id}) + self.contract.on_change_partner_id() + self.assertEqual(self.contract.payment_mode_id, + self.contract.partner_id.customer_payment_mode_id) + self.contract.write({ + 'recurring_invoices': True, + 'recurring_interval': 1, + 'recurring_invoice_line_ids': [(0, 0, { + 'quantity': 2.0, + 'price_unit': 200.0, + 'name': 'Database Administration 25', + 'product_id': self.product.id, + 'uom_id': self.product.uom_id.id, + })] + }) + res = self.contract._prepare_invoice_data(self.contract) + self.assertEqual(res.get('partner_id'), self.contract.partner_id.id) + self.assertEqual(res.get('payment_mode_id'), + self.contract.payment_mode_id.id) + self.contract.recurring_create_invoice() + new_invoice = self.env['account.invoice'].search([ + ('contract_id', '=', self.contract.id) + ]) + self.assertEqual(len(new_invoice.ids), 1) + self.contract.recurring_create_invoice() + self.assertEqual(self.contract.payment_mode_id, + new_invoice.payment_mode_id) diff --git a/contract_payment_mode/tests/test_contract_payment_init.py b/contract_payment_mode/tests/test_contract_payment_init.py deleted file mode 100644 index 2056a162d8..0000000000 --- a/contract_payment_mode/tests/test_contract_payment_init.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# © 2015 Antiun Ingenieria S.L. - Antonio Espinosa -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from openerp.tests.common import TransactionCase -from ..hooks import post_init_hook - - -class TestContractPaymentInit(TransactionCase): - # Use case : Prepare some data for current test case - def setUp(self): - super(TestContractPaymentInit, self).setUp() - self.payment_mode = self.env.ref('account_payment.payment_mode_1') - self.partner = self.env['res.partner'].create({ - 'name': 'Test contract partner', - 'customer_payment_mode': self.payment_mode.id, - }) - - def _contract_payment_mode_id(self, contract_id): - contract = self.env['account.analytic.account'].search([ - ('id', '=', contract_id), - ]) - return contract.payment_mode_id.id - - def test_post_init_hook(self): - contract = self.env['account.analytic.account'].create({ - 'name': 'Test contract', - 'type': 'contract', - 'partner_id': self.partner.id, - 'payment_mode_id': self.payment_mode.id, - }) - self.assertEqual(self._contract_payment_mode_id(contract.id), - self.payment_mode.id) - - contract.payment_mode_id = False - self.assertEqual(self._contract_payment_mode_id(contract.id), False) - - post_init_hook(self.cr, self.env) - self.assertEqual(self._contract_payment_mode_id(contract.id), - self.payment_mode.id) diff --git a/contract_payment_mode/views/contract_view.xml b/contract_payment_mode/views/contract_view.xml index 4f488e4526..7be6a65e28 100644 --- a/contract_payment_mode/views/contract_view.xml +++ b/contract_payment_mode/views/contract_view.xml @@ -1,42 +1,39 @@ - - + - - account.analytic.account.payment.form - account.analytic.account - - - - - - - + + account.analytic.account.payment.form + account.analytic.account + + + + + + + - - - account.analytic.account.payment.list - account.analytic.account - - - - - + + + account.analytic.account.payment.list + account.analytic.account + + + + - + + - - - account.analytic.account.payment.search - account.analytic.account - - - - - + + + account.analytic.account.search + account.analytic.account + + + + - + + - - \ No newline at end of file + From 644789101691b0cb186a27d67697af074165db7d Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Mon, 1 May 2017 17:51:34 +0200 Subject: [PATCH 06/45] OCA Transbot updated translations from Transifex --- contract_payment_mode/i18n/ca.po | 16 ++++++++------- contract_payment_mode/i18n/de.po | 14 +++++++------- contract_payment_mode/i18n/es.po | 22 +++++++++++---------- contract_payment_mode/i18n/fi.po | 14 +++++++------- contract_payment_mode/i18n/fr.po | 14 +++++++------- contract_payment_mode/i18n/gl.po | 30 +++++++++++++++++++++++++++++ contract_payment_mode/i18n/hr.po | 29 ++++++++++++++++++++++++++++ contract_payment_mode/i18n/hr_HR.po | 29 ++++++++++++++++++++++++++++ contract_payment_mode/i18n/hu.po | 29 ++++++++++++++++++++++++++++ contract_payment_mode/i18n/it.po | 30 +++++++++++++++++++++++++++++ contract_payment_mode/i18n/nl.po | 30 +++++++++++++++++++++++++++++ contract_payment_mode/i18n/pt.po | 29 ++++++++++++++++++++++++++++ contract_payment_mode/i18n/pt_BR.po | 14 +++++++------- contract_payment_mode/i18n/pt_PT.po | 29 ++++++++++++++++++++++++++++ contract_payment_mode/i18n/ro.po | 29 ++++++++++++++++++++++++++++ contract_payment_mode/i18n/sl.po | 14 +++++++------- contract_payment_mode/i18n/zh_CN.po | 29 ++++++++++++++++++++++++++++ 17 files changed, 349 insertions(+), 52 deletions(-) create mode 100644 contract_payment_mode/i18n/gl.po create mode 100644 contract_payment_mode/i18n/hr.po create mode 100644 contract_payment_mode/i18n/hr_HR.po create mode 100644 contract_payment_mode/i18n/hu.po create mode 100644 contract_payment_mode/i18n/it.po create mode 100644 contract_payment_mode/i18n/nl.po create mode 100644 contract_payment_mode/i18n/pt.po create mode 100644 contract_payment_mode/i18n/pt_PT.po create mode 100644 contract_payment_mode/i18n/ro.po create mode 100644 contract_payment_mode/i18n/zh_CN.po diff --git a/contract_payment_mode/i18n/ca.po b/contract_payment_mode/i18n/ca.po index acfc4e7944..956d5a6277 100644 --- a/contract_payment_mode/i18n/ca.po +++ b/contract_payment_mode/i18n/ca.po @@ -3,14 +3,16 @@ # * contract_payment_mode # # Translators: +# OCA Transbot , 2017 +# Marc Tormo i Bochaca , 2017 msgid "" msgstr "" -"Project-Id-Version: contract (8.0)\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 18:39+0000\n" -"PO-Revision-Date: 2015-11-07 12:33+0000\n" -"Last-Translator: <>\n" -"Language-Team: Catalan (http://www.transifex.com/oca/OCA-contract-8-0/language/ca/)\n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: Marc Tormo i Bochaca , 2017\n" +"Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,6 +25,6 @@ msgid "Analytic Account" msgstr "Compte analític" #. module: contract_payment_mode -#: field:account.analytic.account,payment_mode_id:0 +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id msgid "Payment Mode" -msgstr "" +msgstr "Forma de pagament " diff --git a/contract_payment_mode/i18n/de.po b/contract_payment_mode/i18n/de.po index a447c68831..ac58a9e6ac 100644 --- a/contract_payment_mode/i18n/de.po +++ b/contract_payment_mode/i18n/de.po @@ -3,15 +3,15 @@ # * contract_payment_mode # # Translators: -# Rudolf Schnapka , 2015 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: contract (8.0)\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-30 01:38+0000\n" -"PO-Revision-Date: 2015-11-25 09:20+0000\n" -"Last-Translator: Rudolf Schnapka \n" -"Language-Team: German (http://www.transifex.com/oca/OCA-contract-8-0/language/de/)\n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -24,6 +24,6 @@ msgid "Analytic Account" msgstr "Kostenstelle" #. module: contract_payment_mode -#: field:account.analytic.account,payment_mode_id:0 +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id msgid "Payment Mode" msgstr "Zahlweise" diff --git a/contract_payment_mode/i18n/es.po b/contract_payment_mode/i18n/es.po index de6fc59af4..d9d345b957 100644 --- a/contract_payment_mode/i18n/es.po +++ b/contract_payment_mode/i18n/es.po @@ -1,19 +1,22 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * contract_payment_mode -# +# * contract_payment_mode +# +# Translators: +# OCA Transbot , 2017 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: 2015-10-16 08:32+0000\n" -"PO-Revision-Date: 2015-10-16 08:32+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: OCA Transbot , 2017\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: contract_payment_mode #: model:ir.model,name:contract_payment_mode.model_account_analytic_account @@ -21,7 +24,6 @@ msgid "Analytic Account" msgstr "Cuenta analítica" #. module: contract_payment_mode -#: field:account.analytic.account,payment_mode_id:0 +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id msgid "Payment Mode" msgstr "Modo de pago" - diff --git a/contract_payment_mode/i18n/fi.po b/contract_payment_mode/i18n/fi.po index a8774cdc27..b376969b32 100644 --- a/contract_payment_mode/i18n/fi.po +++ b/contract_payment_mode/i18n/fi.po @@ -3,15 +3,15 @@ # * contract_payment_mode # # Translators: -# Jarmo Kortetjärvi , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: contract (8.0)\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-28 11:00+0000\n" -"PO-Revision-Date: 2016-07-08 10:45+0000\n" -"Last-Translator: Jarmo Kortetjärvi \n" -"Language-Team: Finnish (http://www.transifex.com/oca/OCA-contract-8-0/language/fi/)\n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -24,6 +24,6 @@ msgid "Analytic Account" msgstr "Analyyttinen tili" #. module: contract_payment_mode -#: field:account.analytic.account,payment_mode_id:0 +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id msgid "Payment Mode" msgstr "Maksutapa" diff --git a/contract_payment_mode/i18n/fr.po b/contract_payment_mode/i18n/fr.po index 2f73f80b2d..119f07d2c0 100644 --- a/contract_payment_mode/i18n/fr.po +++ b/contract_payment_mode/i18n/fr.po @@ -3,15 +3,15 @@ # * contract_payment_mode # # Translators: -# Christophe CHAUVET , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: contract (8.0)\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-30 10:34+0000\n" -"PO-Revision-Date: 2016-05-19 16:11+0000\n" -"Last-Translator: Christophe CHAUVET \n" -"Language-Team: French (http://www.transifex.com/oca/OCA-contract-8-0/language/fr/)\n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: OCA Transbot , 2017\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" @@ -24,6 +24,6 @@ msgid "Analytic Account" msgstr "Compte analytique" #. module: contract_payment_mode -#: field:account.analytic.account,payment_mode_id:0 +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id msgid "Payment Mode" msgstr "Mode de paiement" diff --git a/contract_payment_mode/i18n/gl.po b/contract_payment_mode/i18n/gl.po new file mode 100644 index 0000000000..89e4bb0657 --- /dev/null +++ b/contract_payment_mode/i18n/gl.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# César Castro Cruz , 2017 +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: gl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Conta analítica" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +msgid "Payment Mode" +msgstr "Modo de pagamento" diff --git a/contract_payment_mode/i18n/hr.po b/contract_payment_mode/i18n/hr.po new file mode 100644 index 0000000000..3a6f844311 --- /dev/null +++ b/contract_payment_mode/i18n/hr.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Analitički konto" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +msgid "Payment Mode" +msgstr "" diff --git a/contract_payment_mode/i18n/hr_HR.po b/contract_payment_mode/i18n/hr_HR.po new file mode 100644 index 0000000000..e7566b42da --- /dev/null +++ b/contract_payment_mode/i18n/hr_HR.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# Bole , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: Bole , 2017\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr_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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Konto analitike" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +msgid "Payment Mode" +msgstr "" diff --git a/contract_payment_mode/i18n/hu.po b/contract_payment_mode/i18n/hu.po new file mode 100644 index 0000000000..15c265018d --- /dev/null +++ b/contract_payment_mode/i18n/hu.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Analitikus gyűjtőkód könyvelés" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +msgid "Payment Mode" +msgstr "" diff --git a/contract_payment_mode/i18n/it.po b/contract_payment_mode/i18n/it.po new file mode 100644 index 0000000000..e00284f7dd --- /dev/null +++ b/contract_payment_mode/i18n/it.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# Nicola Malcontenti , 2017 +# Stefano , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: Stefano , 2017\n" +"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Conto Analitico" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +msgid "Payment Mode" +msgstr "Modo di pagamento" diff --git a/contract_payment_mode/i18n/nl.po b/contract_payment_mode/i18n/nl.po new file mode 100644 index 0000000000..9a3f0e7ddd --- /dev/null +++ b/contract_payment_mode/i18n/nl.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# OCA Transbot , 2017 +# Erwin van der Ploeg , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: Erwin van der Ploeg , 2017\n" +"Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Kostenplaats" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +msgid "Payment Mode" +msgstr "Betaalmode" diff --git a/contract_payment_mode/i18n/pt.po b/contract_payment_mode/i18n/pt.po new file mode 100644 index 0000000000..bb0f69b8d1 --- /dev/null +++ b/contract_payment_mode/i18n/pt.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: pt\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Conta Analítica" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +msgid "Payment Mode" +msgstr "" diff --git a/contract_payment_mode/i18n/pt_BR.po b/contract_payment_mode/i18n/pt_BR.po index 028007082b..c8835dc099 100644 --- a/contract_payment_mode/i18n/pt_BR.po +++ b/contract_payment_mode/i18n/pt_BR.po @@ -3,15 +3,15 @@ # * contract_payment_mode # # Translators: -# danimaribeiro , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: contract (8.0)\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-08 01:39+0000\n" -"PO-Revision-Date: 2016-03-05 18:19+0000\n" -"Last-Translator: danimaribeiro \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-contract-8-0/language/pt_BR/)\n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: OCA Transbot , 2017\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" @@ -24,6 +24,6 @@ msgid "Analytic Account" msgstr "Conta Analítica" #. module: contract_payment_mode -#: field:account.analytic.account,payment_mode_id:0 +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id msgid "Payment Mode" msgstr "Modo de pagamento" diff --git a/contract_payment_mode/i18n/pt_PT.po b/contract_payment_mode/i18n/pt_PT.po new file mode 100644 index 0000000000..5030f57219 --- /dev/null +++ b/contract_payment_mode/i18n/pt_PT.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# Daniel Reis , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: Daniel Reis , 2017\n" +"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Conta Analítica" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +msgid "Payment Mode" +msgstr "" diff --git a/contract_payment_mode/i18n/ro.po b/contract_payment_mode/i18n/ro.po new file mode 100644 index 0000000000..4b86948be9 --- /dev/null +++ b/contract_payment_mode/i18n/ro.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Cont analitic" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +msgid "Payment Mode" +msgstr "" diff --git a/contract_payment_mode/i18n/sl.po b/contract_payment_mode/i18n/sl.po index 36bd545756..0239072e7f 100644 --- a/contract_payment_mode/i18n/sl.po +++ b/contract_payment_mode/i18n/sl.po @@ -3,15 +3,15 @@ # * contract_payment_mode # # Translators: -# Matjaž Mozetič , 2015 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: contract (8.0)\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-13 18:42+0000\n" -"PO-Revision-Date: 2015-11-08 05:37+0000\n" -"Last-Translator: Matjaž Mozetič \n" -"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-contract-8-0/language/sl/)\n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: OCA Transbot , 2017\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" @@ -24,6 +24,6 @@ msgid "Analytic Account" msgstr "Analitični konto" #. module: contract_payment_mode -#: field:account.analytic.account,payment_mode_id:0 +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id msgid "Payment Mode" msgstr "Način plačila" diff --git a/contract_payment_mode/i18n/zh_CN.po b/contract_payment_mode/i18n/zh_CN.po new file mode 100644 index 0000000000..1dabc13ad0 --- /dev/null +++ b/contract_payment_mode/i18n/zh_CN.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# ITGeeker , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"Last-Translator: ITGeeker , 2017\n" +"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "核算科目" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +msgid "Payment Mode" +msgstr "支付方式" From 42cf6369748c25c504c95bdf1d36bc0296e5d11e Mon Sep 17 00:00:00 2001 From: David Vidal Date: Thu, 25 May 2017 10:47:35 +0200 Subject: [PATCH 07/45] [MIG] contract_payment_mode: Migration to 10.0 --- contract_payment_mode/README.rst | 5 +- contract_payment_mode/__init__.py | 1 - .../{__openerp__.py => __manifest__.py} | 3 +- contract_payment_mode/hooks.py | 2 +- contract_payment_mode/models/contract.py | 14 +++--- .../tests/test_contract_payment.py | 47 +++++++++++-------- 6 files changed, 39 insertions(+), 33 deletions(-) rename contract_payment_mode/{__openerp__.py => __manifest__.py} (91%) diff --git a/contract_payment_mode/README.rst b/contract_payment_mode/README.rst index c28b1c278c..7b5a1fed17 100644 --- a/contract_payment_mode/README.rst +++ b/contract_payment_mode/README.rst @@ -17,7 +17,7 @@ Your user should be a Sales Manager or Accountant. Usage ===== -#. Go to *Sales > Sales > Contracts*. +#. Go to *Accounting > Sales > Contracts*. #. Create one. #. Select a partner to which invoice. #. If the partner has a payment mode, this payment mode is selected here. @@ -30,7 +30,7 @@ Usage .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/110/9.0 + :target: https://runbot.odoo-community.org/runbot/110/10.0 Bug Tracker =========== @@ -49,6 +49,7 @@ Contributors * Ángel Moya * Antonio Espinosa * Vicent Cubells +* David Vidal Maintainer diff --git a/contract_payment_mode/__init__.py b/contract_payment_mode/__init__.py index ca40b1d9f3..c8000a8a41 100644 --- a/contract_payment_mode/__init__.py +++ b/contract_payment_mode/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/contract_payment_mode/__openerp__.py b/contract_payment_mode/__manifest__.py similarity index 91% rename from contract_payment_mode/__openerp__.py rename to contract_payment_mode/__manifest__.py index 8b0c2a5b70..db2f3955cf 100644 --- a/contract_payment_mode/__openerp__.py +++ b/contract_payment_mode/__manifest__.py @@ -2,12 +2,13 @@ # Copyright 2015 Domatix () # Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa # Copyright 2017 Tecnativa - Vicent Cubells +# Copyright 2017 Tecnativa - David Vidal # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Contract Payment Mode', 'summary': 'Payment mode in contracts and their invoices', - 'version': '9.0.1.0.0', + 'version': '10.0.1.0.0', 'author': 'Domatix, ' 'Tecnativa, ' 'Odoo Community Association (OCA)', diff --git a/contract_payment_mode/hooks.py b/contract_payment_mode/hooks.py index 1a5795eefe..a1d2bae741 100644 --- a/contract_payment_mode/hooks.py +++ b/contract_payment_mode/hooks.py @@ -2,7 +2,7 @@ # Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import api, SUPERUSER_ID +from odoo import api, SUPERUSER_ID import logging _logger = logging.getLogger(__name__) diff --git a/contract_payment_mode/models/contract.py b/contract_payment_mode/models/contract.py index 60ab668419..2e1b71ead6 100644 --- a/contract_payment_mode/models/contract.py +++ b/contract_payment_mode/models/contract.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from openerp import api, fields, models +from odoo import api, fields, models class AccountAnalyticAccount(models.Model): @@ -16,12 +16,10 @@ def on_change_partner_id(self): if self.partner_id.customer_payment_mode_id: self.payment_mode_id = self.partner_id.customer_payment_mode_id.id - @api.model - def _prepare_invoice_data(self, contract): + @api.multi + def _prepare_invoice(self): invoice_vals = super(AccountAnalyticAccount, self)._prepare_invoice() - if contract.payment_mode_id: - invoice_vals['payment_mode_id'] = contract.payment_mode_id.id - invoice_vals['partner_bank_id'] = ( - contract.partner_id.bank_ids[:1].id - ) + if self.payment_mode_id: + invoice_vals['payment_mode_id'] = self.payment_mode_id.id + invoice_vals['partner_bank_id'] = self.partner_id.bank_ids[:1].id return invoice_vals diff --git a/contract_payment_mode/tests/test_contract_payment.py b/contract_payment_mode/tests/test_contract_payment.py index d5c41106aa..c3fc3e0d15 100644 --- a/contract_payment_mode/tests/test_contract_payment.py +++ b/contract_payment_mode/tests/test_contract_payment.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- # Copyright 2015 Antiun Ingenieria S.L. - Antonio Espinosa # Copyright 2017 Tecnativa - Vicent Cubells +# Copyright 2017 Tecnativa - David Vidal # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp.tests import common +from odoo.tests import common from ..hooks import post_init_hook @@ -12,10 +13,17 @@ class TestContractPaymentInit(common.SavepointCase): def setUpClass(cls): super(TestContractPaymentInit, cls).setUpClass() - cls.payment_method = cls.env.ref( - 'account.account_payment_method_manual_in') - cls.payment_mode = cls.env.ref( - 'account_payment_mode.payment_mode_inbound_ct1') + cls.payment_method = cls.env['account.payment.method'].create({ + 'name': 'Test Payment Method', + 'code': 'Test', + 'payment_type': 'inbound', + }) + cls.payment_mode = cls.env['account.payment.mode'].create({ + 'name': 'Test payment mode', + 'active': True, + 'payment_method_id': cls.payment_method.id, + 'bank_account_link': 'variable', + }) cls.partner = cls.env['res.partner'].create({ 'name': 'Test contract partner', 'customer_payment_mode_id': cls.payment_mode, @@ -30,12 +38,12 @@ def setUpClass(cls): cls.contract = cls.env['account.analytic.account'].create({ 'name': 'Maintenance of Servers', }) - - def _contract_payment_mode_id(self, contract_id): - contract = self.env['account.analytic.account'].search([ - ('id', '=', contract_id), - ]) - return contract.payment_mode_id.id + company = cls.env.ref('base.main_company') + cls.journal = cls.env['account.journal'].create({ + 'name': 'Sale Journal - Test', + 'code': 'HRTSJ', + 'type': 'sale', + 'company_id': company.id}) def test_post_init_hook(self): contract = self.env['account.analytic.account'].create({ @@ -43,15 +51,15 @@ def test_post_init_hook(self): 'partner_id': self.partner.id, 'payment_mode_id': self.payment_mode.id, }) - self.assertEqual(self._contract_payment_mode_id(contract.id), - self.payment_mode.id) + self.assertEqual(contract.payment_mode_id, + self.payment_mode) contract.payment_mode_id = False - self.assertEqual(self._contract_payment_mode_id(contract.id), False) + self.assertEqual(contract.payment_mode_id.id, False) post_init_hook(self.cr, self.env) - self.assertEqual(self._contract_payment_mode_id(contract.id), - self.payment_mode.id) + self.assertEqual(contract.payment_mode_id, + self.payment_mode) def test_contract_and_invoices(self): self.contract.write({'partner_id': self.partner.id}) @@ -69,14 +77,13 @@ def test_contract_and_invoices(self): 'uom_id': self.product.uom_id.id, })] }) - res = self.contract._prepare_invoice_data(self.contract) - self.assertEqual(res.get('partner_id'), self.contract.partner_id.id) - self.assertEqual(res.get('payment_mode_id'), - self.contract.payment_mode_id.id) self.contract.recurring_create_invoice() new_invoice = self.env['account.invoice'].search([ ('contract_id', '=', self.contract.id) ]) + self.assertEqual(new_invoice.partner_id, self.contract.partner_id) + self.assertEqual(new_invoice.payment_mode_id, + self.contract.payment_mode_id) self.assertEqual(len(new_invoice.ids), 1) self.contract.recurring_create_invoice() self.assertEqual(self.contract.payment_mode_id, From 1314c32ae433859a29cb94ce0427f255d917acc2 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 17 Jun 2017 03:12:34 +0200 Subject: [PATCH 08/45] OCA Transbot updated translations from Transifex --- contract_payment_mode/i18n/hr_HR.po | 9 +++++---- contract_payment_mode/i18n/pt.po | 11 ++++++----- contract_payment_mode/i18n/tr.po | 29 +++++++++++++++++++++++++++++ contract_payment_mode/i18n/tr_TR.po | 29 +++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 contract_payment_mode/i18n/tr.po create mode 100644 contract_payment_mode/i18n/tr_TR.po diff --git a/contract_payment_mode/i18n/hr_HR.po b/contract_payment_mode/i18n/hr_HR.po index e7566b42da..b13d331147 100644 --- a/contract_payment_mode/i18n/hr_HR.po +++ b/contract_payment_mode/i18n/hr_HR.po @@ -3,13 +3,14 @@ # * contract_payment_mode # # Translators: +# OCA Transbot , 2017 # Bole , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" -"PO-Revision-Date: 2017-04-01 02:46+0000\n" +"POT-Creation-Date: 2017-06-17 01:39+0000\n" +"PO-Revision-Date: 2017-06-17 01:39+0000\n" "Last-Translator: Bole , 2017\n" "Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -26,4 +27,4 @@ msgstr "Konto analitike" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id msgid "Payment Mode" -msgstr "" +msgstr "Način plaćanja" diff --git a/contract_payment_mode/i18n/pt.po b/contract_payment_mode/i18n/pt.po index bb0f69b8d1..8d48fc4aea 100644 --- a/contract_payment_mode/i18n/pt.po +++ b/contract_payment_mode/i18n/pt.po @@ -4,13 +4,14 @@ # # Translators: # OCA Transbot , 2017 +# Pedro Castro Silva , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" -"PO-Revision-Date: 2017-04-01 02:46+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"POT-Creation-Date: 2017-07-15 01:24+0000\n" +"PO-Revision-Date: 2017-07-15 01:24+0000\n" +"Last-Translator: Pedro Castro Silva , 2017\n" "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,4 +27,4 @@ msgstr "Conta Analítica" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id msgid "Payment Mode" -msgstr "" +msgstr "Modo de Pagamento" diff --git a/contract_payment_mode/i18n/tr.po b/contract_payment_mode/i18n/tr.po new file mode 100644 index 0000000000..dc5e710c1d --- /dev/null +++ b/contract_payment_mode/i18n/tr.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# Ediz Duman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-13 02:40+0000\n" +"PO-Revision-Date: 2017-06-13 02:40+0000\n" +"Last-Translator: Ediz Duman , 2017\n" +"Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Analitik Hesap" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +msgid "Payment Mode" +msgstr "" diff --git a/contract_payment_mode/i18n/tr_TR.po b/contract_payment_mode/i18n/tr_TR.po new file mode 100644 index 0000000000..109f88ddb4 --- /dev/null +++ b/contract_payment_mode/i18n/tr_TR.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# Ediz Duman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-13 02:40+0000\n" +"PO-Revision-Date: 2017-06-13 02:40+0000\n" +"Last-Translator: Ediz Duman , 2017\n" +"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Analitik Hesap" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +msgid "Payment Mode" +msgstr "" From 9234c7323150e77869a40fbb94a6e976c2f29851 Mon Sep 17 00:00:00 2001 From: Carlos Dauden Date: Fri, 4 Aug 2017 09:26:15 +0200 Subject: [PATCH 09/45] [IMP] contract_payment_mode: Onchange payment mode vals --- contract_payment_mode/README.rst | 1 + contract_payment_mode/__manifest__.py | 3 ++- contract_payment_mode/models/contract.py | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contract_payment_mode/README.rst b/contract_payment_mode/README.rst index 7b5a1fed17..19a458beff 100644 --- a/contract_payment_mode/README.rst +++ b/contract_payment_mode/README.rst @@ -50,6 +50,7 @@ Contributors * Antonio Espinosa * Vicent Cubells * David Vidal +* Carlos Dauden Maintainer diff --git a/contract_payment_mode/__manifest__.py b/contract_payment_mode/__manifest__.py index db2f3955cf..dea0e71021 100644 --- a/contract_payment_mode/__manifest__.py +++ b/contract_payment_mode/__manifest__.py @@ -3,12 +3,13 @@ # Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa # Copyright 2017 Tecnativa - Vicent Cubells # Copyright 2017 Tecnativa - David Vidal +# Copyright 2017 Tecnativa - Carlos Dauden # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Contract Payment Mode', 'summary': 'Payment mode in contracts and their invoices', - 'version': '10.0.1.0.0', + 'version': '10.0.1.0.1', 'author': 'Domatix, ' 'Tecnativa, ' 'Odoo Community Association (OCA)', diff --git a/contract_payment_mode/models/contract.py b/contract_payment_mode/models/contract.py index 2e1b71ead6..2a5d53ab74 100644 --- a/contract_payment_mode/models/contract.py +++ b/contract_payment_mode/models/contract.py @@ -21,5 +21,7 @@ def _prepare_invoice(self): invoice_vals = super(AccountAnalyticAccount, self)._prepare_invoice() if self.payment_mode_id: invoice_vals['payment_mode_id'] = self.payment_mode_id.id - invoice_vals['partner_bank_id'] = self.partner_id.bank_ids[:1].id + invoice = self.env['account.invoice'].new(invoice_vals) + invoice.payment_mode_id_change() + invoice_vals = invoice._convert_to_write(invoice._cache) return invoice_vals From 54ccdd85d1f273f329a468c758f6d092eeceb9ab Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 19 Aug 2017 03:16:47 +0200 Subject: [PATCH 10/45] OCA Transbot updated translations from Transifex --- contract_payment_mode/i18n/hi_IN.po | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 contract_payment_mode/i18n/hi_IN.po diff --git a/contract_payment_mode/i18n/hi_IN.po b/contract_payment_mode/i18n/hi_IN.po new file mode 100644 index 0000000000..26b2ce796b --- /dev/null +++ b/contract_payment_mode/i18n/hi_IN.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# Ashish Deshmukh , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-08-17 01:05+0000\n" +"PO-Revision-Date: 2017-08-17 01:05+0000\n" +"Last-Translator: Ashish Deshmukh , 2017\n" +"Language-Team: Hindi (India) (https://www.transifex.com/oca/teams/23907/hi_IN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hi_IN\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "विश्लेषणात्मक खाता" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +msgid "Payment Mode" +msgstr "भुगतान का प्रकार" From 570d226297b5df8ea1d647147416e029a98443af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20L=C3=B3pez?= Date: Fri, 10 Nov 2017 05:08:00 +0000 Subject: [PATCH 11/45] =?UTF-8?q?[FIX]=C2=A0contract=5Fpayment=5Fauto:=20F?= =?UTF-8?q?ix=20freze=20wkhtmltopdf=20freezed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/test_contract_payment.py | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/contract_payment_mode/tests/test_contract_payment.py b/contract_payment_mode/tests/test_contract_payment.py index c3fc3e0d15..d5580081e2 100644 --- a/contract_payment_mode/tests/test_contract_payment.py +++ b/contract_payment_mode/tests/test_contract_payment.py @@ -4,42 +4,44 @@ # Copyright 2017 Tecnativa - David Vidal # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo.tests import common +import odoo.tests from ..hooks import post_init_hook -class TestContractPaymentInit(common.SavepointCase): - @classmethod - def setUpClass(cls): - super(TestContractPaymentInit, cls).setUpClass() +@odoo.tests.post_install(True) +@odoo.tests.at_install(False) +class TestContractPaymentInit(odoo.tests.HttpCase): - cls.payment_method = cls.env['account.payment.method'].create({ + def setUp(self): + super(TestContractPaymentInit, self).setUp() + + self.payment_method = self.env['account.payment.method'].create({ 'name': 'Test Payment Method', 'code': 'Test', 'payment_type': 'inbound', }) - cls.payment_mode = cls.env['account.payment.mode'].create({ + self.payment_mode = self.env['account.payment.mode'].create({ 'name': 'Test payment mode', 'active': True, - 'payment_method_id': cls.payment_method.id, + 'payment_method_id': self.payment_method.id, 'bank_account_link': 'variable', }) - cls.partner = cls.env['res.partner'].create({ + self.partner = self.env['res.partner'].create({ 'name': 'Test contract partner', - 'customer_payment_mode_id': cls.payment_mode, + 'customer_payment_mode_id': self.payment_mode, }) - cls.product = cls.env['product.product'].create({ + self.product = self.env['product.product'].create({ 'name': 'Custom Service', 'type': 'service', - 'uom_id': cls.env.ref('product.product_uom_hour').id, - 'uom_po_id': cls.env.ref('product.product_uom_hour').id, + 'uom_id': self.env.ref('product.product_uom_hour').id, + 'uom_po_id': self.env.ref('product.product_uom_hour').id, 'sale_ok': True, }) - cls.contract = cls.env['account.analytic.account'].create({ + self.contract = self.env['account.analytic.account'].create({ 'name': 'Maintenance of Servers', }) - company = cls.env.ref('base.main_company') - cls.journal = cls.env['account.journal'].create({ + company = self.env.ref('base.main_company') + self.journal = self.env['account.journal'].create({ 'name': 'Sale Journal - Test', 'code': 'HRTSJ', 'type': 'sale', From 8c36dd72f71196a45155ab2fcf5099f1b30826dd Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 3 Mar 2018 04:13:30 +0100 Subject: [PATCH 12/45] OCA Transbot updated translations from Transifex --- contract_payment_mode/i18n/hr.po | 13 +++++++------ contract_payment_mode/i18n/ru.po | 29 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 contract_payment_mode/i18n/ru.po diff --git a/contract_payment_mode/i18n/hr.po b/contract_payment_mode/i18n/hr.po index 3a6f844311..89205e35d2 100644 --- a/contract_payment_mode/i18n/hr.po +++ b/contract_payment_mode/i18n/hr.po @@ -3,14 +3,15 @@ # * contract_payment_mode # # Translators: -# Bole , 2017 +# OCA Transbot , 2017 +# Bole , 2018 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" -"PO-Revision-Date: 2017-04-01 02:46+0000\n" -"Last-Translator: Bole , 2017\n" +"POT-Creation-Date: 2018-02-10 03:15+0000\n" +"PO-Revision-Date: 2018-02-10 03:15+0000\n" +"Last-Translator: Bole , 2018\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,4 +27,4 @@ msgstr "Analitički konto" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id msgid "Payment Mode" -msgstr "" +msgstr "Način plaćanja" diff --git a/contract_payment_mode/i18n/ru.po b/contract_payment_mode/i18n/ru.po new file mode 100644 index 0000000000..0f08a8dc6d --- /dev/null +++ b/contract_payment_mode/i18n/ru.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +# Translators: +# nek, 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-03-17 03:26+0000\n" +"PO-Revision-Date: 2018-03-17 03:26+0000\n" +"Last-Translator: nek, 2018\n" +"Language-Team: Russian (https://www.transifex.com/oca/teams/23907/ru/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ru\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "Аналитический счет" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +msgid "Payment Mode" +msgstr "" From 4a457024ad071daee44d71727fc5eb84362c3415 Mon Sep 17 00:00:00 2001 From: cubells Date: Thu, 17 May 2018 13:33:19 +0200 Subject: [PATCH 13/45] [MIG] contract_payment_mode: Migration to 11.0 --- contract_payment_mode/README.rst | 2 +- contract_payment_mode/__init__.py | 1 - contract_payment_mode/__manifest__.py | 5 ++--- contract_payment_mode/hooks.py | 1 - contract_payment_mode/models/__init__.py | 1 - contract_payment_mode/models/contract.py | 6 ++---- contract_payment_mode/tests/__init__.py | 1 - contract_payment_mode/tests/test_contract_payment.py | 1 - contract_payment_mode/views/contract_view.xml | 2 +- 9 files changed, 6 insertions(+), 14 deletions(-) diff --git a/contract_payment_mode/README.rst b/contract_payment_mode/README.rst index 19a458beff..8b9bb46f1c 100644 --- a/contract_payment_mode/README.rst +++ b/contract_payment_mode/README.rst @@ -30,7 +30,7 @@ Usage .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/110/10.0 + :target: https://runbot.odoo-community.org/runbot/110/11.0 Bug Tracker =========== diff --git a/contract_payment_mode/__init__.py b/contract_payment_mode/__init__.py index c8000a8a41..801a8cbb3f 100644 --- a/contract_payment_mode/__init__.py +++ b/contract_payment_mode/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/contract_payment_mode/__manifest__.py b/contract_payment_mode/__manifest__.py index dea0e71021..2f1655b166 100644 --- a/contract_payment_mode/__manifest__.py +++ b/contract_payment_mode/__manifest__.py @@ -1,15 +1,14 @@ -# -*- coding: utf-8 -*- # Copyright 2015 Domatix () # Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa -# Copyright 2017 Tecnativa - Vicent Cubells # Copyright 2017 Tecnativa - David Vidal # Copyright 2017 Tecnativa - Carlos Dauden +# Copyright 2017-2018 Tecnativa - Vicent Cubells # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Contract Payment Mode', 'summary': 'Payment mode in contracts and their invoices', - 'version': '10.0.1.0.1', + 'version': '11.0.1.0.0', 'author': 'Domatix, ' 'Tecnativa, ' 'Odoo Community Association (OCA)', diff --git a/contract_payment_mode/hooks.py b/contract_payment_mode/hooks.py index a1d2bae741..db75d33cf7 100644 --- a/contract_payment_mode/hooks.py +++ b/contract_payment_mode/hooks.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/contract_payment_mode/models/__init__.py b/contract_payment_mode/models/__init__.py index b82ea8779b..99a5468ac8 100644 --- a/contract_payment_mode/models/__init__.py +++ b/contract_payment_mode/models/__init__.py @@ -1,2 +1 @@ -# -*- coding: utf-8 -*- from . import contract diff --git a/contract_payment_mode/models/contract.py b/contract_payment_mode/models/contract.py index 2a5d53ab74..cdd58fd181 100644 --- a/contract_payment_mode/models/contract.py +++ b/contract_payment_mode/models/contract.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from odoo import api, fields, models @@ -13,8 +12,7 @@ class AccountAnalyticAccount(models.Model): @api.onchange('partner_id') def on_change_partner_id(self): - if self.partner_id.customer_payment_mode_id: - self.payment_mode_id = self.partner_id.customer_payment_mode_id.id + self.payment_mode_id = self.partner_id.customer_payment_mode_id.id @api.multi def _prepare_invoice(self): @@ -22,6 +20,6 @@ def _prepare_invoice(self): if self.payment_mode_id: invoice_vals['payment_mode_id'] = self.payment_mode_id.id invoice = self.env['account.invoice'].new(invoice_vals) - invoice.payment_mode_id_change() + invoice._onchange_payment_mode_id() invoice_vals = invoice._convert_to_write(invoice._cache) return invoice_vals diff --git a/contract_payment_mode/tests/__init__.py b/contract_payment_mode/tests/__init__.py index 3715e52336..af96dda7e3 100644 --- a/contract_payment_mode/tests/__init__.py +++ b/contract_payment_mode/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/contract_payment_mode/tests/test_contract_payment.py b/contract_payment_mode/tests/test_contract_payment.py index d5580081e2..5bbb46c0c5 100644 --- a/contract_payment_mode/tests/test_contract_payment.py +++ b/contract_payment_mode/tests/test_contract_payment.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2015 Antiun Ingenieria S.L. - Antonio Espinosa # Copyright 2017 Tecnativa - Vicent Cubells # Copyright 2017 Tecnativa - David Vidal diff --git a/contract_payment_mode/views/contract_view.xml b/contract_payment_mode/views/contract_view.xml index 7be6a65e28..4d046f5d5a 100644 --- a/contract_payment_mode/views/contract_view.xml +++ b/contract_payment_mode/views/contract_view.xml @@ -1,4 +1,4 @@ - + From f3c4caad252655d575aef99fa2ade8d0f63f7af4 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 21 Jun 2018 18:28:49 +0000 Subject: [PATCH 14/45] [UPD] Update contract_payment_mode.pot --- contract_payment_mode/i18n/ca.po | 5 ++-- .../i18n/contract_payment_mode.pot | 26 +++++++++++++++++++ contract_payment_mode/i18n/de.po | 5 ++-- contract_payment_mode/i18n/el_GR.po | 10 ++++--- contract_payment_mode/i18n/es.po | 5 ++-- contract_payment_mode/i18n/es_MX.po | 10 ++++--- contract_payment_mode/i18n/fi.po | 5 ++-- contract_payment_mode/i18n/fr.po | 5 ++-- contract_payment_mode/i18n/gl.po | 5 ++-- contract_payment_mode/i18n/hi_IN.po | 8 +++--- contract_payment_mode/i18n/hr.po | 8 +++--- contract_payment_mode/i18n/hr_HR.po | 11 +++++--- contract_payment_mode/i18n/hu.po | 5 ++-- contract_payment_mode/i18n/it.po | 5 ++-- contract_payment_mode/i18n/nl.po | 5 ++-- contract_payment_mode/i18n/pt.po | 5 ++-- contract_payment_mode/i18n/pt_BR.po | 8 +++--- contract_payment_mode/i18n/pt_PT.po | 8 +++--- contract_payment_mode/i18n/ro.po | 8 +++--- contract_payment_mode/i18n/ru.po | 9 ++++--- contract_payment_mode/i18n/sk_SK.po | 10 ++++--- contract_payment_mode/i18n/sl.po | 8 +++--- contract_payment_mode/i18n/tr.po | 5 ++-- contract_payment_mode/i18n/tr_TR.po | 8 +++--- contract_payment_mode/i18n/zh_CN.po | 8 +++--- 25 files changed, 130 insertions(+), 65 deletions(-) create mode 100644 contract_payment_mode/i18n/contract_payment_mode.pot diff --git a/contract_payment_mode/i18n/ca.po b/contract_payment_mode/i18n/ca.po index 956d5a6277..82e6e1d65c 100644 --- a/contract_payment_mode/i18n/ca.po +++ b/contract_payment_mode/i18n/ca.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # OCA Transbot , 2017 # Marc Tormo i Bochaca , 2017 @@ -13,10 +13,10 @@ msgstr "" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: Marc Tormo i Bochaca , 2017\n" "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" +"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: contract_payment_mode @@ -26,5 +26,6 @@ msgstr "Compte analític" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "Forma de pagament " diff --git a/contract_payment_mode/i18n/contract_payment_mode.pot b/contract_payment_mode/i18n/contract_payment_mode.pot new file mode 100644 index 0000000000..874dfd7c2b --- /dev/null +++ b/contract_payment_mode/i18n/contract_payment_mode.pot @@ -0,0 +1,26 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \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: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_account_analytic_account +msgid "Analytic Account" +msgstr "" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +msgid "Payment Mode" +msgstr "" + diff --git a/contract_payment_mode/i18n/de.po b/contract_payment_mode/i18n/de.po index ac58a9e6ac..da61fca7f1 100644 --- a/contract_payment_mode/i18n/de.po +++ b/contract_payment_mode/i18n/de.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"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: contract_payment_mode @@ -25,5 +25,6 @@ msgstr "Kostenstelle" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "Zahlweise" diff --git a/contract_payment_mode/i18n/el_GR.po b/contract_payment_mode/i18n/el_GR.po index 158f6686d4..d7fa420e0f 100644 --- a/contract_payment_mode/i18n/el_GR.po +++ b/contract_payment_mode/i18n/el_GR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: msgid "" msgstr "" @@ -10,11 +10,12 @@ msgstr "" "POT-Creation-Date: 2016-11-07 03:42+0000\n" "PO-Revision-Date: 2015-11-07 12:33+0000\n" "Last-Translator: <>\n" -"Language-Team: Greek (Greece) (http://www.transifex.com/oca/OCA-contract-8-0/language/el_GR/)\n" +"Language-Team: Greek (Greece) (http://www.transifex.com/oca/OCA-contract-8-0/" +"language/el_GR/)\n" +"Language: el_GR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: el_GR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode @@ -23,6 +24,7 @@ msgid "Analytic Account" msgstr "Αναλυτικός Λογαριασμός" #. module: contract_payment_mode -#: field:account.analytic.account,payment_mode_id:0 +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "" diff --git a/contract_payment_mode/i18n/es.po b/contract_payment_mode/i18n/es.po index d9d345b957..4a636ef96c 100644 --- a/contract_payment_mode/i18n/es.po +++ b/contract_payment_mode/i18n/es.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/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: contract_payment_mode @@ -25,5 +25,6 @@ msgstr "Cuenta analítica" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "Modo de pago" diff --git a/contract_payment_mode/i18n/es_MX.po b/contract_payment_mode/i18n/es_MX.po index 2d638f415d..94f80601ae 100644 --- a/contract_payment_mode/i18n/es_MX.po +++ b/contract_payment_mode/i18n/es_MX.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: msgid "" msgstr "" @@ -10,11 +10,12 @@ msgstr "" "POT-Creation-Date: 2016-12-03 01:11+0000\n" "PO-Revision-Date: 2015-11-07 12:33+0000\n" "Last-Translator: <>\n" -"Language-Team: Spanish (Mexico) (http://www.transifex.com/oca/OCA-contract-8-0/language/es_MX/)\n" +"Language-Team: Spanish (Mexico) (http://www.transifex.com/oca/OCA-" +"contract-8-0/language/es_MX/)\n" +"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: contract_payment_mode @@ -23,6 +24,7 @@ msgid "Analytic Account" msgstr "Cuenta analítica" #. module: contract_payment_mode -#: field:account.analytic.account,payment_mode_id:0 +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "" diff --git a/contract_payment_mode/i18n/fi.po b/contract_payment_mode/i18n/fi.po index b376969b32..815f0be08b 100644 --- a/contract_payment_mode/i18n/fi.po +++ b/contract_payment_mode/i18n/fi.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" +"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: contract_payment_mode @@ -25,5 +25,6 @@ msgstr "Analyyttinen tili" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "Maksutapa" diff --git a/contract_payment_mode/i18n/fr.po b/contract_payment_mode/i18n/fr.po index 119f07d2c0..d850a3e56d 100644 --- a/contract_payment_mode/i18n/fr.po +++ b/contract_payment_mode/i18n/fr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"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: contract_payment_mode @@ -25,5 +25,6 @@ msgstr "Compte analytique" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "Mode de paiement" diff --git a/contract_payment_mode/i18n/gl.po b/contract_payment_mode/i18n/gl.po index 89e4bb0657..7171d9c065 100644 --- a/contract_payment_mode/i18n/gl.po +++ b/contract_payment_mode/i18n/gl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # César Castro Cruz , 2017 # OCA Transbot , 2017 @@ -13,10 +13,10 @@ msgstr "" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode @@ -26,5 +26,6 @@ msgstr "Conta analítica" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "Modo de pagamento" diff --git a/contract_payment_mode/i18n/hi_IN.po b/contract_payment_mode/i18n/hi_IN.po index 26b2ce796b..c578cd97e4 100644 --- a/contract_payment_mode/i18n/hi_IN.po +++ b/contract_payment_mode/i18n/hi_IN.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # Ashish Deshmukh , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-08-17 01:05+0000\n" "PO-Revision-Date: 2017-08-17 01:05+0000\n" "Last-Translator: Ashish Deshmukh , 2017\n" -"Language-Team: Hindi (India) (https://www.transifex.com/oca/teams/23907/hi_IN/)\n" +"Language-Team: Hindi (India) (https://www.transifex.com/oca/teams/23907/" +"hi_IN/)\n" +"Language: hi_IN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hi_IN\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode @@ -25,5 +26,6 @@ msgstr "विश्लेषणात्मक खाता" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "भुगतान का प्रकार" diff --git a/contract_payment_mode/i18n/hr.po b/contract_payment_mode/i18n/hr.po index 89205e35d2..0b3f76a76d 100644 --- a/contract_payment_mode/i18n/hr.po +++ b/contract_payment_mode/i18n/hr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # OCA Transbot , 2017 # Bole , 2018 @@ -13,11 +13,12 @@ msgstr "" "PO-Revision-Date: 2018-02-10 03:15+0000\n" "Last-Translator: Bole , 2018\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"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" +"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: contract_payment_mode #: model:ir.model,name:contract_payment_mode.model_account_analytic_account @@ -26,5 +27,6 @@ msgstr "Analitički konto" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "Način plaćanja" diff --git a/contract_payment_mode/i18n/hr_HR.po b/contract_payment_mode/i18n/hr_HR.po index b13d331147..f3ea367314 100644 --- a/contract_payment_mode/i18n/hr_HR.po +++ b/contract_payment_mode/i18n/hr_HR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # OCA Transbot , 2017 # Bole , 2017 @@ -12,12 +12,14 @@ msgstr "" "POT-Creation-Date: 2017-06-17 01:39+0000\n" "PO-Revision-Date: 2017-06-17 01:39+0000\n" "Last-Translator: Bole , 2017\n" -"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/" +"hr_HR/)\n" +"Language: hr_HR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr_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" +"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: contract_payment_mode #: model:ir.model,name:contract_payment_mode.model_account_analytic_account @@ -26,5 +28,6 @@ msgstr "Konto analitike" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "Način plaćanja" diff --git a/contract_payment_mode/i18n/hu.po b/contract_payment_mode/i18n/hu.po index 15c265018d..3482ecd1d8 100644 --- a/contract_payment_mode/i18n/hu.po +++ b/contract_payment_mode/i18n/hu.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode @@ -25,5 +25,6 @@ msgstr "Analitikus gyűjtőkód könyvelés" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "" diff --git a/contract_payment_mode/i18n/it.po b/contract_payment_mode/i18n/it.po index e00284f7dd..897a189978 100644 --- a/contract_payment_mode/i18n/it.po +++ b/contract_payment_mode/i18n/it.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # Nicola Malcontenti , 2017 # Stefano , 2017 @@ -13,10 +13,10 @@ msgstr "" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: Stefano , 2017\n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"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: contract_payment_mode @@ -26,5 +26,6 @@ msgstr "Conto Analitico" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "Modo di pagamento" diff --git a/contract_payment_mode/i18n/nl.po b/contract_payment_mode/i18n/nl.po index 9a3f0e7ddd..4632527bad 100644 --- a/contract_payment_mode/i18n/nl.po +++ b/contract_payment_mode/i18n/nl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # OCA Transbot , 2017 # Erwin van der Ploeg , 2017 @@ -13,10 +13,10 @@ msgstr "" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: Erwin van der Ploeg , 2017\n" "Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode @@ -26,5 +26,6 @@ msgstr "Kostenplaats" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "Betaalmode" diff --git a/contract_payment_mode/i18n/pt.po b/contract_payment_mode/i18n/pt.po index 8d48fc4aea..b02eb3b003 100644 --- a/contract_payment_mode/i18n/pt.po +++ b/contract_payment_mode/i18n/pt.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # OCA Transbot , 2017 # Pedro Castro Silva , 2017 @@ -13,10 +13,10 @@ msgstr "" "PO-Revision-Date: 2017-07-15 01:24+0000\n" "Last-Translator: Pedro Castro Silva , 2017\n" "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode @@ -26,5 +26,6 @@ msgstr "Conta Analítica" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "Modo de Pagamento" diff --git a/contract_payment_mode/i18n/pt_BR.po b/contract_payment_mode/i18n/pt_BR.po index c8835dc099..1c1a742cb9 100644 --- a/contract_payment_mode/i18n/pt_BR.po +++ b/contract_payment_mode/i18n/pt_BR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-04-01 02:46+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" +"teams/23907/pt_BR/)\n" +"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: contract_payment_mode @@ -25,5 +26,6 @@ msgstr "Conta Analítica" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "Modo de pagamento" diff --git a/contract_payment_mode/i18n/pt_PT.po b/contract_payment_mode/i18n/pt_PT.po index 5030f57219..90da07ea09 100644 --- a/contract_payment_mode/i18n/pt_PT.po +++ b/contract_payment_mode/i18n/pt_PT.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # Daniel Reis , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-04-01 02:46+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: Daniel Reis , 2017\n" -"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/pt_PT/)\n" +"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/" +"teams/23907/pt_PT/)\n" +"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: contract_payment_mode @@ -25,5 +26,6 @@ msgstr "Conta Analítica" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "" diff --git a/contract_payment_mode/i18n/ro.po b/contract_payment_mode/i18n/ro.po index 4b86948be9..c73c298e37 100644 --- a/contract_payment_mode/i18n/ro.po +++ b/contract_payment_mode/i18n/ro.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ro\n" -"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" +"2:1));\n" #. module: contract_payment_mode #: model:ir.model,name:contract_payment_mode.model_account_analytic_account @@ -25,5 +26,6 @@ msgstr "Cont analitic" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "" diff --git a/contract_payment_mode/i18n/ru.po b/contract_payment_mode/i18n/ru.po index 0f08a8dc6d..13272d7271 100644 --- a/contract_payment_mode/i18n/ru.po +++ b/contract_payment_mode/i18n/ru.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # nek, 2018 msgid "" @@ -12,11 +12,13 @@ msgstr "" "PO-Revision-Date: 2018-03-17 03:26+0000\n" "Last-Translator: nek, 2018\n" "Language-Team: Russian (https://www.transifex.com/oca/teams/23907/ru/)\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ru\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" +"%100>=11 && n%100<=14)? 2 : 3);\n" #. module: contract_payment_mode #: model:ir.model,name:contract_payment_mode.model_account_analytic_account @@ -25,5 +27,6 @@ msgstr "Аналитический счет" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "" diff --git a/contract_payment_mode/i18n/sk_SK.po b/contract_payment_mode/i18n/sk_SK.po index ed203d2945..aafb3ace06 100644 --- a/contract_payment_mode/i18n/sk_SK.po +++ b/contract_payment_mode/i18n/sk_SK.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: msgid "" msgstr "" @@ -10,11 +10,12 @@ msgstr "" "POT-Creation-Date: 2016-05-21 10:53+0000\n" "PO-Revision-Date: 2015-11-07 12:33+0000\n" "Last-Translator: <>\n" -"Language-Team: Slovak (Slovakia) (http://www.transifex.com/oca/OCA-contract-8-0/language/sk_SK/)\n" +"Language-Team: Slovak (Slovakia) (http://www.transifex.com/oca/OCA-" +"contract-8-0/language/sk_SK/)\n" +"Language: sk_SK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sk_SK\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: contract_payment_mode @@ -23,6 +24,7 @@ msgid "Analytic Account" msgstr "Analytický účet" #. module: contract_payment_mode -#: field:account.analytic.account,payment_mode_id:0 +#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "" diff --git a/contract_payment_mode/i18n/sl.po b/contract_payment_mode/i18n/sl.po index 0239072e7f..6dd3483338 100644 --- a/contract_payment_mode/i18n/sl.po +++ b/contract_payment_mode/i18n/sl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"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" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" #. module: contract_payment_mode #: model:ir.model,name:contract_payment_mode.model_account_analytic_account @@ -25,5 +26,6 @@ msgstr "Analitični konto" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "Način plačila" diff --git a/contract_payment_mode/i18n/tr.po b/contract_payment_mode/i18n/tr.po index dc5e710c1d..a1f7b19806 100644 --- a/contract_payment_mode/i18n/tr.po +++ b/contract_payment_mode/i18n/tr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # Ediz Duman , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-06-13 02:40+0000\n" "Last-Translator: Ediz Duman , 2017\n" "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" +"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: contract_payment_mode @@ -25,5 +25,6 @@ msgstr "Analitik Hesap" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "" diff --git a/contract_payment_mode/i18n/tr_TR.po b/contract_payment_mode/i18n/tr_TR.po index 109f88ddb4..a45963d45d 100644 --- a/contract_payment_mode/i18n/tr_TR.po +++ b/contract_payment_mode/i18n/tr_TR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # Ediz Duman , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-06-13 02:40+0000\n" "PO-Revision-Date: 2017-06-13 02:40+0000\n" "Last-Translator: Ediz Duman , 2017\n" -"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/tr_TR/)\n" +"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/" +"tr_TR/)\n" +"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: contract_payment_mode @@ -25,5 +26,6 @@ msgstr "Analitik Hesap" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "" diff --git a/contract_payment_mode/i18n/zh_CN.po b/contract_payment_mode/i18n/zh_CN.po index 1dabc13ad0..d76dd721fc 100644 --- a/contract_payment_mode/i18n/zh_CN.po +++ b/contract_payment_mode/i18n/zh_CN.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * contract_payment_mode -# +# # Translators: # ITGeeker , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-04-01 02:46+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: ITGeeker , 2017\n" -"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/zh_CN/)\n" +"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/" +"zh_CN/)\n" +"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: contract_payment_mode @@ -25,5 +26,6 @@ msgstr "核算科目" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id msgid "Payment Mode" msgstr "支付方式" From 1c14b456baf2f0fe06a32cc4d6d4784864fad43c Mon Sep 17 00:00:00 2001 From: Thomas Binsfeld Date: Tue, 18 Dec 2018 10:54:18 +0100 Subject: [PATCH 15/45] [MIG] Contract Payment Mode to 12.0 --- contract_payment_mode/README.rst | 64 ++- contract_payment_mode/__manifest__.py | 4 +- contract_payment_mode/hooks.py | 2 +- contract_payment_mode/i18n/ca.po | 18 +- .../i18n/contract_payment_mode.pot | 13 +- contract_payment_mode/i18n/de.po | 18 +- contract_payment_mode/i18n/el_GR.po | 16 +- contract_payment_mode/i18n/es.po | 18 +- contract_payment_mode/i18n/es_MX.po | 16 +- contract_payment_mode/i18n/fi.po | 18 +- contract_payment_mode/i18n/fr.po | 18 +- contract_payment_mode/i18n/gl.po | 18 +- contract_payment_mode/i18n/hi_IN.po | 18 +- contract_payment_mode/i18n/hr.po | 18 +- contract_payment_mode/i18n/hr_HR.po | 18 +- contract_payment_mode/i18n/hu.po | 16 +- contract_payment_mode/i18n/it.po | 18 +- contract_payment_mode/i18n/nl.po | 18 +- contract_payment_mode/i18n/pt.po | 18 +- contract_payment_mode/i18n/pt_BR.po | 18 +- contract_payment_mode/i18n/pt_PT.po | 16 +- contract_payment_mode/i18n/ro.po | 16 +- contract_payment_mode/i18n/ru.po | 16 +- contract_payment_mode/i18n/sk_SK.po | 16 +- contract_payment_mode/i18n/sl.po | 18 +- contract_payment_mode/i18n/tr.po | 16 +- contract_payment_mode/i18n/tr_TR.po | 16 +- contract_payment_mode/i18n/zh_CN.po | 18 +- contract_payment_mode/models/contract.py | 25 +- contract_payment_mode/readme/CONFIGURE.rst | 1 + contract_payment_mode/readme/CONTRIBUTORS.rst | 5 + contract_payment_mode/readme/DESCRIPTION.rst | 2 + contract_payment_mode/readme/USAGE.rst | 9 + .../static/description/index.html | 445 ++++++++++++++++++ .../tests/test_contract_payment.py | 28 +- contract_payment_mode/views/contract_view.xml | 33 +- 36 files changed, 802 insertions(+), 243 deletions(-) create mode 100644 contract_payment_mode/readme/CONFIGURE.rst create mode 100644 contract_payment_mode/readme/CONTRIBUTORS.rst create mode 100644 contract_payment_mode/readme/DESCRIPTION.rst create mode 100644 contract_payment_mode/readme/USAGE.rst create mode 100644 contract_payment_mode/static/description/index.html diff --git a/contract_payment_mode/README.rst b/contract_payment_mode/README.rst index 8b9bb46f1c..7c14604911 100644 --- a/contract_payment_mode/README.rst +++ b/contract_payment_mode/README.rst @@ -1,14 +1,38 @@ -.. 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 - ===================== Contract Payment Mode ===================== +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github + :target: https://github.com/OCA/contract/tree/12.0/contract_payment_mode + :alt: OCA/contract +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-contract_payment_mode + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/110/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + This module allows to set a payment mode on contract for creating the invoices with this payment mode. +**Table of contents** + +.. contents:: + :local: + Configuration ============= @@ -27,24 +51,27 @@ Usage #. Add a product to invoice. #. If you create an invoice, new invoice will have the selected payment mode. - -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/110/11.0 - 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 smash it by providing detailed and welcomed feedback. +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 `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= +Authors +~~~~~~~ + +* Domatix +* Tecnativa + Contributors ------------- +~~~~~~~~~~~~ * Ángel Moya * Antonio Espinosa @@ -52,18 +79,19 @@ Contributors * David Vidal * Carlos Dauden +Maintainers +~~~~~~~~~~~ -Maintainer ----------- +This module is maintained by the OCA. .. 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. +This module is part of the `OCA/contract `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/contract_payment_mode/__manifest__.py b/contract_payment_mode/__manifest__.py index 2f1655b166..d01c6e40ee 100644 --- a/contract_payment_mode/__manifest__.py +++ b/contract_payment_mode/__manifest__.py @@ -8,11 +8,11 @@ { 'name': 'Contract Payment Mode', 'summary': 'Payment mode in contracts and their invoices', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'author': 'Domatix, ' 'Tecnativa, ' 'Odoo Community Association (OCA)', - 'website': 'http://www.domatix.com', + 'website': 'https://github.com/OCA/contract', 'depends': [ 'contract', 'account_payment_partner' diff --git a/contract_payment_mode/hooks.py b/contract_payment_mode/hooks.py index db75d33cf7..230a23852a 100644 --- a/contract_payment_mode/hooks.py +++ b/contract_payment_mode/hooks.py @@ -11,7 +11,7 @@ def post_init_hook(cr, registry): """Copy payment mode from partner to the new field at contract.""" with api.Environment.manage(): env = api.Environment(cr, SUPERUSER_ID, {}) - m_contract = env['account.analytic.account'] + m_contract = env['contract.contract'] contracts = m_contract.search([ ('payment_mode_id', '=', False), ]) diff --git a/contract_payment_mode/i18n/ca.po b/contract_payment_mode/i18n/ca.po index 82e6e1d65c..770719bd31 100644 --- a/contract_payment_mode/i18n/ca.po +++ b/contract_payment_mode/i18n/ca.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: Marc Tormo i Bochaca , 2017\n" "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" @@ -20,12 +20,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Compte analític" - -#. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" msgstr "Forma de pagament " + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Compte analític" diff --git a/contract_payment_mode/i18n/contract_payment_mode.pot b/contract_payment_mode/i18n/contract_payment_mode.pot index 874dfd7c2b..60a6fe3109 100644 --- a/contract_payment_mode/i18n/contract_payment_mode.pot +++ b/contract_payment_mode/i18n/contract_payment_mode.pot @@ -4,8 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" +"PO-Revision-Date: 2019-05-29 10:30+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -14,13 +16,12 @@ msgstr "" "Plural-Forms: \n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id +msgid "Payment Mode" msgstr "" #. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id -msgid "Payment Mode" +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" msgstr "" diff --git a/contract_payment_mode/i18n/de.po b/contract_payment_mode/i18n/de.po index da61fca7f1..a7aa6b837e 100644 --- a/contract_payment_mode/i18n/de.po +++ b/contract_payment_mode/i18n/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" @@ -19,12 +19,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Kostenstelle" - -#. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" msgstr "Zahlweise" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Kostenstelle" diff --git a/contract_payment_mode/i18n/el_GR.po b/contract_payment_mode/i18n/el_GR.po index d7fa420e0f..3403a51f64 100644 --- a/contract_payment_mode/i18n/el_GR.po +++ b/contract_payment_mode/i18n/el_GR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: contract (8.0)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-07 03:42+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2015-11-07 12:33+0000\n" "Last-Translator: <>\n" "Language-Team: Greek (Greece) (http://www.transifex.com/oca/OCA-contract-8-0/" @@ -19,12 +19,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Αναλυτικός Λογαριασμός" +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id +msgid "Payment Mode" +msgstr "" #. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id -msgid "Payment Mode" +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Αναλυτικός Λογαριασμός" diff --git a/contract_payment_mode/i18n/es.po b/contract_payment_mode/i18n/es.po index 4a636ef96c..72fbda480b 100644 --- a/contract_payment_mode/i18n/es.po +++ b/contract_payment_mode/i18n/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" @@ -19,12 +19,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Cuenta analítica" - -#. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" msgstr "Modo de pago" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Cuenta analítica" diff --git a/contract_payment_mode/i18n/es_MX.po b/contract_payment_mode/i18n/es_MX.po index 94f80601ae..958ee3d53d 100644 --- a/contract_payment_mode/i18n/es_MX.po +++ b/contract_payment_mode/i18n/es_MX.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: contract (8.0)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-03 01:11+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2015-11-07 12:33+0000\n" "Last-Translator: <>\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/oca/OCA-" @@ -19,12 +19,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Cuenta analítica" +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id +msgid "Payment Mode" +msgstr "" #. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id -msgid "Payment Mode" +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Cuenta analítica" diff --git a/contract_payment_mode/i18n/fi.po b/contract_payment_mode/i18n/fi.po index 815f0be08b..e463bb19b0 100644 --- a/contract_payment_mode/i18n/fi.po +++ b/contract_payment_mode/i18n/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" @@ -19,12 +19,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Analyyttinen tili" - -#. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" msgstr "Maksutapa" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analyyttinen tili" diff --git a/contract_payment_mode/i18n/fr.po b/contract_payment_mode/i18n/fr.po index d850a3e56d..5041ee1d77 100644 --- a/contract_payment_mode/i18n/fr.po +++ b/contract_payment_mode/i18n/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" @@ -19,12 +19,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Compte analytique" - -#. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" msgstr "Mode de paiement" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Compte analytique" diff --git a/contract_payment_mode/i18n/gl.po b/contract_payment_mode/i18n/gl.po index 7171d9c065..ba459b7c29 100644 --- a/contract_payment_mode/i18n/gl.po +++ b/contract_payment_mode/i18n/gl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n" @@ -20,12 +20,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Conta analítica" - -#. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" msgstr "Modo de pagamento" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Conta analítica" diff --git a/contract_payment_mode/i18n/hi_IN.po b/contract_payment_mode/i18n/hi_IN.po index c578cd97e4..b25687b706 100644 --- a/contract_payment_mode/i18n/hi_IN.po +++ b/contract_payment_mode/i18n/hi_IN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-08-17 01:05+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-08-17 01:05+0000\n" "Last-Translator: Ashish Deshmukh , 2017\n" "Language-Team: Hindi (India) (https://www.transifex.com/oca/teams/23907/" @@ -20,12 +20,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "विश्लेषणात्मक खाता" - -#. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" msgstr "भुगतान का प्रकार" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "विश्लेषणात्मक खाता" diff --git a/contract_payment_mode/i18n/hr.po b/contract_payment_mode/i18n/hr.po index 0b3f76a76d..e12ef8a5ee 100644 --- a/contract_payment_mode/i18n/hr.po +++ b/contract_payment_mode/i18n/hr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-10 03:15+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2018-02-10 03:15+0000\n" "Last-Translator: Bole , 2018\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" @@ -21,12 +21,14 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Analitički konto" - -#. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" msgstr "Način plaćanja" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analitički konto" diff --git a/contract_payment_mode/i18n/hr_HR.po b/contract_payment_mode/i18n/hr_HR.po index f3ea367314..c105889f13 100644 --- a/contract_payment_mode/i18n/hr_HR.po +++ b/contract_payment_mode/i18n/hr_HR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-17 01:39+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-06-17 01:39+0000\n" "Last-Translator: Bole , 2017\n" "Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/" @@ -22,12 +22,14 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Konto analitike" - -#. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" msgstr "Način plaćanja" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Konto analitike" diff --git a/contract_payment_mode/i18n/hu.po b/contract_payment_mode/i18n/hu.po index 3482ecd1d8..4cba527572 100644 --- a/contract_payment_mode/i18n/hu.po +++ b/contract_payment_mode/i18n/hu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n" @@ -19,12 +19,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Analitikus gyűjtőkód könyvelés" +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id +msgid "Payment Mode" +msgstr "" #. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id -msgid "Payment Mode" +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analitikus gyűjtőkód könyvelés" diff --git a/contract_payment_mode/i18n/it.po b/contract_payment_mode/i18n/it.po index 897a189978..82bcd3ba9c 100644 --- a/contract_payment_mode/i18n/it.po +++ b/contract_payment_mode/i18n/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: Stefano , 2017\n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" @@ -20,12 +20,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Conto Analitico" - -#. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" msgstr "Modo di pagamento" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Conto Analitico" diff --git a/contract_payment_mode/i18n/nl.po b/contract_payment_mode/i18n/nl.po index 4632527bad..18c40dc95d 100644 --- a/contract_payment_mode/i18n/nl.po +++ b/contract_payment_mode/i18n/nl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: Erwin van der Ploeg , 2017\n" "Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n" @@ -20,12 +20,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Kostenplaats" - -#. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" msgstr "Betaalmode" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Kostenplaats" diff --git a/contract_payment_mode/i18n/pt.po b/contract_payment_mode/i18n/pt.po index b02eb3b003..00725fcf1b 100644 --- a/contract_payment_mode/i18n/pt.po +++ b/contract_payment_mode/i18n/pt.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-15 01:24+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-07-15 01:24+0000\n" "Last-Translator: Pedro Castro Silva , 2017\n" "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n" @@ -20,12 +20,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Conta Analítica" - -#. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" msgstr "Modo de Pagamento" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Conta Analítica" diff --git a/contract_payment_mode/i18n/pt_BR.po b/contract_payment_mode/i18n/pt_BR.po index 1c1a742cb9..58bc0d12ba 100644 --- a/contract_payment_mode/i18n/pt_BR.po +++ b/contract_payment_mode/i18n/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" @@ -20,12 +20,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Conta Analítica" - -#. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" msgstr "Modo de pagamento" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Conta Analítica" diff --git a/contract_payment_mode/i18n/pt_PT.po b/contract_payment_mode/i18n/pt_PT.po index 90da07ea09..23455bc8b9 100644 --- a/contract_payment_mode/i18n/pt_PT.po +++ b/contract_payment_mode/i18n/pt_PT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: Daniel Reis , 2017\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/" @@ -20,12 +20,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Conta Analítica" +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id +msgid "Payment Mode" +msgstr "" #. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id -msgid "Payment Mode" +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Conta Analítica" diff --git a/contract_payment_mode/i18n/ro.po b/contract_payment_mode/i18n/ro.po index c73c298e37..cf5c1dd9fd 100644 --- a/contract_payment_mode/i18n/ro.po +++ b/contract_payment_mode/i18n/ro.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n" @@ -20,12 +20,14 @@ msgstr "" "2:1));\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Cont analitic" +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id +msgid "Payment Mode" +msgstr "" #. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id -msgid "Payment Mode" +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Cont analitic" diff --git a/contract_payment_mode/i18n/ru.po b/contract_payment_mode/i18n/ru.po index 13272d7271..487d1af44b 100644 --- a/contract_payment_mode/i18n/ru.po +++ b/contract_payment_mode/i18n/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-17 03:26+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2018-03-17 03:26+0000\n" "Last-Translator: nek, 2018\n" "Language-Team: Russian (https://www.transifex.com/oca/teams/23907/ru/)\n" @@ -21,12 +21,14 @@ msgstr "" "%100>=11 && n%100<=14)? 2 : 3);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Аналитический счет" +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id +msgid "Payment Mode" +msgstr "" #. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id -msgid "Payment Mode" +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Аналитический счет" diff --git a/contract_payment_mode/i18n/sk_SK.po b/contract_payment_mode/i18n/sk_SK.po index aafb3ace06..70cb830827 100644 --- a/contract_payment_mode/i18n/sk_SK.po +++ b/contract_payment_mode/i18n/sk_SK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: contract (8.0)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-21 10:53+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2015-11-07 12:33+0000\n" "Last-Translator: <>\n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/oca/OCA-" @@ -19,12 +19,14 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Analytický účet" +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id +msgid "Payment Mode" +msgstr "" #. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id -msgid "Payment Mode" +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analytický účet" diff --git a/contract_payment_mode/i18n/sl.po b/contract_payment_mode/i18n/sl.po index 6dd3483338..3894e9de06 100644 --- a/contract_payment_mode/i18n/sl.po +++ b/contract_payment_mode/i18n/sl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" @@ -20,12 +20,14 @@ msgstr "" "%100==4 ? 2 : 3);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Analitični konto" - -#. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" msgstr "Način plačila" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analitični konto" diff --git a/contract_payment_mode/i18n/tr.po b/contract_payment_mode/i18n/tr.po index a1f7b19806..a79982c23e 100644 --- a/contract_payment_mode/i18n/tr.po +++ b/contract_payment_mode/i18n/tr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-13 02:40+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-06-13 02:40+0000\n" "Last-Translator: Ediz Duman , 2017\n" "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" @@ -19,12 +19,14 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Analitik Hesap" +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id +msgid "Payment Mode" +msgstr "" #. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id -msgid "Payment Mode" +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analitik Hesap" diff --git a/contract_payment_mode/i18n/tr_TR.po b/contract_payment_mode/i18n/tr_TR.po index a45963d45d..eb9c71e57c 100644 --- a/contract_payment_mode/i18n/tr_TR.po +++ b/contract_payment_mode/i18n/tr_TR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-13 02:40+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-06-13 02:40+0000\n" "Last-Translator: Ediz Duman , 2017\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/" @@ -20,12 +20,14 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "Analitik Hesap" +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id +msgid "Payment Mode" +msgstr "" #. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id -msgid "Payment Mode" +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analitik Hesap" diff --git a/contract_payment_mode/i18n/zh_CN.po b/contract_payment_mode/i18n/zh_CN.po index d76dd721fc..0d86d66cf2 100644 --- a/contract_payment_mode/i18n/zh_CN.po +++ b/contract_payment_mode/i18n/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-01 02:46+0000\n" +"POT-Creation-Date: 2019-05-29 10:30+0000\n" "PO-Revision-Date: 2017-04-01 02:46+0000\n" "Last-Translator: ITGeeker , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/" @@ -20,12 +20,14 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_account_analytic_account -msgid "Analytic Account" -msgstr "核算科目" - -#. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_account_analytic_account_payment_mode_id -#: model:ir.model.fields,field_description:contract_payment_mode.field_project_project_payment_mode_id +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" msgstr "支付方式" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "contract.contract" +msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "核算科目" diff --git a/contract_payment_mode/models/contract.py b/contract_payment_mode/models/contract.py index cdd58fd181..d575aacb7f 100644 --- a/contract_payment_mode/models/contract.py +++ b/contract_payment_mode/models/contract.py @@ -1,13 +1,14 @@ from odoo import api, fields, models -class AccountAnalyticAccount(models.Model): - _inherit = 'account.analytic.account' +class ContractContract(models.Model): + _inherit = 'contract.contract' payment_mode_id = fields.Many2one( comodel_name='account.payment.mode', string='Payment Mode', domain=[('payment_type', '=', 'inbound')], + index=True, ) @api.onchange('partner_id') @@ -15,11 +16,27 @@ def on_change_partner_id(self): self.payment_mode_id = self.partner_id.customer_payment_mode_id.id @api.multi - def _prepare_invoice(self): - invoice_vals = super(AccountAnalyticAccount, self)._prepare_invoice() + def _prepare_invoice(self, date_invoice, journal=None): + invoice_vals = super(ContractContract, self)._prepare_invoice( + date_invoice=date_invoice, journal=journal) if self.payment_mode_id: invoice_vals['payment_mode_id'] = self.payment_mode_id.id invoice = self.env['account.invoice'].new(invoice_vals) invoice._onchange_payment_mode_id() invoice_vals = invoice._convert_to_write(invoice._cache) return invoice_vals + + @api.model + def _finalize_invoice_creation(self, invoices): + """ + This override preserves the payment mode when calling the partner's + onchange. + """ + payment_modes_by_invoice = {} + for invoice in invoices: + payment_modes_by_invoice[invoice] = invoice.payment_mode_id + res = super(ContractContract, self)._finalize_invoice_creation( + invoices) + for invoice in invoices: + invoice.payment_mode_id = payment_modes_by_invoice.get(invoice) + return res diff --git a/contract_payment_mode/readme/CONFIGURE.rst b/contract_payment_mode/readme/CONFIGURE.rst new file mode 100644 index 0000000000..5d6fd55c79 --- /dev/null +++ b/contract_payment_mode/readme/CONFIGURE.rst @@ -0,0 +1 @@ +Your user should be a Sales Manager or Accountant. diff --git a/contract_payment_mode/readme/CONTRIBUTORS.rst b/contract_payment_mode/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..acb9445872 --- /dev/null +++ b/contract_payment_mode/readme/CONTRIBUTORS.rst @@ -0,0 +1,5 @@ +* Ángel Moya +* Antonio Espinosa +* Vicent Cubells +* David Vidal +* Carlos Dauden diff --git a/contract_payment_mode/readme/DESCRIPTION.rst b/contract_payment_mode/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..2ad523213d --- /dev/null +++ b/contract_payment_mode/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module allows to set a payment mode on contract for creating the invoices +with this payment mode. diff --git a/contract_payment_mode/readme/USAGE.rst b/contract_payment_mode/readme/USAGE.rst new file mode 100644 index 0000000000..c349c319f2 --- /dev/null +++ b/contract_payment_mode/readme/USAGE.rst @@ -0,0 +1,9 @@ +#. Go to *Accounting > Sales > Contracts*. +#. Create one. +#. Select a partner to which invoice. +#. If the partner has a payment mode, this payment mode is selected here. +#. If not, or if you want another payment mode, you can change it in the + corresponding field. +#. Click on **Generate recurring invoices automatically** checkbox. +#. Add a product to invoice. +#. If you create an invoice, new invoice will have the selected payment mode. diff --git a/contract_payment_mode/static/description/index.html b/contract_payment_mode/static/description/index.html new file mode 100644 index 0000000000..2ebd898008 --- /dev/null +++ b/contract_payment_mode/static/description/index.html @@ -0,0 +1,445 @@ + + + + + + +Contract Payment Mode + + + +
+

Contract Payment Mode

+ + +

Beta License: AGPL-3 OCA/contract Translate me on Weblate Try me on Runbot

+

This module allows to set a payment mode on contract for creating the invoices +with this payment mode.

+

Table of contents

+ +
+

Configuration

+

Your user should be a Sales Manager or Accountant.

+
+
+

Usage

+
    +
  1. Go to Accounting > Sales > Contracts.
    2. +
  2. Create one.
    3. +
  3. Select a partner to which invoice.
    4. +
  4. If the partner has a payment mode, this payment mode is selected here.
    5. +
  5. If not, or if you want another payment mode, you can change it in the +corresponding field.
    6. +
  6. Click on Generate recurring invoices automatically checkbox.
    7. +
  7. Add a product to invoice.
    8. +
  8. If you create an invoice, new invoice will have the selected payment mode.
    9. +
+
+
+

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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Domatix
    • +
  • Tecnativa
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

This module is part of the OCA/contract project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/contract_payment_mode/tests/test_contract_payment.py b/contract_payment_mode/tests/test_contract_payment.py index 5bbb46c0c5..318d71194e 100644 --- a/contract_payment_mode/tests/test_contract_payment.py +++ b/contract_payment_mode/tests/test_contract_payment.py @@ -32,11 +32,11 @@ def setUp(self): self.product = self.env['product.product'].create({ 'name': 'Custom Service', 'type': 'service', - 'uom_id': self.env.ref('product.product_uom_hour').id, - 'uom_po_id': self.env.ref('product.product_uom_hour').id, + 'uom_id': self.env.ref('uom.product_uom_hour').id, + 'uom_po_id': self.env.ref('uom.product_uom_hour').id, 'sale_ok': True, }) - self.contract = self.env['account.analytic.account'].create({ + self.contract = self.env['contract.contract'].create({ 'name': 'Maintenance of Servers', }) company = self.env.ref('base.main_company') @@ -47,7 +47,7 @@ def setUp(self): 'company_id': company.id}) def test_post_init_hook(self): - contract = self.env['account.analytic.account'].create({ + contract = self.env['contract.contract'].create({ 'name': 'Test contract', 'partner_id': self.partner.id, 'payment_mode_id': self.payment_mode.id, @@ -68,20 +68,22 @@ def test_contract_and_invoices(self): self.assertEqual(self.contract.payment_mode_id, self.contract.partner_id.customer_payment_mode_id) self.contract.write({ - 'recurring_invoices': True, - 'recurring_interval': 1, - 'recurring_invoice_line_ids': [(0, 0, { - 'quantity': 2.0, - 'price_unit': 200.0, - 'name': 'Database Administration 25', + 'contract_line_ids': [(0, 0, { 'product_id': self.product.id, + 'name': 'Database Administration 25', + 'quantity': 2.0, 'uom_id': self.product.uom_id.id, + 'price_unit': 200.0, + 'recurring_rule_type': 'monthly', + 'recurring_interval': 1, + 'date_start': '2018-01-01', + 'recurring_next_date': '2018-01-15', + 'is_auto_renew': False, })] }) self.contract.recurring_create_invoice() - new_invoice = self.env['account.invoice'].search([ - ('contract_id', '=', self.contract.id) - ]) + new_invoice = self.contract._get_related_invoices() + self.assertTrue(new_invoice) self.assertEqual(new_invoice.partner_id, self.contract.partner_id) self.assertEqual(new_invoice.payment_mode_id, self.contract.payment_mode_id) diff --git a/contract_payment_mode/views/contract_view.xml b/contract_payment_mode/views/contract_view.xml index 4d046f5d5a..4e16457082 100644 --- a/contract_payment_mode/views/contract_view.xml +++ b/contract_payment_mode/views/contract_view.xml @@ -1,22 +1,23 @@ - - account.analytic.account.payment.form - account.analytic.account - + + + contract.contract form view (in contract_payment_mode) + contract.contract + - + - + - - - account.analytic.account.payment.list - account.analytic.account - + + + contract.contract tree view (in contract_payment_mode) + contract.contract + @@ -24,11 +25,11 @@ - - - account.analytic.account.search - account.analytic.account - + + + contract.contract search view (in contract_payment_mode) + contract.contract + From 15ae1dc4980540da762ea768dcd29fea5b208c7c Mon Sep 17 00:00:00 2001 From: Bejaoui Souheil Date: Mon, 30 Sep 2019 09:13:12 +0200 Subject: [PATCH 16/45] Fix unit test Co-Authored-By: Pedro M. Baeza --- .../i18n/contract_payment_mode.pot | 10 ++++------ .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 2 +- .../tests/test_contract_payment.py | 1 + 4 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 contract_payment_mode/static/description/icon.png diff --git a/contract_payment_mode/i18n/contract_payment_mode.pot b/contract_payment_mode/i18n/contract_payment_mode.pot index 60a6fe3109..58d48f89b5 100644 --- a/contract_payment_mode/i18n/contract_payment_mode.pot +++ b/contract_payment_mode/i18n/contract_payment_mode.pot @@ -6,8 +6,6 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-05-29 10:30+0000\n" -"PO-Revision-Date: 2019-05-29 10:30+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,12 +14,12 @@ msgstr "" "Plural-Forms: \n" #. module: contract_payment_mode -#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id -msgid "Payment Mode" +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "Contract" msgstr "" #. module: contract_payment_mode -#: model:ir.model,name:contract_payment_mode.model_contract_contract -msgid "contract.contract" +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id +msgid "Payment Mode" msgstr "" diff --git a/contract_payment_mode/static/description/icon.png b/contract_payment_mode/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}d0jUxM@u(PQx^-s)697TX`ehR4?GS^qbkof1cslKgkU)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~! zVpnB`o+K7|Al`Q_U;eD$B zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__ zc+blN2UAB0=617@>_u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_ zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)( z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx zOGVPhVRTGPtv0o}RfVP;Nd(|CB)I;*t&QO8h zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9 zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz# z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7tF#6nHA zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K= z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C zuVl&0duN<;uOsB3%T9Fp8t{ED108<+W(nOZd?gDnfNBC3>M8WE61$So|P zVvqH0SNtDTcsUdzaMDpT=Ty0pDHHNL@Z0w$Y`XO z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1 zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_ zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8 zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ> zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}aRBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=@hbCRcfT5jigwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&BE*}XfU|H&(FssBqY=hPCt`d zH?@s2>I(|;fcW&YM6#V#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD z#z-)AXwSRY?OPefw^iI+ z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd z$6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$ z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV z@;rlc*NRK7i3y5BETSKuumEN`Xu_8GP1Ri=OKQ$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6 zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5#ZRj8kg}dS7_V&^%#Do==#`u zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK#HN`!1vBJHnC+RM&yIh8{gG2q zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH zVWo*OwYElb#uyW{Imam6f2rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+ z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC) zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#Boo{AH8n$a zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x! zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X zZ3WYJtHp_ri(}SQAPjv+Y+0=fH4krOP@S&=zZ-t1jW1o@}z;xk8 z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n= z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~NBvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z zzCR$P#uktu+#!w)cX!lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@ zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y< zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6 zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6% z2(}&uGRF;p92eS*sE*oR$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(| z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4PdpwWDop%^}n;dD#K4s#DYA8SHZ z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^WYu2u5kubqmwp%drJ6 z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d} z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&YOi-3|1QKB z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/contract_payment_mode/static/description/index.html b/contract_payment_mode/static/description/index.html index 2ebd898008..5a7e1bede2 100644 --- a/contract_payment_mode/static/description/index.html +++ b/contract_payment_mode/static/description/index.html @@ -3,7 +3,7 @@ - + Contract Payment Mode -
-

Contract Payment Mode

+
+ + +Odoo Community Association + +
+

Contract Payment Mode

-

Beta License: AGPL-3 OCA/contract Translate me on Weblate Try me on Runboat

+

Beta License: AGPL-3 OCA/contract Translate me on Weblate Try me on Runboat

This module allows to set a payment mode on contract for creating the invoices with this payment mode.

Table of contents

@@ -387,11 +392,11 @@

Contract Payment Mode

-

Configuration

+

Configuration

Your user should be a Sales Manager or Accountant.

-

Usage

+

Usage

  1. Go to Invoicing > Customers > Customer Contracts.
  2. Create one.
    3. @@ -406,24 +411,24 @@

    Usage

-

Bug Tracker

+

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 to smash it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

-

Credits

+

Credits

-

Authors

+

Authors

  • Domatix
  • Tecnativa
-

Contributors

+

Contributors

-

Maintainers

+

Maintainers

This module is maintained by the OCA.

Odoo Community Association @@ -448,10 +453,11 @@

Maintainers

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.

-

This module is part of the OCA/contract project on GitHub.

+

This module is part of the OCA/contract project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
diff --git a/contract_payment_mode/tests/test_contract_payment.py b/contract_payment_mode/tests/test_contract_payment.py index f8631df9cd..73c6d85e07 100644 --- a/contract_payment_mode/tests/test_contract_payment.py +++ b/contract_payment_mode/tests/test_contract_payment.py @@ -6,15 +6,17 @@ from unittest.mock import patch -from odoo.tests import common, tagged +from odoo import Command +from odoo.tests import tagged from odoo.addons.account.models.account_payment_method import AccountPaymentMethod +from odoo.addons.base.tests.common import BaseCommon from ..hooks import post_init_hook @tagged("post_install", "-at_install") -class TestContractPaymentInit(common.TransactionCase): +class TestContractPaymentInit(BaseCommon): @classmethod def setUpClass(cls): super().setUpClass() @@ -52,7 +54,7 @@ def _get_payment_method_information(self): cls.partner = cls.env["res.partner"].create( { "name": "Test contract partner", - "customer_payment_mode_id": cls.payment_mode, + "customer_payment_mode_id": cls.payment_mode.id, } ) cls.product = cls.env["product.product"].create( @@ -107,9 +109,7 @@ def test_contract_and_invoices(self): "recurring_rule_type": "monthly", "date_start": "2018-01-15", "contract_line_ids": [ - ( - 0, - 0, + Command.create( { "product_id": self.product.id, "name": "Database Administration 25", From a97838665256d91f2d8fa70ee00f0b52470778d8 Mon Sep 17 00:00:00 2001 From: jakobkrabbe Date: Fri, 4 Jul 2025 11:27:50 +0000 Subject: [PATCH 39/45] Added translation using Weblate (Swedish) --- contract_payment_mode/i18n/sv.po | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 contract_payment_mode/i18n/sv.po diff --git a/contract_payment_mode/i18n/sv.po b/contract_payment_mode/i18n/sv.po new file mode 100644 index 0000000000..655757546f --- /dev/null +++ b/contract_payment_mode/i18n/sv.po @@ -0,0 +1,27 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_payment_mode +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 18.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2025-08-05 14:21+0000\n" +"Last-Translator: jakobkrabbe \n" +"Language-Team: none\n" +"Language: sv\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 5.10.4\n" + +#. module: contract_payment_mode +#: model:ir.model,name:contract_payment_mode.model_contract_contract +msgid "Contract" +msgstr "Kontrakt" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id +msgid "Payment Mode" +msgstr "Betalningssätt" From c75fe6df67b49e368144a09ec5ebee20df23a406 Mon Sep 17 00:00:00 2001 From: Quentin THEURET Date: Sun, 4 Jan 2026 06:00:48 +0000 Subject: [PATCH 40/45] Translated using Weblate (French) Currently translated at 100.0% (2 of 2 strings) Translation: contract-18.0/contract-18.0-contract_payment_mode Translate-URL: https://translation.odoo-community.org/projects/contract-18-0/contract-18-0-contract_payment_mode/fr/ --- contract_payment_mode/i18n/fr.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contract_payment_mode/i18n/fr.po b/contract_payment_mode/i18n/fr.po index 2163b69c15..03cc97e65c 100644 --- a/contract_payment_mode/i18n/fr.po +++ b/contract_payment_mode/i18n/fr.po @@ -9,19 +9,20 @@ msgstr "" "Project-Id-Version: Odoo Server 15.0c\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-29 10:30+0000\n" -"PO-Revision-Date: 2017-04-01 02:46+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"PO-Revision-Date: 2026-01-04 06:13+0000\n" +"Last-Translator: Quentin THEURET \n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 5.10.4\n" #. module: contract_payment_mode #: model:ir.model,name:contract_payment_mode.model_contract_contract msgid "Contract" -msgstr "" +msgstr "Contrat" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id From 212d33c7b9ab9657025933bc1bb2d97c900ef7d7 Mon Sep 17 00:00:00 2001 From: Matjaz Mozetic Date: Sun, 7 Jun 2026 08:23:48 +0000 Subject: [PATCH 41/45] Translated using Weblate (Slovenian) Currently translated at 100.0% (2 of 2 strings) Translation: contract-18.0/contract-18.0-contract_payment_mode Translate-URL: https://translation.odoo-community.org/projects/contract-18-0/contract-18-0-contract_payment_mode/sl/ --- contract_payment_mode/i18n/sl.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/contract_payment_mode/i18n/sl.po b/contract_payment_mode/i18n/sl.po index deb601ad22..5d6e491c36 100644 --- a/contract_payment_mode/i18n/sl.po +++ b/contract_payment_mode/i18n/sl.po @@ -9,20 +9,21 @@ msgstr "" "Project-Id-Version: Odoo Server 15.0c\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-29 10:30+0000\n" -"PO-Revision-Date: 2017-04-01 02:46+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"PO-Revision-Date: 2026-06-07 08:24+0000\n" +"Last-Translator: Matjaz Mozetic \n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3;\n" +"X-Generator: Weblate 5.15.2\n" #. module: contract_payment_mode #: model:ir.model,name:contract_payment_mode.model_contract_contract msgid "Contract" -msgstr "" +msgstr "Pogodba" #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id From 3c325382521cd0d0337b42899d2b2955d1768685 Mon Sep 17 00:00:00 2001 From: Carlos Lopez Date: Mon, 13 Jul 2026 11:57:34 -0500 Subject: [PATCH 42/45] [IMP] contract_payment_mode: auto fixes --- contract_payment_mode/README.rst | 10 +++++----- contract_payment_mode/__manifest__.py | 2 +- contract_payment_mode/static/description/index.html | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/contract_payment_mode/README.rst b/contract_payment_mode/README.rst index 82221bdd98..c0997ba04c 100644 --- a/contract_payment_mode/README.rst +++ b/contract_payment_mode/README.rst @@ -21,13 +21,13 @@ Contract Payment Mode :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github - :target: https://github.com/OCA/contract/tree/18.0/contract_payment_mode + :target: https://github.com/OCA/contract/tree/19.0/contract_payment_mode :alt: OCA/contract .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/contract-18-0/contract-18-0-contract_payment_mode + :target: https://translation.odoo-community.org/projects/contract-19-0/contract-19-0-contract_payment_mode :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/builds?repo=OCA/contract&target_branch=18.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/contract&target_branch=19.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -65,7 +65,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 to smash it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -107,6 +107,6 @@ 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. -This module is part of the `OCA/contract `_ project on GitHub. +This module is part of the `OCA/contract `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/contract_payment_mode/__manifest__.py b/contract_payment_mode/__manifest__.py index cc997e5937..758b2113f3 100644 --- a/contract_payment_mode/__manifest__.py +++ b/contract_payment_mode/__manifest__.py @@ -11,7 +11,7 @@ "name": "Contract Payment Mode", "summary": "Payment mode in contracts and their invoices", "version": "18.0.1.0.0", - "author": "Domatix, " "Tecnativa, " "Odoo Community Association (OCA)", + "author": "Domatix, Tecnativa, Odoo Community Association (OCA)", "website": "https://github.com/OCA/contract", "depends": ["contract", "account_payment_partner"], "category": "Sales Management", diff --git a/contract_payment_mode/static/description/index.html b/contract_payment_mode/static/description/index.html index 024dea331b..2aa2a742fd 100644 --- a/contract_payment_mode/static/description/index.html +++ b/contract_payment_mode/static/description/index.html @@ -374,7 +374,7 @@

Contract Payment Mode

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:baf0d25d081f548797c6a526049d9fa0a67e68c6a7d411e264dbb10b59111c56 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/contract Translate me on Weblate Try me on Runboat

+

Beta License: AGPL-3 OCA/contract Translate me on Weblate Try me on Runboat

This module allows to set a payment mode on contract for creating the invoices with this payment mode.

Table of contents

@@ -415,7 +415,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 to smash it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -453,7 +453,7 @@

Maintainers

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.

-

This module is part of the OCA/contract project on GitHub.

+

This module is part of the OCA/contract project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

From 5c15b8dc297a5b3887dc28c20abc2e29f28e9f80 Mon Sep 17 00:00:00 2001 From: Carlos Lopez Date: Mon, 20 Jul 2026 10:08:08 -0500 Subject: [PATCH 43/45] [MIG] contract_payment_mode: Migration to version 19.0 --- contract_payment_mode/__init__.py | 2 +- contract_payment_mode/__manifest__.py | 7 +- contract_payment_mode/hooks.py | 43 +++-- .../tests/test_contract_payment.py | 149 ++++++++++++------ requirements.txt | 2 + 5 files changed, 134 insertions(+), 69 deletions(-) create mode 100644 requirements.txt diff --git a/contract_payment_mode/__init__.py b/contract_payment_mode/__init__.py index 801a8cbb3f..01aac13a68 100644 --- a/contract_payment_mode/__init__.py +++ b/contract_payment_mode/__init__.py @@ -1,4 +1,4 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models -from .hooks import post_init_hook +from .hooks import pre_init_hook diff --git a/contract_payment_mode/__manifest__.py b/contract_payment_mode/__manifest__.py index 758b2113f3..ff9473ad0f 100644 --- a/contract_payment_mode/__manifest__.py +++ b/contract_payment_mode/__manifest__.py @@ -10,14 +10,15 @@ { "name": "Contract Payment Mode", "summary": "Payment mode in contracts and their invoices", - "version": "18.0.1.0.0", + "version": "19.0.1.0.0", "author": "Domatix, Tecnativa, Odoo Community Association (OCA)", "website": "https://github.com/OCA/contract", - "depends": ["contract", "account_payment_partner"], + "depends": ["contract", "account_payment_mode"], + "external_dependencies": {"python": ["openupgradelib"]}, "category": "Sales Management", "license": "AGPL-3", + "pre_init_hook": "pre_init_hook", "data": ["views/contract_view.xml"], - "post_init_hook": "post_init_hook", "installable": True, "auto_install": True, } diff --git a/contract_payment_mode/hooks.py b/contract_payment_mode/hooks.py index ccb8fad714..40e5e44654 100644 --- a/contract_payment_mode/hooks.py +++ b/contract_payment_mode/hooks.py @@ -1,19 +1,34 @@ # Copyright 2016 Antiun Ingenieria S.L. - Antonio Espinosa +# Copyright 2026 Tecnativa - Carlos Lopez # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -import logging +from openupgradelib import openupgrade -_logger = logging.getLogger(__name__) - -def post_init_hook(env): - """Copy payment mode from partner to the new field at contract.""" - m_contract = env["contract.contract"] - contracts = m_contract.search([("payment_mode_id", "=", False)]) - if contracts: - _logger.info("Setting payment mode: %d contracts" % len(contracts)) - for contract in contracts: - payment_mode = contract.partner_id.customer_payment_mode_id - if payment_mode: - contract.payment_mode_id = payment_mode.id - _logger.info("Setting payment mode: Done") +def pre_init_hook(env): + """Create and prefill payment_mode_id before stored compute runs.""" + openupgrade.add_columns( + env, + [ + ( + "contract.contract", + "payment_mode_id", + "many2one", + None, + "contract_contract", + ) + ], + ) + openupgrade.logged_query( + env.cr, + """ + UPDATE contract_contract AS c + SET payment_mode_id = CASE + WHEN c.contract_type = 'purchase' THEN + (rp.supplier_payment_mode_id ->> c.company_id::text)::int + ELSE (rp.customer_payment_mode_id ->> c.company_id::text)::int + END + FROM res_partner rp + WHERE rp.id = c.partner_id AND c.payment_mode_id IS NULL + """, + ) diff --git a/contract_payment_mode/tests/test_contract_payment.py b/contract_payment_mode/tests/test_contract_payment.py index 73c6d85e07..40b2832710 100644 --- a/contract_payment_mode/tests/test_contract_payment.py +++ b/contract_payment_mode/tests/test_contract_payment.py @@ -4,57 +4,77 @@ # Copyright 2023 Tecnativa - Carolina Fernandez # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from unittest.mock import patch from odoo import Command from odoo.tests import tagged -from odoo.addons.account.models.account_payment_method import AccountPaymentMethod -from odoo.addons.base.tests.common import BaseCommon +from odoo.addons.account.tests.common import AccountTestInvoicingCommon -from ..hooks import post_init_hook +from ..hooks import pre_init_hook @tagged("post_install", "-at_install") -class TestContractPaymentInit(BaseCommon): +class TestContractPaymentInit(AccountTestInvoicingCommon): @classmethod def setUpClass(cls): super().setUpClass() - - Method_get_payment_method_information = ( - AccountPaymentMethod._get_payment_method_information + cls.company_data2 = cls.setup_other_company(name="Test contract payment mode") + cls.company2 = cls.company_data2["company"] + cls.Contract = cls.env["contract.contract"] + PaymentMethod = cls.env["account.payment.method"] + PaymentMode = cls.env["account.payment.mode"] + cls.payment_method = PaymentMethod.create( + { + "name": "Test Payment Method", + "code": "Test", + "payment_type": "inbound", + } ) - - def _get_payment_method_information(self): - res = Method_get_payment_method_information(self) - res["Test"] = {"mode": "multi", "domain": [("type", "=", "bank")]} - return res - - with patch.object( - AccountPaymentMethod, - "_get_payment_method_information", - _get_payment_method_information, - ): - cls.payment_method = cls.env["account.payment.method"].create( - { - "name": "Test Payment Method", - "code": "Test", - "payment_type": "inbound", - } - ) - - cls.payment_mode = cls.env["account.payment.mode"].create( + cls.payment_method_outbound = PaymentMethod.create( + { + "name": "Test Payment Method 2", + "code": "Test2", + "payment_type": "outbound", + } + ) + cls.payment_mode_outbound = PaymentMode.create( + { + "name": "Test payment mode 3", + "payment_method_id": cls.payment_method_outbound.id, + "bank_account_link": "variable", + "company_id": cls.company2.id, + } + ) + cls.payment_mode = PaymentMode.create( { "name": "Test payment mode", - "active": True, "payment_method_id": cls.payment_method.id, "bank_account_link": "variable", + "company_id": cls.company.id, + } + ) + cls.payment_mode2 = PaymentMode.create( + { + "name": "Test payment mode 2", + "payment_method_id": cls.payment_method.id, + "bank_account_link": "variable", + "company_id": cls.company2.id, } ) - cls.partner = cls.env["res.partner"].create( + cls.specific_payment_mode = cls.payment_mode2.copy( + default={"name": "Specific payment mode"} + ) + cls.partner = cls.env["res.partner"].create({"name": "Test contract partner"}) + cls.partner_without_payment_mode = cls.env["res.partner"].create( + {"name": "Test contract partner 2"} + ) + cls.partner.with_company(cls.company).write( + {"customer_payment_mode_id": cls.payment_mode.id} + ) + cls.partner.with_company(cls.company2).write( { - "name": "Test contract partner", - "customer_payment_mode_id": cls.payment_mode.id, + "customer_payment_mode_id": cls.payment_mode2.id, + "supplier_payment_mode_id": cls.payment_mode_outbound.id, } ) cls.product = cls.env["product.product"].create( @@ -62,38 +82,65 @@ def _get_payment_method_information(self): "name": "Custom Service", "type": "service", "uom_id": cls.env.ref("uom.product_uom_hour").id, - "uom_po_id": cls.env.ref("uom.product_uom_hour").id, "sale_ok": True, } ) - cls.contract = cls.env["contract.contract"].create( + cls.contract = cls.Contract.create( {"name": "Maintenance of Servers", "partner_id": cls.partner.id} ) - company = cls.env.ref("base.main_company") - cls.journal = cls.env["account.journal"].create( + + def test_pre_init_hook(self): + contract2 = self.Contract.create( { - "name": "Sale Journal - Test", - "code": "HRTSJ", - "type": "sale", - "company_id": company.id, + "name": "Test contract", + "partner_id": self.partner.id, + "company_id": self.company2.id, } ) - - def test_post_init_hook(self): - contract = self.env["contract.contract"].create( + contract_with_payment_mode = self.env["contract.contract"].create( { "name": "Test contract", "partner_id": self.partner.id, - "payment_mode_id": self.payment_mode.id, + "payment_mode_id": self.specific_payment_mode.id, + "company_id": self.company2.id, } ) - self.assertEqual(contract.payment_mode_id, self.payment_mode) - - contract.payment_mode_id = False - self.assertEqual(contract.payment_mode_id.id, False) - - post_init_hook(self.env) - self.assertEqual(contract.payment_mode_id, self.payment_mode) + # partner_without_payment_mode has no payment mode set, + # so the contract should not have a payment mode either + contract_without_payment_mode = self.Contract.create( + { + "name": "Test contract", + "partner_id": self.partner_without_payment_mode.id, + } + ) + contract_supplier = self.Contract.create( + { + "name": "Test contract", + "partner_id": self.partner.id, + "contract_type": "purchase", + "company_id": self.company2.id, + } + ) + self.assertEqual(self.contract.payment_mode_id, self.payment_mode) + self.assertEqual(contract2.payment_mode_id, self.payment_mode2) + self.assertEqual( + contract_with_payment_mode.payment_mode_id, self.specific_payment_mode + ) + self.assertFalse(contract_without_payment_mode.payment_mode_id) + self.assertEqual(contract_supplier.payment_mode_id, self.payment_mode_outbound) + self.contract.payment_mode_id = False + contract2.payment_mode_id = False + contract_supplier.payment_mode_id = False + self.Contract.flush_model(["payment_mode_id"]) + pre_init_hook(self.env) + self.Contract.invalidate_model(["payment_mode_id"]) + self.assertEqual(self.contract.payment_mode_id, self.payment_mode) + self.assertEqual(contract2.payment_mode_id, self.payment_mode2) + self.assertEqual( + contract_with_payment_mode.payment_mode_id, self.specific_payment_mode + ) + self.assertFalse(contract_without_payment_mode.payment_mode_id) + self.assertEqual(contract_supplier.payment_mode_id, self.payment_mode_outbound) def test_contract_and_invoices(self): self.contract.write({"partner_id": self.partner.id}) diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000000..180fc49789 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +# generated from manifests external_dependencies +openupgradelib From 281bfc629a598a72b3172898d5ad9487b9f37c41 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Thu, 23 Jul 2026 14:21:52 +0000 Subject: [PATCH 44/45] [UPD] Update contract_payment_mode.pot --- contract_payment_mode/i18n/contract_payment_mode.pot | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/contract_payment_mode/i18n/contract_payment_mode.pot b/contract_payment_mode/i18n/contract_payment_mode.pot index 238ff3266f..b93c7e80ff 100644 --- a/contract_payment_mode/i18n/contract_payment_mode.pot +++ b/contract_payment_mode/i18n/contract_payment_mode.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 18.0\n" +"Project-Id-Version: Odoo Server 19.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -18,6 +18,16 @@ msgstr "" msgid "Contract" msgstr "" +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__display_name +msgid "Display Name" +msgstr "" + +#. module: contract_payment_mode +#: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__id +msgid "ID" +msgstr "" + #. module: contract_payment_mode #: model:ir.model.fields,field_description:contract_payment_mode.field_contract_contract__payment_mode_id msgid "Payment Mode" From d1761ba07190704692250352919d8c6afa635200 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 23 Jul 2026 14:25:43 +0000 Subject: [PATCH 45/45] [BOT] post-merge updates --- README.md | 1 + contract_payment_mode/README.rst | 2 +- contract_payment_mode/static/description/index.html | 2 +- setup/_metapackage/pyproject.toml | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9683e2380b..fa5c4fe801 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ addon | version | maintainers | summary --- | --- | --- | --- [contract](contract/) | 19.0.1.0.2 | | Recurring - Contracts Management [contract_analytic_tag](contract_analytic_tag/) | 19.0.1.0.0 | victoralmau | Contract Analytic Tag +[contract_payment_mode](contract_payment_mode/) | 19.0.1.0.0 | | Payment mode in contracts and their invoices [contract_sale](contract_sale/) | 19.0.1.0.0 | | Contract from Sale [contract_update_last_date_invoiced](contract_update_last_date_invoiced/) | 19.0.1.0.0 | rafaelbn Andrii9090 | This module allows to update the last date invoiced if invoices are deleted. [contract_variable_quantity](contract_variable_quantity/) | 19.0.1.0.0 | | Variable quantity in contract recurrent invoicing diff --git a/contract_payment_mode/README.rst b/contract_payment_mode/README.rst index c0997ba04c..87fc66af0a 100644 --- a/contract_payment_mode/README.rst +++ b/contract_payment_mode/README.rst @@ -11,7 +11,7 @@ Contract Payment Mode !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:baf0d25d081f548797c6a526049d9fa0a67e68c6a7d411e264dbb10b59111c56 + !! source digest: sha256:262b19d899fda352913b0e46be81b4cfc4de906b9beee21d72ea675d4cfc0107 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/contract_payment_mode/static/description/index.html b/contract_payment_mode/static/description/index.html index 2aa2a742fd..c5c360891c 100644 --- a/contract_payment_mode/static/description/index.html +++ b/contract_payment_mode/static/description/index.html @@ -372,7 +372,7 @@

Contract Payment Mode

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:baf0d25d081f548797c6a526049d9fa0a67e68c6a7d411e264dbb10b59111c56 +!! source digest: sha256:262b19d899fda352913b0e46be81b4cfc4de906b9beee21d72ea675d4cfc0107 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/contract Translate me on Weblate Try me on Runboat

This module allows to set a payment mode on contract for creating the diff --git a/setup/_metapackage/pyproject.toml b/setup/_metapackage/pyproject.toml index f4c7bdd011..0ddf796129 100644 --- a/setup/_metapackage/pyproject.toml +++ b/setup/_metapackage/pyproject.toml @@ -1,9 +1,10 @@ [project] name = "odoo-addons-oca-contract" -version = "19.0.20260706.1" +version = "19.0.20260723.0" dependencies = [ "odoo-addon-contract==19.0.*", "odoo-addon-contract_analytic_tag==19.0.*", + "odoo-addon-contract_payment_mode==19.0.*", "odoo-addon-contract_sale==19.0.*", "odoo-addon-contract_update_last_date_invoiced==19.0.*", "odoo-addon-contract_variable_quantity==19.0.*",