From 151eda89a2fd92e73d1fb698fbeb3b3987066dd0 Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Tue, 6 Nov 2018 15:15:03 +0100 Subject: [PATCH 01/31] [ADD] - new module Product Contract Variable Quantity --- product_contract_variable_quantity/README.rst | 87 ++++++++++++++++++ .../__init__.py | 2 + .../__manifest__.py | 15 +++ .../models/__init__.py | 6 ++ .../models/contract_line.py | 16 ++++ .../models/product_template.py | 31 +++++++ .../models/sale_order_line.py | 40 ++++++++ .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 1 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 4 + .../tests/test_sale_order.py | 59 ++++++++++++ .../views/product_template.xml | 30 ++++++ .../views/sale_order.xml | 38 ++++++++ 14 files changed, 330 insertions(+) create mode 100644 product_contract_variable_quantity/README.rst create mode 100644 product_contract_variable_quantity/__init__.py create mode 100644 product_contract_variable_quantity/__manifest__.py create mode 100644 product_contract_variable_quantity/models/__init__.py create mode 100644 product_contract_variable_quantity/models/contract_line.py create mode 100644 product_contract_variable_quantity/models/product_template.py create mode 100644 product_contract_variable_quantity/models/sale_order_line.py create mode 100644 product_contract_variable_quantity/readme/CONTRIBUTORS.rst create mode 100644 product_contract_variable_quantity/readme/DESCRIPTION.rst create mode 100644 product_contract_variable_quantity/static/description/icon.png create mode 100644 product_contract_variable_quantity/tests/__init__.py create mode 100644 product_contract_variable_quantity/tests/test_sale_order.py create mode 100644 product_contract_variable_quantity/views/product_template.xml create mode 100644 product_contract_variable_quantity/views/sale_order.xml diff --git a/product_contract_variable_quantity/README.rst b/product_contract_variable_quantity/README.rst new file mode 100644 index 0000000000..cc6bbf9629 --- /dev/null +++ b/product_contract_variable_quantity/README.rst @@ -0,0 +1,87 @@ +.. 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 + +================================== +Product Contract Variable Quantity +================================== + +Product contract with variable quantity + +Installation +============ + +To install this module, you need to: + +#. Do this ... + +Configuration +============= + +To configure this module, you need to: + +#. Go to ... + +.. figure:: path/to/local/image.png + :alt: alternative description + :width: 600 px + +Usage +===== + +To use this module, you need to: + +#. Go to ... + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/{repo_id}/{branch} + +.. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt +.. branch is "8.0" for example + + +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. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Firstname Lastname +* Second Person + +Funders +------- + +The development of this module has been financially supported by: + +* Company 1 name +* Company 2 name + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/product_contract_variable_quantity/__init__.py b/product_contract_variable_quantity/__init__.py new file mode 100644 index 0000000000..0ee8b5073e --- /dev/null +++ b/product_contract_variable_quantity/__init__.py @@ -0,0 +1,2 @@ +from . import models +from . import tests diff --git a/product_contract_variable_quantity/__manifest__.py b/product_contract_variable_quantity/__manifest__.py new file mode 100644 index 0000000000..21e7d8b4f5 --- /dev/null +++ b/product_contract_variable_quantity/__manifest__.py @@ -0,0 +1,15 @@ +# Copyright 2018 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + 'name': 'Product Contract Variable Quantity', + 'summary': """ + Product contract with variable quantity""", + 'version': '12.0.1.0.0', + 'license': 'AGPL-3', + 'author': 'ACSONE SA/NV,Odoo Community Association (OCA)', + 'website': 'https://github.com/OCA/contract', + 'depends': ['contract_variable_quantity', 'product_contract'], + 'data': ['views/product_template.xml', 'views/sale_order.xml'], + 'demo': [], +} diff --git a/product_contract_variable_quantity/models/__init__.py b/product_contract_variable_quantity/models/__init__.py new file mode 100644 index 0000000000..d25a9d7ceb --- /dev/null +++ b/product_contract_variable_quantity/models/__init__.py @@ -0,0 +1,6 @@ +# Copyright 2018 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import contract_line +from . import product_template +from . import sale_order_line diff --git a/product_contract_variable_quantity/models/contract_line.py b/product_contract_variable_quantity/models/contract_line.py new file mode 100644 index 0000000000..a28b5b9bdd --- /dev/null +++ b/product_contract_variable_quantity/models/contract_line.py @@ -0,0 +1,16 @@ +# Copyright 2017 LasLabs Inc. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + + +from odoo import api, fields, models + + +class AccountAnalyticInvoiceLine(models.Model): + _inherit = 'account.analytic.invoice.line' + + @api.onchange('product_id') + def onchange_product(self): + super(AccountAnalyticInvoiceLine, self).onchange_product() + if self.product_id.is_contract: + self.qty_type = self.product_id.qty_type + self.qty_formula_id = self.product_id.qty_formula_id diff --git a/product_contract_variable_quantity/models/product_template.py b/product_contract_variable_quantity/models/product_template.py new file mode 100644 index 0000000000..ad039bf2d2 --- /dev/null +++ b/product_contract_variable_quantity/models/product_template.py @@ -0,0 +1,31 @@ +# Copyright 2018 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class ProductTemplate(models.Model): + _inherit = 'product.template' + + qty_type = fields.Selection( + selection=[ + ('fixed', 'Fixed quantity'), + ('variable', 'Variable quantity'), + ], + required=False, + default='fixed', + string="Qty. type", + ) + qty_formula_id = fields.Many2one( + comodel_name="contract.line.qty.formula", string="Qty. formula" + ) + + @api.onchange('is_contract') + def _change_is_contract(self): + """ Clear the relation to contract_template_id when downgrading + product from contract + """ + super(ProductTemplate, self)._change_is_contract() + if not self.is_contract: + self.qty_type = False + self.qty_formula_id = False diff --git a/product_contract_variable_quantity/models/sale_order_line.py b/product_contract_variable_quantity/models/sale_order_line.py new file mode 100644 index 0000000000..bb58b3978b --- /dev/null +++ b/product_contract_variable_quantity/models/sale_order_line.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 LasLabs Inc. +# Copyright 2017 ACSONE SA/NV. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import api, fields, models, _ +from odoo.exceptions import ValidationError + + +class SaleOrderLine(models.Model): + _inherit = 'sale.order.line' + + qty_type = fields.Selection( + selection=[ + ('fixed', 'Fixed quantity'), + ('variable', 'Variable quantity'), + ], + required=False, + default='fixed', + string="Qty. type", + ) + qty_formula_id = fields.Many2one( + comodel_name="contract.line.qty.formula", string="Qty. formula" + ) + + @api.onchange('product_id') + def onchange_product(self): + super(SaleOrderLine, self).onchange_product() + if self.product_id.is_contract: + self.qty_type = self.product_id.qty_type + self.qty_formula_id = self.product_id.qty_formula_id + + @api.multi + def _prepare_contract_line_values(self, contract): + values = super(SaleOrderLine, self)._prepare_contract_line_values( + contract + ) + values['qty_type'] = self.qty_type + values['qty_formula_id'] = self.qty_formula_id.id + return values diff --git a/product_contract_variable_quantity/readme/CONTRIBUTORS.rst b/product_contract_variable_quantity/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..50e6298db5 --- /dev/null +++ b/product_contract_variable_quantity/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Souheil Bejaoui diff --git a/product_contract_variable_quantity/readme/DESCRIPTION.rst b/product_contract_variable_quantity/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..6e1777dbcd --- /dev/null +++ b/product_contract_variable_quantity/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module enable add default values to contract products for variable quantity formula. \ No newline at end of file diff --git a/product_contract_variable_quantity/static/description/icon.png b/product_contract_variable_quantity/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/product_contract_variable_quantity/tests/__init__.py b/product_contract_variable_quantity/tests/__init__.py new file mode 100644 index 0000000000..b5d241da0f --- /dev/null +++ b/product_contract_variable_quantity/tests/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2018 ACSONE SA/NV. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import test_sale_order diff --git a/product_contract_variable_quantity/tests/test_sale_order.py b/product_contract_variable_quantity/tests/test_sale_order.py new file mode 100644 index 0000000000..97c7012c32 --- /dev/null +++ b/product_contract_variable_quantity/tests/test_sale_order.py @@ -0,0 +1,59 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 ACSONE SA/NV. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo.tests.common import TransactionCase +from odoo.exceptions import ValidationError + + +class TestSaleOrder(TransactionCase): + def setUp(self): + super(TestSaleOrder, self).setUp() + self.product1 = self.env.ref('product.product_product_1') + self.sale = self.env.ref('sale.sale_order_2') + self.contract_template1 = self.env['account.analytic.contract'].create( + {'name': 'Template 1'} + ) + self.formula = self.env['contract.line.qty.formula'].create( + { + 'name': 'Test formula', + # For testing each of the possible variables + 'code': 'env["res.users"]\n' + 'context.get("lang")\n' + 'user.id\n' + 'line.qty_type\n' + 'contract.id\n' + 'invoice.id\n' + 'result = 12', + } + ) + self.product1.write( + { + 'is_contract': True, + 'contract_template_id': self.contract_template1.id, + 'qty_formula_id': self.formula.id, + 'qty_type': 'variable', + } + ) + self.order_line1 = self.sale.order_line.filtered( + lambda l: l.product_id == self.product1 + ) + + def test_onchange_product_id(self): + self.order_line1.onchange_product() + self.assertEqual( + self.order_line1.qty_formula_id, self.product1.qty_formula_id + ) + self.assertEqual(self.order_line1.qty_type, self.product1.qty_type) + + def test_action_confirm(self): + self.order_line1.onchange_product() + self.sale.action_confirm() + contract = self.order_line1.contract_id + contract_line = contract.recurring_invoice_line_ids.filtered( + lambda line: line.product_id == self.product1 + ) + self.assertEqual( + contract_line.qty_formula_id, self.product1.qty_formula_id + ) + self.assertEqual(contract_line.qty_type, self.product1.qty_type) diff --git a/product_contract_variable_quantity/views/product_template.xml b/product_contract_variable_quantity/views/product_template.xml new file mode 100644 index 0000000000..b215174f0e --- /dev/null +++ b/product_contract_variable_quantity/views/product_template.xml @@ -0,0 +1,30 @@ + + + + + + + + account.invoice.select.contract (in + product_contract_variable_quantity) + + product.template + + + + + + + + + + + + diff --git a/product_contract_variable_quantity/views/sale_order.xml b/product_contract_variable_quantity/views/sale_order.xml new file mode 100644 index 0000000000..c441c273ba --- /dev/null +++ b/product_contract_variable_quantity/views/sale_order.xml @@ -0,0 +1,38 @@ + + + + + + + + sale.order.form (in + product_contract_variable_quantity) + + sale.order + + + + + + + + + + + + {'required': [('qty_type', '=', 'fixed')], 'invisible': [('qty_type', '!=', 'fixed')]} + + + + + From 8728730658f6c3ce7771ac82969ee3d9765cbda2 Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Thu, 29 Nov 2018 12:06:02 +0100 Subject: [PATCH 02/31] [FIX] - fix onchange --- .../models/sale_order_line.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/product_contract_variable_quantity/models/sale_order_line.py b/product_contract_variable_quantity/models/sale_order_line.py index bb58b3978b..63d0c89c04 100644 --- a/product_contract_variable_quantity/models/sale_order_line.py +++ b/product_contract_variable_quantity/models/sale_order_line.py @@ -26,9 +26,10 @@ class SaleOrderLine(models.Model): @api.onchange('product_id') def onchange_product(self): super(SaleOrderLine, self).onchange_product() - if self.product_id.is_contract: - self.qty_type = self.product_id.qty_type - self.qty_formula_id = self.product_id.qty_formula_id + for rec in self: + if rec.product_id.is_contract: + rec.qty_type = rec.product_id.qty_type + rec.qty_formula_id = rec.product_id.qty_formula_id @api.multi def _prepare_contract_line_values(self, contract): From e3be5d50b8c8ac883cb574a5a07baa8e9097305a Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Tue, 4 Dec 2018 12:58:30 +0100 Subject: [PATCH 03/31] [IMP] - get contract line default data onchange product_id --- product_contract_variable_quantity/models/contract_line.py | 6 ++++-- .../models/sale_order_line.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/product_contract_variable_quantity/models/contract_line.py b/product_contract_variable_quantity/models/contract_line.py index a28b5b9bdd..29343c43eb 100644 --- a/product_contract_variable_quantity/models/contract_line.py +++ b/product_contract_variable_quantity/models/contract_line.py @@ -9,8 +9,10 @@ class AccountAnalyticInvoiceLine(models.Model): _inherit = 'account.analytic.invoice.line' @api.onchange('product_id') - def onchange_product(self): - super(AccountAnalyticInvoiceLine, self).onchange_product() + def _onchange_product_id_recurring_info(self): + super( + AccountAnalyticInvoiceLine, self + )._onchange_product_id_recurring_info() if self.product_id.is_contract: self.qty_type = self.product_id.qty_type self.qty_formula_id = self.product_id.qty_formula_id diff --git a/product_contract_variable_quantity/models/sale_order_line.py b/product_contract_variable_quantity/models/sale_order_line.py index 63d0c89c04..2f211edbc8 100644 --- a/product_contract_variable_quantity/models/sale_order_line.py +++ b/product_contract_variable_quantity/models/sale_order_line.py @@ -32,9 +32,11 @@ def onchange_product(self): rec.qty_formula_id = rec.product_id.qty_formula_id @api.multi - def _prepare_contract_line_values(self, contract): + def _prepare_contract_line_values( + self, contract, predecessor_contract_line=False + ): values = super(SaleOrderLine, self)._prepare_contract_line_values( - contract + contract, predecessor_contract_line ) values['qty_type'] = self.qty_type values['qty_formula_id'] = self.qty_formula_id.id From 89114698d60f8fd1da907f1168615ed1a9976367 Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Thu, 24 Jan 2019 12:08:00 +0100 Subject: [PATCH 04/31] [IMP] - improve sale order line view --- .../views/sale_order.xml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/product_contract_variable_quantity/views/sale_order.xml b/product_contract_variable_quantity/views/sale_order.xml index c441c273ba..802d80590b 100644 --- a/product_contract_variable_quantity/views/sale_order.xml +++ b/product_contract_variable_quantity/views/sale_order.xml @@ -14,13 +14,15 @@ sale.order - - - + + + + + @@ -29,9 +31,6 @@ - - {'required': [('qty_type', '=', 'fixed')], 'invisible': [('qty_type', '!=', 'fixed')]} - From 6b20598d79c74131440f76d10b3a016061570396 Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Fri, 1 Feb 2019 15:59:00 +0100 Subject: [PATCH 05/31] [FIX] - Fix unit tests --- product_contract_variable_quantity/tests/test_sale_order.py | 1 + 1 file changed, 1 insertion(+) diff --git a/product_contract_variable_quantity/tests/test_sale_order.py b/product_contract_variable_quantity/tests/test_sale_order.py index 97c7012c32..5062d1672e 100644 --- a/product_contract_variable_quantity/tests/test_sale_order.py +++ b/product_contract_variable_quantity/tests/test_sale_order.py @@ -30,6 +30,7 @@ def setUp(self): self.product1.write( { 'is_contract': True, + 'default_qty': 12, 'contract_template_id': self.contract_template1.id, 'qty_formula_id': self.formula.id, 'qty_type': 'variable', From 85428f42414e3d14bfe7f1ccf6096f2b499e9ac2 Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Mon, 30 Sep 2019 12:26:44 +0200 Subject: [PATCH 06/31] [12.0][REF] - Product Contract Variable quantity: split from analytic account --- .../models/contract_line.py | 11 +++++------ .../tests/test_sale_order.py | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/product_contract_variable_quantity/models/contract_line.py b/product_contract_variable_quantity/models/contract_line.py index 29343c43eb..c2177ab85e 100644 --- a/product_contract_variable_quantity/models/contract_line.py +++ b/product_contract_variable_quantity/models/contract_line.py @@ -2,17 +2,16 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import api, fields, models +from odoo import api, models -class AccountAnalyticInvoiceLine(models.Model): - _inherit = 'account.analytic.invoice.line' +class ContractLine(models.Model): + _inherit = 'contract.line' @api.onchange('product_id') def _onchange_product_id_recurring_info(self): - super( - AccountAnalyticInvoiceLine, self - )._onchange_product_id_recurring_info() + res = super(ContractLine, self)._onchange_product_id_recurring_info() if self.product_id.is_contract: self.qty_type = self.product_id.qty_type self.qty_formula_id = self.product_id.qty_formula_id + return res diff --git a/product_contract_variable_quantity/tests/test_sale_order.py b/product_contract_variable_quantity/tests/test_sale_order.py index 5062d1672e..6b6a64b54e 100644 --- a/product_contract_variable_quantity/tests/test_sale_order.py +++ b/product_contract_variable_quantity/tests/test_sale_order.py @@ -11,7 +11,7 @@ def setUp(self): super(TestSaleOrder, self).setUp() self.product1 = self.env.ref('product.product_product_1') self.sale = self.env.ref('sale.sale_order_2') - self.contract_template1 = self.env['account.analytic.contract'].create( + self.contract_template1 = self.env['contract.template'].create( {'name': 'Template 1'} ) self.formula = self.env['contract.line.qty.formula'].create( @@ -51,7 +51,7 @@ def test_action_confirm(self): self.order_line1.onchange_product() self.sale.action_confirm() contract = self.order_line1.contract_id - contract_line = contract.recurring_invoice_line_ids.filtered( + contract_line = contract.contract_line_ids.filtered( lambda line: line.product_id == self.product1 ) self.assertEqual( From 44682d5bd348c52eafe21d3f3e37f2247d479c59 Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Mon, 30 Sep 2019 14:25:09 +0200 Subject: [PATCH 07/31] fix pylint --- product_contract_variable_quantity/models/product_template.py | 3 ++- product_contract_variable_quantity/models/sale_order_line.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/product_contract_variable_quantity/models/product_template.py b/product_contract_variable_quantity/models/product_template.py index ad039bf2d2..a99ae9aaf4 100644 --- a/product_contract_variable_quantity/models/product_template.py +++ b/product_contract_variable_quantity/models/product_template.py @@ -25,7 +25,8 @@ def _change_is_contract(self): """ Clear the relation to contract_template_id when downgrading product from contract """ - super(ProductTemplate, self)._change_is_contract() + res = super(ProductTemplate, self)._change_is_contract() if not self.is_contract: self.qty_type = False self.qty_formula_id = False + return res diff --git a/product_contract_variable_quantity/models/sale_order_line.py b/product_contract_variable_quantity/models/sale_order_line.py index 2f211edbc8..d66b98742c 100644 --- a/product_contract_variable_quantity/models/sale_order_line.py +++ b/product_contract_variable_quantity/models/sale_order_line.py @@ -25,11 +25,12 @@ class SaleOrderLine(models.Model): @api.onchange('product_id') def onchange_product(self): - super(SaleOrderLine, self).onchange_product() + res = super(SaleOrderLine, self).onchange_product() for rec in self: if rec.product_id.is_contract: rec.qty_type = rec.product_id.qty_type rec.qty_formula_id = rec.product_id.qty_formula_id + return res @api.multi def _prepare_contract_line_values( From f2def4d7bc91e20e79340848cb8c8f3f0d35102c Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Tue, 1 Oct 2019 11:47:47 +0200 Subject: [PATCH 08/31] [12.0][FIX] - Fix unit tests --- product_contract_variable_quantity/models/sale_order_line.py | 3 +-- product_contract_variable_quantity/readme/DESCRIPTION.rst | 2 +- product_contract_variable_quantity/tests/test_sale_order.py | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/product_contract_variable_quantity/models/sale_order_line.py b/product_contract_variable_quantity/models/sale_order_line.py index d66b98742c..3cb055acc3 100644 --- a/product_contract_variable_quantity/models/sale_order_line.py +++ b/product_contract_variable_quantity/models/sale_order_line.py @@ -3,8 +3,7 @@ # Copyright 2017 ACSONE SA/NV. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import api, fields, models, _ -from odoo.exceptions import ValidationError +from odoo import api, fields, models class SaleOrderLine(models.Model): diff --git a/product_contract_variable_quantity/readme/DESCRIPTION.rst b/product_contract_variable_quantity/readme/DESCRIPTION.rst index 6e1777dbcd..3e5d5e3c91 100644 --- a/product_contract_variable_quantity/readme/DESCRIPTION.rst +++ b/product_contract_variable_quantity/readme/DESCRIPTION.rst @@ -1 +1 @@ -This module enable add default values to contract products for variable quantity formula. \ No newline at end of file +This module add default values to contract products for variable quantity formula. \ No newline at end of file diff --git a/product_contract_variable_quantity/tests/test_sale_order.py b/product_contract_variable_quantity/tests/test_sale_order.py index 6b6a64b54e..17485cc977 100644 --- a/product_contract_variable_quantity/tests/test_sale_order.py +++ b/product_contract_variable_quantity/tests/test_sale_order.py @@ -3,7 +3,6 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo.tests.common import TransactionCase -from odoo.exceptions import ValidationError class TestSaleOrder(TransactionCase): From 7bda144dec91329ed1eb85c0a0be59252ad11c51 Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Tue, 1 Oct 2019 16:43:51 +0200 Subject: [PATCH 09/31] [IMP] - Improve unit tests --- .../tests/test_sale_order.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/product_contract_variable_quantity/tests/test_sale_order.py b/product_contract_variable_quantity/tests/test_sale_order.py index 17485cc977..a80332c910 100644 --- a/product_contract_variable_quantity/tests/test_sale_order.py +++ b/product_contract_variable_quantity/tests/test_sale_order.py @@ -39,6 +39,13 @@ def setUp(self): lambda l: l.product_id == self.product1 ) + def test_change_is_contract(self): + product_tmpl = self.product1.product_tmpl_id + product_tmpl.is_contract = False + self.assertTrue(product_tmpl.qty_type) + product_tmpl._change_is_contract() + self.assertFalse(product_tmpl.qty_type) + def test_onchange_product_id(self): self.order_line1.onchange_product() self.assertEqual( @@ -57,3 +64,7 @@ def test_action_confirm(self): contract_line.qty_formula_id, self.product1.qty_formula_id ) self.assertEqual(contract_line.qty_type, self.product1.qty_type) + self.assertEqual(contract_line.qty_type, 'variable') + self.product1.product_tmpl_id.qty_type = 'fixed' + contract_line._onchange_product_id_recurring_info() + self.assertEqual(contract_line.qty_type, 'fixed') From a7900b954980081dc8bf0070aeb7ab1cd0e704d7 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 31 Oct 2019 08:53:05 +0000 Subject: [PATCH 10/31] [UPD] Update product_contract_variable_quantity.pot --- .../product_contract_variable_quantity.pot | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 product_contract_variable_quantity/i18n/product_contract_variable_quantity.pot diff --git a/product_contract_variable_quantity/i18n/product_contract_variable_quantity.pot b/product_contract_variable_quantity/i18n/product_contract_variable_quantity.pot new file mode 100644 index 0000000000..12ef817ce0 --- /dev/null +++ b/product_contract_variable_quantity/i18n/product_contract_variable_quantity.pot @@ -0,0 +1,56 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_contract_variable_quantity +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.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: product_contract_variable_quantity +#: model:ir.model,name:product_contract_variable_quantity.model_contract_line +msgid "Contract Line" +msgstr "" + +#. module: product_contract_variable_quantity +#: selection:product.template,qty_type:0 +#: selection:sale.order.line,qty_type:0 +msgid "Fixed quantity" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model,name:product_contract_variable_quantity.model_product_template +msgid "Product Template" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_formula_id +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_formula_id +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_formula_id +msgid "Qty. formula" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_type +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_type +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_type +msgid "Qty. type" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model,name:product_contract_variable_quantity.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: product_contract_variable_quantity +#: selection:product.template,qty_type:0 +#: selection:sale.order.line,qty_type:0 +msgid "Variable quantity" +msgstr "" + From d7084ce95c30386b6e23a6b6b337857e73279fa9 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 31 Oct 2019 09:12:10 +0000 Subject: [PATCH 11/31] [UPD] README.rst --- product_contract_variable_quantity/README.rst | 96 ++-- .../static/description/index.html | 419 ++++++++++++++++++ 2 files changed, 460 insertions(+), 55 deletions(-) create mode 100644 product_contract_variable_quantity/static/description/index.html diff --git a/product_contract_variable_quantity/README.rst b/product_contract_variable_quantity/README.rst index cc6bbf9629..4b3785d854 100644 --- a/product_contract_variable_quantity/README.rst +++ b/product_contract_variable_quantity/README.rst @@ -1,87 +1,73 @@ -.. 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 - ================================== Product Contract Variable Quantity ================================== -Product contract with variable quantity - -Installation -============ - -To install this module, you need to: - -#. Do this ... - -Configuration -============= - -To configure this module, you need to: - -#. Go to ... - -.. figure:: path/to/local/image.png - :alt: alternative description - :width: 600 px +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -Usage -===== +.. |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/product_contract_variable_quantity + :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-product_contract_variable_quantity + :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 -To use this module, you need to: +|badge1| |badge2| |badge3| |badge4| |badge5| -#. Go to ... +This module add default values to contract products for variable quantity formula. -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/{repo_id}/{branch} - -.. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt -.. branch is "8.0" for example +**Table of contents** +.. contents:: + :local: 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. +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 ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* ACSONE SA/NV Contributors ------------- - -* Firstname Lastname -* Second Person - -Funders -------- +~~~~~~~~~~~~ -The development of this module has been financially supported by: +* Souheil Bejaoui -* Company 1 name -* Company 2 name +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/product_contract_variable_quantity/static/description/index.html b/product_contract_variable_quantity/static/description/index.html new file mode 100644 index 0000000000..1fdd879bfa --- /dev/null +++ b/product_contract_variable_quantity/static/description/index.html @@ -0,0 +1,419 @@ + + + + + + +Product Contract Variable Quantity + + + +
+

