From 24187e9378b005c43886dc6ede827b472a29ad78 Mon Sep 17 00:00:00 2001 From: AngelMoya-Domatix Date: Wed, 14 Oct 2015 11:18:05 +0200 Subject: [PATCH 01/16] 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 00000000..5d4ee46c --- /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 00000000..a0fdc10f --- /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 00000000..1eee7c8b --- /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 00000000..e366d91d --- /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 00000000..de6fc59a --- /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 00000000..b82ea877 --- /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 00000000..8d1b31a5 --- /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 00000000..465b2446 --- /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 00000000..4f488e45 --- /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 1a5031e2f2c48ed3a31e485bb8a9ec88d5ec3f36 Mon Sep 17 00:00:00 2001 From: Antonio Espinosa Date: Wed, 27 Jan 2016 13:54:21 +0100 Subject: [PATCH 02/16] 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 5d4ee46c..09e27ba1 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 a0fdc10f..753e6cee 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 1eee7c8b..f9c12929 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 00000000..5e68b6c3 --- /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 8d1b31a5..0aa60e89 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 @@ class AccountAnalyticAccount(models.Model): @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 00000000..be86a7bf --- /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 00000000..2056a162 --- /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 81d759a888124bb1c1f7cfee80847899da0e6194 Mon Sep 17 00:00:00 2001 From: Javi Melendez Date: Mon, 25 Apr 2016 09:48:15 +0200 Subject: [PATCH 03/16] 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 0aa60e89..1d255667 100644 --- a/contract_payment_mode/models/contract.py +++ b/contract_payment_mode/models/contract.py @@ -26,7 +26,8 @@ class AccountAnalyticAccount(models.Model): _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 3cb7305ef5ed2de8e17ab0937f5d573b257851df Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 7 Nov 2015 23:19:16 -0500 Subject: [PATCH 04/16] 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 00000000..acfc4e79 --- /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 00000000..a447c688 --- /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 00000000..158f6686 --- /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 00000000..2d638f41 --- /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 00000000..a8774cdc --- /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 00000000..2f73f80b --- /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 00000000..02800708 --- /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 00000000..ed203d29 --- /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 00000000..36bd5457 --- /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 d85800125da69921f1491bee4abc2f3712c18eb5 Mon Sep 17 00:00:00 2001 From: cubells Date: Tue, 28 Mar 2017 14:52:12 +0200 Subject: [PATCH 05/16] 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 09e27ba1..c28b1c27 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 753e6cee..ca40b1d9 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 f9c12929..8b0c2a5b 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 5e68b6c3..1a5795ee 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 e366d91d..00000000 --- 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 1d255667..60ab6684 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 465b2446..00000000 --- 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 be86a7bf..3715e523 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 00000000..d5c41106 --- /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 2056a162..00000000 --- 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 4f488e45..7be6a65e 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 1523a8bef3b63764c9c4e2b053dd7e0e9d13f004 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Mon, 1 May 2017 17:51:34 +0200 Subject: [PATCH 06/16] 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 acfc4e79..956d5a62 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 a447c688..ac58a9e6 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 de6fc59a..d9d345b9 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 a8774cdc..b376969b 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 2f73f80b..119f07d2 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 00000000..89e4bb06 --- /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 00000000..3a6f8443 --- /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 00000000..e7566b42 --- /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 00000000..15c26501 --- /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 00000000..e00284f7 --- /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 00000000..9a3f0e7d --- /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 00000000..bb0f69b8 --- /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 02800708..c8835dc0 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 00000000..5030f572 --- /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 00000000..4b86948b --- /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 36bd5457..0239072e 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 00000000..1dabc13a --- /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 0723c4698df6ceb4e79c03e8ed4407d55db1af77 Mon Sep 17 00:00:00 2001 From: David Vidal Date: Thu, 25 May 2017 10:47:35 +0200 Subject: [PATCH 07/16] [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 c28b1c27..7b5a1fed 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 ca40b1d9..c8000a8a 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 8b0c2a5b..db2f3955 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 1a5795ee..a1d2bae7 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 60ab6684..2e1b71ea 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 @@ class AccountAnalyticAccount(models.Model): 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 d5c41106..c3fc3e0d 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 @@ class TestContractPaymentInit(common.SavepointCase): 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 @@ class TestContractPaymentInit(common.SavepointCase): '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 @@ class TestContractPaymentInit(common.SavepointCase): '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 9eca01a692af83961856e383d903669af544ae6e Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 17 Jun 2017 03:12:34 +0200 Subject: [PATCH 08/16] 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 e7566b42..b13d3311 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 bb0f69b8..8d48fc4a 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 00000000..dc5e710c --- /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 00000000..109f88dd --- /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 392cddf8f999072b8e2bee58d3ea1549adc5b96c Mon Sep 17 00:00:00 2001 From: Carlos Dauden Date: Fri, 4 Aug 2017 09:26:15 +0200 Subject: [PATCH 09/16] [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 7b5a1fed..19a458be 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 db2f3955..dea0e710 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 2e1b71ea..2a5d53ab 100644 --- a/contract_payment_mode/models/contract.py +++ b/contract_payment_mode/models/contract.py @@ -21,5 +21,7 @@ class AccountAnalyticAccount(models.Model): 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 afac2b2f9935ae724e94bae9bc27ea9366110686 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 19 Aug 2017 03:16:47 +0200 Subject: [PATCH 10/16] 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 00000000..26b2ce79 --- /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 6e7521fee8180856831a4977b526ebdd3ce6bb66 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/16] =?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 c3fc3e0d..d5580081 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 e5b25e47d78298924ddc8bba276b2afd99b7919b Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 3 Mar 2018 04:13:30 +0100 Subject: [PATCH 12/16] 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 3a6f8443..89205e35 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 00000000..0f08a8dc --- /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 91564547fdae7eab248e97d193ba74ac659a73fe Mon Sep 17 00:00:00 2001 From: cubells Date: Thu, 17 May 2018 13:33:19 +0200 Subject: [PATCH 13/16] [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 19a458be..8b9bb46f 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 c8000a8a..801a8cbb 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 dea0e710..2f1655b1 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 a1d2bae7..db75d33c 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 b82ea877..99a5468a 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 2a5d53ab..cdd58fd1 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 @@ class AccountAnalyticAccount(models.Model): 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 3715e523..af96dda7 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 d5580081..5bbb46c0 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 7be6a65e..4d046f5d 100644 --- a/contract_payment_mode/views/contract_view.xml +++ b/contract_payment_mode/views/contract_view.xml @@ -1,4 +1,4 @@ - + From ea361628f095d09729490f49e9c3e5e28de27442 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 21 Jun 2018 18:28:49 +0000 Subject: [PATCH 14/16] [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 956d5a62..82e6e1d6 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 00000000..874dfd7c --- /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 ac58a9e6..da61fca7 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 158f6686..d7fa420e 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 d9d345b9..4a636ef9 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 2d638f41..94f80601 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 b376969b..815f0be0 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 119f07d2..d850a3e5 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 89e4bb06..7171d9c0 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 26b2ce79..c578cd97 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 89205e35..0b3f76a7 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 b13d3311..f3ea3673 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 15c26501..3482ecd1 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 e00284f7..897a1899 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 9a3f0e7d..4632527b 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 8d48fc4a..b02eb3b0 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 c8835dc0..1c1a742c 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 5030f572..90da07ea 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 4b86948b..c73c298e 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 0f08a8dc..13272d72 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 ed203d29..aafb3ace 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 0239072e..6dd34833 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 dc5e710c..a1f7b198 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 109f88dd..a45963d4 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 1dabc13a..d76dd721 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 c9018e7fe0ec446f64b5c41735c054e5215cae7c Mon Sep 17 00:00:00 2001 From: Thomas Binsfeld Date: Tue, 18 Dec 2018 10:54:18 +0100 Subject: [PATCH 15/16] [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 +- oca_dependencies.txt | 2 + setup/contract_payment_mode/.eggs/README.txt | 6 + .../odoo/addons/contract_payment_mode | 1 + setup/contract_payment_mode/setup.py | 6 + 40 files changed, 817 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 create mode 100644 oca_dependencies.txt create mode 100644 setup/contract_payment_mode/.eggs/README.txt create mode 120000 setup/contract_payment_mode/odoo/addons/contract_payment_mode create mode 100644 setup/contract_payment_mode/setup.py diff --git a/contract_payment_mode/README.rst b/contract_payment_mode/README.rst index 8b9bb46f..7c146049 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 2f1655b1..d01c6e40 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 db75d33c..230a2385 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 82e6e1d6..770719bd 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 874dfd7c..60a6fe31 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 da61fca7..a7aa6b83 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 d7fa420e..3403a51f 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 4a636ef9..72fbda48 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 94f80601..958ee3d5 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 815f0be0..e463bb19 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 d850a3e5..5041ee1d 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 7171d9c0..ba459b7c 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 c578cd97..b25687b7 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 0b3f76a7..e12ef8a5 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 f3ea3673..c105889f 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 3482ecd1..4cba5275 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 897a1899..82bcd3ba 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 4632527b..18c40dc9 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 b02eb3b0..00725fcf 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 1c1a742c..58bc0d12 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 90da07ea..23455bc8 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 c73c298e..cf5c1dd9 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 13272d72..487d1af4 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 aafb3ace..70cb8308 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 6dd34833..3894e9de 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 a1f7b198..a79982c2 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 a45963d4..eb9c71e5 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 d76dd721..0d86d66c 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 cdd58fd1..d575aacb 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 @@ class AccountAnalyticAccount(models.Model): 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 00000000..5d6fd55c --- /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 00000000..acb94458 --- /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 00000000..2ad52321 --- /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 00000000..c349c319 --- /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 00000000..2ebd8980 --- /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 5bbb46c0..318d7119 100644 --- a/contract_payment_mode/tests/test_contract_payment.py +++ b/contract_payment_mode/tests/test_contract_payment.py @@ -32,11 +32,11 @@ class TestContractPaymentInit(odoo.tests.HttpCase): 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 @@ class TestContractPaymentInit(odoo.tests.HttpCase): '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 @@ class TestContractPaymentInit(odoo.tests.HttpCase): 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 4d046f5d..4e164570 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 + diff --git a/oca_dependencies.txt b/oca_dependencies.txt new file mode 100644 index 00000000..02b6e1e6 --- /dev/null +++ b/oca_dependencies.txt @@ -0,0 +1,2 @@ +bank-payment + diff --git a/setup/contract_payment_mode/.eggs/README.txt b/setup/contract_payment_mode/.eggs/README.txt new file mode 100644 index 00000000..5d016688 --- /dev/null +++ b/setup/contract_payment_mode/.eggs/README.txt @@ -0,0 +1,6 @@ +This directory contains eggs that were downloaded by setuptools to build, test, and run plug-ins. + +This directory caches those eggs to prevent repeated downloads. + +However, it is safe to delete this directory. + diff --git a/setup/contract_payment_mode/odoo/addons/contract_payment_mode b/setup/contract_payment_mode/odoo/addons/contract_payment_mode new file mode 120000 index 00000000..33d6c86e --- /dev/null +++ b/setup/contract_payment_mode/odoo/addons/contract_payment_mode @@ -0,0 +1 @@ +../../../../contract_payment_mode \ No newline at end of file diff --git a/setup/contract_payment_mode/setup.py b/setup/contract_payment_mode/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/contract_payment_mode/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From c871e2b31249dbc54147f71a959399353b7bb7c7 Mon Sep 17 00:00:00 2001 From: Bejaoui Souheil Date: Mon, 30 Sep 2019 09:13:12 +0200 Subject: [PATCH 16/16] Fix unit test Co-Authored-By: Pedro M. Baeza --- contract_payment_mode/tests/test_contract_payment.py | 1 + 1 file changed, 1 insertion(+) diff --git a/contract_payment_mode/tests/test_contract_payment.py b/contract_payment_mode/tests/test_contract_payment.py index 318d7119..70804545 100644 --- a/contract_payment_mode/tests/test_contract_payment.py +++ b/contract_payment_mode/tests/test_contract_payment.py @@ -38,6 +38,7 @@ class TestContractPaymentInit(odoo.tests.HttpCase): }) self.contract = self.env['contract.contract'].create({ 'name': 'Maintenance of Servers', + 'partner_id': self.partner.id, }) company = self.env.ref('base.main_company') self.journal = self.env['account.journal'].create({