Product Contract Variable Quantity

+ + +

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

+

This module add default values to contract products for variable quantity formula.

+

Table of contents

+ +
+

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

+
    +
  • ACSONE SA/NV
  • +
+
+
+

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.

+
+
+
+ + From 0c643eda7a5dbee9ed941a5d3581450c71f31a50 Mon Sep 17 00:00:00 2001 From: Mario Riva Date: Tue, 4 Feb 2020 15:12:33 +0000 Subject: [PATCH 12/31] Added translation using Weblate (Italian) --- product_contract_variable_quantity/i18n/it.po | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 product_contract_variable_quantity/i18n/it.po diff --git a/product_contract_variable_quantity/i18n/it.po b/product_contract_variable_quantity/i18n/it.po new file mode 100644 index 0000000000..046ee97a01 --- /dev/null +++ b/product_contract_variable_quantity/i18n/it.po @@ -0,0 +1,56 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_contract_variable_quantity +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: product_contract_variable_quantity +#: model:ir.model,name:product_contract_variable_quantity.model_contract_line +msgid "Contract Line" +msgstr "" + +#. module: product_contract_variable_quantity +#: selection:product.template,qty_type:0 +#: selection:sale.order.line,qty_type:0 +msgid "Fixed quantity" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model,name:product_contract_variable_quantity.model_product_template +msgid "Product Template" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_formula_id +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_formula_id +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_formula_id +msgid "Qty. formula" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_type +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_type +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_type +msgid "Qty. type" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model,name:product_contract_variable_quantity.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: product_contract_variable_quantity +#: selection:product.template,qty_type:0 +#: selection:sale.order.line,qty_type:0 +msgid "Variable quantity" +msgstr "" From a0a505a7dacec8564f33046e7a5857a00bc93779 Mon Sep 17 00:00:00 2001 From: Mario Riva Date: Tue, 4 Feb 2020 15:12:53 +0000 Subject: [PATCH 13/31] Translated using Weblate (Italian) Currently translated at 100.0% (7 of 7 strings) Translation: contract-12.0/contract-12.0-product_contract_variable_quantity Translate-URL: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-product_contract_variable_quantity/it/ --- product_contract_variable_quantity/i18n/it.po | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/product_contract_variable_quantity/i18n/it.po b/product_contract_variable_quantity/i18n/it.po index 046ee97a01..88462e795e 100644 --- a/product_contract_variable_quantity/i18n/it.po +++ b/product_contract_variable_quantity/i18n/it.po @@ -6,51 +6,53 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2020-02-04 18:13+0000\n" +"Last-Translator: Mario Riva \n" "Language-Team: none\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.10\n" #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_contract_line msgid "Contract Line" -msgstr "" +msgstr "Riga di contratto" #. module: product_contract_variable_quantity #: selection:product.template,qty_type:0 #: selection:sale.order.line,qty_type:0 msgid "Fixed quantity" -msgstr "" +msgstr "Quantità fissa" #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_product_template msgid "Product Template" -msgstr "" +msgstr "Template di prodotto" #. module: product_contract_variable_quantity #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_formula_id #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_formula_id #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_formula_id msgid "Qty. formula" -msgstr "" +msgstr "Qtà formula" #. module: product_contract_variable_quantity #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_type #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_type #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_type msgid "Qty. type" -msgstr "" +msgstr "Qtà tipo" #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_sale_order_line msgid "Sales Order Line" -msgstr "" +msgstr "Riga ordine di vendita" #. module: product_contract_variable_quantity #: selection:product.template,qty_type:0 #: selection:sale.order.line,qty_type:0 msgid "Variable quantity" -msgstr "" +msgstr "Quantità variabile" From 4a4e0f37b980ded1d20f0ea118f3f8096b91a780 Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Wed, 12 Feb 2020 03:46:23 +0000 Subject: [PATCH 14/31] Added translation using Weblate (Portuguese (Brazil)) --- .../i18n/pt_BR.po | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 product_contract_variable_quantity/i18n/pt_BR.po diff --git a/product_contract_variable_quantity/i18n/pt_BR.po b/product_contract_variable_quantity/i18n/pt_BR.po new file mode 100644 index 0000000000..eae0f96e30 --- /dev/null +++ b/product_contract_variable_quantity/i18n/pt_BR.po @@ -0,0 +1,56 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_contract_variable_quantity +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" + +#. module: product_contract_variable_quantity +#: model:ir.model,name:product_contract_variable_quantity.model_contract_line +msgid "Contract Line" +msgstr "" + +#. module: product_contract_variable_quantity +#: selection:product.template,qty_type:0 +#: selection:sale.order.line,qty_type:0 +msgid "Fixed quantity" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model,name:product_contract_variable_quantity.model_product_template +msgid "Product Template" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_formula_id +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_formula_id +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_formula_id +msgid "Qty. formula" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_type +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_type +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_type +msgid "Qty. type" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model,name:product_contract_variable_quantity.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: product_contract_variable_quantity +#: selection:product.template,qty_type:0 +#: selection:sale.order.line,qty_type:0 +msgid "Variable quantity" +msgstr "" From a02ac30d2faa0d8903c32a00fc4cc5b79c1b6434 Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Wed, 12 Feb 2020 04:12:58 +0000 Subject: [PATCH 15/31] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (7 of 7 strings) Translation: contract-12.0/contract-12.0-product_contract_variable_quantity Translate-URL: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-product_contract_variable_quantity/pt_BR/ --- .../i18n/pt_BR.po | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/product_contract_variable_quantity/i18n/pt_BR.po b/product_contract_variable_quantity/i18n/pt_BR.po index eae0f96e30..c147e85eb8 100644 --- a/product_contract_variable_quantity/i18n/pt_BR.po +++ b/product_contract_variable_quantity/i18n/pt_BR.po @@ -6,51 +6,53 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2020-02-12 05:03+0000\n" +"Last-Translator: Marcel Savegnago \n" "Language-Team: none\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.10\n" #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_contract_line msgid "Contract Line" -msgstr "" +msgstr "Linha de Contrato" #. module: product_contract_variable_quantity #: selection:product.template,qty_type:0 #: selection:sale.order.line,qty_type:0 msgid "Fixed quantity" -msgstr "" +msgstr "Quantidade Fixa" #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_product_template msgid "Product Template" -msgstr "" +msgstr "Template de Produto" #. module: product_contract_variable_quantity #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_formula_id #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_formula_id #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_formula_id msgid "Qty. formula" -msgstr "" +msgstr "Fórmula da Qtd" #. module: product_contract_variable_quantity #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_type #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_type #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_type msgid "Qty. type" -msgstr "" +msgstr "Tipo de Qtd" #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_sale_order_line msgid "Sales Order Line" -msgstr "" +msgstr "Linha de Ordens de Venda" #. module: product_contract_variable_quantity #: selection:product.template,qty_type:0 #: selection:sale.order.line,qty_type:0 msgid "Variable quantity" -msgstr "" +msgstr "Quantidade Variável" From 5856236ff18b36f9a2f5d06011360a37438d72fa Mon Sep 17 00:00:00 2001 From: Pedro Castro Silva Date: Mon, 17 Feb 2020 22:50:18 +0000 Subject: [PATCH 16/31] Added translation using Weblate (Portuguese) --- product_contract_variable_quantity/i18n/pt.po | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 product_contract_variable_quantity/i18n/pt.po diff --git a/product_contract_variable_quantity/i18n/pt.po b/product_contract_variable_quantity/i18n/pt.po new file mode 100644 index 0000000000..a35ced3986 --- /dev/null +++ b/product_contract_variable_quantity/i18n/pt.po @@ -0,0 +1,56 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_contract_variable_quantity +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: pt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" + +#. module: product_contract_variable_quantity +#: model:ir.model,name:product_contract_variable_quantity.model_contract_line +msgid "Contract Line" +msgstr "" + +#. module: product_contract_variable_quantity +#: selection:product.template,qty_type:0 +#: selection:sale.order.line,qty_type:0 +msgid "Fixed quantity" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model,name:product_contract_variable_quantity.model_product_template +msgid "Product Template" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_formula_id +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_formula_id +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_formula_id +msgid "Qty. formula" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_type +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_type +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_type +msgid "Qty. type" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model,name:product_contract_variable_quantity.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: product_contract_variable_quantity +#: selection:product.template,qty_type:0 +#: selection:sale.order.line,qty_type:0 +msgid "Variable quantity" +msgstr "" From 2f0574ce0069b83beba1d476427c9ad037126048 Mon Sep 17 00:00:00 2001 From: Pedro Castro Silva Date: Mon, 17 Feb 2020 22:50:29 +0000 Subject: [PATCH 17/31] Translated using Weblate (Portuguese) Currently translated at 100.0% (7 of 7 strings) Translation: contract-12.0/contract-12.0-product_contract_variable_quantity Translate-URL: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-product_contract_variable_quantity/pt/ --- product_contract_variable_quantity/i18n/pt.po | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/product_contract_variable_quantity/i18n/pt.po b/product_contract_variable_quantity/i18n/pt.po index a35ced3986..34cd2ecdeb 100644 --- a/product_contract_variable_quantity/i18n/pt.po +++ b/product_contract_variable_quantity/i18n/pt.po @@ -6,51 +6,53 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2020-02-18 01:13+0000\n" +"Last-Translator: Pedro Castro Silva \n" "Language-Team: none\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.10\n" #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_contract_line msgid "Contract Line" -msgstr "" +msgstr "Linha de Contrato" #. module: product_contract_variable_quantity #: selection:product.template,qty_type:0 #: selection:sale.order.line,qty_type:0 msgid "Fixed quantity" -msgstr "" +msgstr "Quantidade fixa" #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_product_template msgid "Product Template" -msgstr "" +msgstr "Modelo de Artigo" #. module: product_contract_variable_quantity #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_formula_id #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_formula_id #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_formula_id msgid "Qty. formula" -msgstr "" +msgstr "Fórmula de Qtd." #. module: product_contract_variable_quantity #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_type #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_type #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_type msgid "Qty. type" -msgstr "" +msgstr "Tipo de Qtd." #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_sale_order_line msgid "Sales Order Line" -msgstr "" +msgstr "Linha de Encomenda de Venda" #. module: product_contract_variable_quantity #: selection:product.template,qty_type:0 #: selection:sale.order.line,qty_type:0 msgid "Variable quantity" -msgstr "" +msgstr "Quantidade variável" From 2ea97a78a38e403efd757986c3db1793c6b60feb Mon Sep 17 00:00:00 2001 From: Pedro Castro Silva Date: Sun, 1 Mar 2020 15:56:43 +0000 Subject: [PATCH 18/31] Translated using Weblate (Portuguese) Currently translated at 100.0% (7 of 7 strings) Translation: contract-12.0/contract-12.0-product_contract_variable_quantity Translate-URL: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-product_contract_variable_quantity/pt/ --- product_contract_variable_quantity/i18n/pt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/product_contract_variable_quantity/i18n/pt.po b/product_contract_variable_quantity/i18n/pt.po index 34cd2ecdeb..2634c23dd5 100644 --- a/product_contract_variable_quantity/i18n/pt.po +++ b/product_contract_variable_quantity/i18n/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2020-02-18 01:13+0000\n" +"PO-Revision-Date: 2020-03-01 18:13+0000\n" "Last-Translator: Pedro Castro Silva \n" "Language-Team: none\n" "Language: pt\n" @@ -37,7 +37,7 @@ msgstr "Modelo de Artigo" #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_formula_id #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_formula_id msgid "Qty. formula" -msgstr "Fórmula de Qtd." +msgstr "Fórmula de Qtd" #. module: product_contract_variable_quantity #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_type From c7429fe0d9c9971499d6af17b5e2a664da685547 Mon Sep 17 00:00:00 2001 From: Ernesto Tejeda Date: Tue, 25 Feb 2020 23:05:31 -0500 Subject: [PATCH 19/31] [FIX] product_contract_variable_quantity: use property_contract_template_id --- .../models/product_template.py | 2 -- product_contract_variable_quantity/tests/test_sale_order.py | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/product_contract_variable_quantity/models/product_template.py b/product_contract_variable_quantity/models/product_template.py index a99ae9aaf4..d4152d206f 100644 --- a/product_contract_variable_quantity/models/product_template.py +++ b/product_contract_variable_quantity/models/product_template.py @@ -25,8 +25,6 @@ def _change_is_contract(self): """ Clear the relation to contract_template_id when downgrading product from contract """ - res = super(ProductTemplate, self)._change_is_contract() if not self.is_contract: self.qty_type = False self.qty_formula_id = False - return res diff --git a/product_contract_variable_quantity/tests/test_sale_order.py b/product_contract_variable_quantity/tests/test_sale_order.py index a80332c910..b820f1c965 100644 --- a/product_contract_variable_quantity/tests/test_sale_order.py +++ b/product_contract_variable_quantity/tests/test_sale_order.py @@ -26,11 +26,12 @@ def setUp(self): 'result = 12', } ) - self.product1.write( + self.product1.with_context( + force_company=self.sale.company_id.id).write( { 'is_contract': True, 'default_qty': 12, - 'contract_template_id': self.contract_template1.id, + 'property_contract_template_id': self.contract_template1.id, 'qty_formula_id': self.formula.id, 'qty_type': 'variable', } From 87a1e0de8b3585c6c0f332072e70cea293d8f59c Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 25 Mar 2020 18:14:10 +0000 Subject: [PATCH 20/31] [UPD] README.rst --- product_contract_variable_quantity/README.rst | 5 +---- .../static/description/index.html | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/product_contract_variable_quantity/README.rst b/product_contract_variable_quantity/README.rst index 4b3785d854..720e7c2bfb 100644 --- a/product_contract_variable_quantity/README.rst +++ b/product_contract_variable_quantity/README.rst @@ -19,11 +19,8 @@ Product Contract Variable Quantity .. |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-product_contract_variable_quantity :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| +|badge1| |badge2| |badge3| |badge4| This module add default values to contract products for variable quantity formula. diff --git a/product_contract_variable_quantity/static/description/index.html b/product_contract_variable_quantity/static/description/index.html index 1fdd879bfa..24f6e77e2c 100644 --- a/product_contract_variable_quantity/static/description/index.html +++ b/product_contract_variable_quantity/static/description/index.html @@ -367,7 +367,7 @@

Product Contract Variable Quantity

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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

This module add default values to contract products for variable quantity formula.

Table of contents

From edaedd5064f4c7d3d6ae84b1d7ee1f784ada2013 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 25 Mar 2020 18:14:25 +0000 Subject: [PATCH 21/31] [UPD] README.rst --- product_contract_variable_quantity/README.rst | 5 ++++- .../static/description/index.html | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/product_contract_variable_quantity/README.rst b/product_contract_variable_quantity/README.rst index 720e7c2bfb..4b3785d854 100644 --- a/product_contract_variable_quantity/README.rst +++ b/product_contract_variable_quantity/README.rst @@ -19,8 +19,11 @@ Product Contract Variable Quantity .. |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-product_contract_variable_quantity :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| +|badge1| |badge2| |badge3| |badge4| |badge5| This module add default values to contract products for variable quantity formula. diff --git a/product_contract_variable_quantity/static/description/index.html b/product_contract_variable_quantity/static/description/index.html index 24f6e77e2c..1fdd879bfa 100644 --- a/product_contract_variable_quantity/static/description/index.html +++ b/product_contract_variable_quantity/static/description/index.html @@ -367,7 +367,7 @@

Product Contract Variable Quantity

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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

This module add default values to contract products for variable quantity formula.

Table of contents

From fa7378415f38583f3e30c11ff9bf758db3639780 Mon Sep 17 00:00:00 2001 From: Fernando Colus Date: Mon, 10 Aug 2020 14:34:51 +0000 Subject: [PATCH 22/31] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (7 of 7 strings) Translation: contract-12.0/contract-12.0-product_contract_variable_quantity Translate-URL: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-product_contract_variable_quantity/pt_BR/ --- product_contract_variable_quantity/i18n/pt_BR.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/product_contract_variable_quantity/i18n/pt_BR.po b/product_contract_variable_quantity/i18n/pt_BR.po index c147e85eb8..69adafb7f4 100644 --- a/product_contract_variable_quantity/i18n/pt_BR.po +++ b/product_contract_variable_quantity/i18n/pt_BR.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2020-02-12 05:03+0000\n" -"Last-Translator: Marcel Savegnago \n" +"PO-Revision-Date: 2020-08-10 16:59+0000\n" +"Last-Translator: Fernando Colus \n" "Language-Team: none\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -30,26 +30,26 @@ msgstr "Quantidade Fixa" #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_product_template msgid "Product Template" -msgstr "Template de Produto" +msgstr "Modelo de Produto" #. module: product_contract_variable_quantity #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_formula_id #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_formula_id #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_formula_id msgid "Qty. formula" -msgstr "Fórmula da Qtd" +msgstr "Fórmula da Quantidade" #. module: product_contract_variable_quantity #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_type #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_type #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_type msgid "Qty. type" -msgstr "Tipo de Qtd" +msgstr "Tipo de Quantidade" #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_sale_order_line msgid "Sales Order Line" -msgstr "Linha de Ordens de Venda" +msgstr "Linha do Pedido de Venda" #. module: product_contract_variable_quantity #: selection:product.template,qty_type:0 From bd38da5a8b38b9bc27747cbbecbc4085043537c1 Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Fri, 13 Nov 2020 17:32:28 +0100 Subject: [PATCH 23/31] [FIX] - remvoe unnecessary utf8 coding comment --- product_contract_variable_quantity/models/sale_order_line.py | 1 - product_contract_variable_quantity/tests/test_sale_order.py | 1 - 2 files changed, 2 deletions(-) diff --git a/product_contract_variable_quantity/models/sale_order_line.py b/product_contract_variable_quantity/models/sale_order_line.py index 3cb055acc3..fad3de9609 100644 --- a/product_contract_variable_quantity/models/sale_order_line.py +++ b/product_contract_variable_quantity/models/sale_order_line.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2017 LasLabs Inc. # Copyright 2017 ACSONE SA/NV. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/product_contract_variable_quantity/tests/test_sale_order.py b/product_contract_variable_quantity/tests/test_sale_order.py index b820f1c965..a0a7ad60e6 100644 --- a/product_contract_variable_quantity/tests/test_sale_order.py +++ b/product_contract_variable_quantity/tests/test_sale_order.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2018 ACSONE SA/NV. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). From 0d824b182420c9cd0ab634194cac909b7cc35d73 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 13 Nov 2020 17:48:24 +0000 Subject: [PATCH 24/31] product_contract_variable_quantity 12.0.1.0.1 --- product_contract_variable_quantity/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product_contract_variable_quantity/__manifest__.py b/product_contract_variable_quantity/__manifest__.py index 21e7d8b4f5..d261314e77 100644 --- a/product_contract_variable_quantity/__manifest__.py +++ b/product_contract_variable_quantity/__manifest__.py @@ -5,7 +5,7 @@ 'name': 'Product Contract Variable Quantity', 'summary': """ Product contract with variable quantity""", - 'version': '12.0.1.0.0', + 'version': '12.0.1.0.1', 'license': 'AGPL-3', 'author': 'ACSONE SA/NV,Odoo Community Association (OCA)', 'website': 'https://github.com/OCA/contract', From 84a0e21cbcf89baf263e81b8b3ccbd6c6c05d281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi?= Date: Mon, 4 Jan 2021 09:40:43 +0000 Subject: [PATCH 25/31] Added translation using Weblate (French) --- product_contract_variable_quantity/i18n/fr.po | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 product_contract_variable_quantity/i18n/fr.po diff --git a/product_contract_variable_quantity/i18n/fr.po b/product_contract_variable_quantity/i18n/fr.po new file mode 100644 index 0000000000..033493e44f --- /dev/null +++ b/product_contract_variable_quantity/i18n/fr.po @@ -0,0 +1,56 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_contract_variable_quantity +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" + +#. module: product_contract_variable_quantity +#: model:ir.model,name:product_contract_variable_quantity.model_contract_line +msgid "Contract Line" +msgstr "" + +#. module: product_contract_variable_quantity +#: selection:product.template,qty_type:0 +#: selection:sale.order.line,qty_type:0 +msgid "Fixed quantity" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model,name:product_contract_variable_quantity.model_product_template +msgid "Product Template" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_formula_id +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_formula_id +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_formula_id +msgid "Qty. formula" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_type +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_type +#: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_type +msgid "Qty. type" +msgstr "" + +#. module: product_contract_variable_quantity +#: model:ir.model,name:product_contract_variable_quantity.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: product_contract_variable_quantity +#: selection:product.template,qty_type:0 +#: selection:sale.order.line,qty_type:0 +msgid "Variable quantity" +msgstr "" From fd9629b1d3ffed27c1687a77da11c92709ab7db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi?= Date: Mon, 4 Jan 2021 09:41:28 +0000 Subject: [PATCH 26/31] Translated using Weblate (French) Currently translated at 100.0% (7 of 7 strings) Translation: contract-12.0/contract-12.0-product_contract_variable_quantity Translate-URL: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-product_contract_variable_quantity/fr/ --- product_contract_variable_quantity/i18n/fr.po | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/product_contract_variable_quantity/i18n/fr.po b/product_contract_variable_quantity/i18n/fr.po index 033493e44f..9c63475492 100644 --- a/product_contract_variable_quantity/i18n/fr.po +++ b/product_contract_variable_quantity/i18n/fr.po @@ -6,51 +6,53 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2021-01-04 11:44+0000\n" +"Last-Translator: Rémi \n" "Language-Team: none\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.3.2\n" #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_contract_line msgid "Contract Line" -msgstr "" +msgstr "Ligne de Contrat" #. module: product_contract_variable_quantity #: selection:product.template,qty_type:0 #: selection:sale.order.line,qty_type:0 msgid "Fixed quantity" -msgstr "" +msgstr "Quantité fixe" #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_product_template msgid "Product Template" -msgstr "" +msgstr "Modèle d'article" #. module: product_contract_variable_quantity #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_formula_id #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_formula_id #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_formula_id msgid "Qty. formula" -msgstr "" +msgstr "Formule de Quantité" #. module: product_contract_variable_quantity #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_type #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_template__qty_type #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_sale_order_line__qty_type msgid "Qty. type" -msgstr "" +msgstr "Type de quantité" #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_sale_order_line msgid "Sales Order Line" -msgstr "" +msgstr "Ligne de commande" #. module: product_contract_variable_quantity #: selection:product.template,qty_type:0 #: selection:sale.order.line,qty_type:0 msgid "Variable quantity" -msgstr "" +msgstr "Quantité variable" From 3759b13c4224ce765f45e2905da83beb0a3d3f7a Mon Sep 17 00:00:00 2001 From: Francesco Foresti Date: Wed, 18 Jan 2023 09:02:33 +0000 Subject: [PATCH 27/31] Translated using Weblate (Italian) Currently translated at 100.0% (7 of 7 strings) Translation: contract-12.0/contract-12.0-product_contract_variable_quantity Translate-URL: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-product_contract_variable_quantity/it/ --- product_contract_variable_quantity/i18n/it.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/product_contract_variable_quantity/i18n/it.po b/product_contract_variable_quantity/i18n/it.po index 88462e795e..c78af53960 100644 --- a/product_contract_variable_quantity/i18n/it.po +++ b/product_contract_variable_quantity/i18n/it.po @@ -6,15 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2020-02-04 18:13+0000\n" -"Last-Translator: Mario Riva \n" +"PO-Revision-Date: 2023-01-18 11:59+0000\n" +"Last-Translator: Francesco Foresti \n" "Language-Team: none\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.10\n" +"X-Generator: Weblate 4.14.1\n" #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_contract_line @@ -30,7 +30,7 @@ msgstr "Quantità fissa" #. module: product_contract_variable_quantity #: model:ir.model,name:product_contract_variable_quantity.model_product_template msgid "Product Template" -msgstr "Template di prodotto" +msgstr "Modello prodotto" #. module: product_contract_variable_quantity #: model:ir.model.fields,field_description:product_contract_variable_quantity.field_product_product__qty_formula_id From b0aca9e2b27a13f2cf358f84a799d4b1b63f93fc Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Sun, 3 Sep 2023 12:10:24 +0000 Subject: [PATCH 28/31] [UPD] README.rst --- product_contract_variable_quantity/README.rst | 15 ++++---- .../static/description/index.html | 34 ++++++++++--------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/product_contract_variable_quantity/README.rst b/product_contract_variable_quantity/README.rst index 4b3785d854..22fae6e5cd 100644 --- a/product_contract_variable_quantity/README.rst +++ b/product_contract_variable_quantity/README.rst @@ -2,10 +2,13 @@ Product Contract Variable Quantity ================================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:9d3e841cf1aa3507deb9b0cc7a1acad44748585954d00d33e423a6c48db4a798 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -19,11 +22,11 @@ Product Contract Variable Quantity .. |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-product_contract_variable_quantity :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 +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/contract&target_branch=12.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module add default values to contract products for variable quantity formula. @@ -37,7 +40,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed +If you spotted it first, help us to smash it by providing a detailed and welcomed `feedback `_. Do not contact contributors directly about support or help with technical issues. diff --git a/product_contract_variable_quantity/static/description/index.html b/product_contract_variable_quantity/static/description/index.html index 1fdd879bfa..31381adcca 100644 --- a/product_contract_variable_quantity/static/description/index.html +++ b/product_contract_variable_quantity/static/description/index.html @@ -1,20 +1,20 @@ - + - + Product Contract Variable Quantity