From ee81a1fcdef320e4511de6cc30a01544ad8c286c Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Fri, 4 May 2018 11:19:51 +0200 Subject: [PATCH 01/62] [10.0][ADD] sale_invoice_policy --- sale_invoice_policy/README.rst | 58 ++++++ sale_invoice_policy/__init__.py | 2 + sale_invoice_policy/__manifest__.py | 22 +++ sale_invoice_policy/i18n/es.po | 61 ++++++ sale_invoice_policy/i18n/fr.po | 61 ++++++ sale_invoice_policy/models/__init__.py | 3 + .../models/product_template.py | 37 ++++ sale_invoice_policy/models/sale_order.py | 25 +++ sale_invoice_policy/models/sale_order_line.py | 48 +++++ sale_invoice_policy/tests/__init__.py | 2 + .../tests/test_sale_invoice_policy.py | 184 ++++++++++++++++++ .../views/product_template_view.xml | 16 ++ sale_invoice_policy/views/sale_view.xml | 14 ++ 13 files changed, 533 insertions(+) create mode 100644 sale_invoice_policy/README.rst create mode 100644 sale_invoice_policy/__init__.py create mode 100644 sale_invoice_policy/__manifest__.py create mode 100644 sale_invoice_policy/i18n/es.po create mode 100644 sale_invoice_policy/i18n/fr.po create mode 100644 sale_invoice_policy/models/__init__.py create mode 100644 sale_invoice_policy/models/product_template.py create mode 100644 sale_invoice_policy/models/sale_order.py create mode 100644 sale_invoice_policy/models/sale_order_line.py create mode 100644 sale_invoice_policy/tests/__init__.py create mode 100644 sale_invoice_policy/tests/test_sale_invoice_policy.py create mode 100644 sale_invoice_policy/views/product_template_view.xml create mode 100644 sale_invoice_policy/views/sale_view.xml diff --git a/sale_invoice_policy/README.rst b/sale_invoice_policy/README.rst new file mode 100644 index 00000000000..148f7fe0c9e --- /dev/null +++ b/sale_invoice_policy/README.rst @@ -0,0 +1,58 @@ +.. 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 + +==================== +Sales Invoice Policy +==================== + +This modules helps to get Invoicing Policy on Sale Order Level without +breaking behaviour (as it is defined from >= v10 on product level). + +Usage +===== + +* Create Sale Order +* Select Invoicing Policy on Sale Order + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/167/10.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. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Cédric Pigeon +* François Honoré +* Denis Roussel + +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/sale_invoice_policy/__init__.py b/sale_invoice_policy/__init__.py new file mode 100644 index 00000000000..a0fdc10fe11 --- /dev/null +++ b/sale_invoice_policy/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import models diff --git a/sale_invoice_policy/__manifest__.py b/sale_invoice_policy/__manifest__.py new file mode 100644 index 00000000000..eb6bdd48633 --- /dev/null +++ b/sale_invoice_policy/__manifest__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + 'name': "Sale invoice Policy", + 'description': """ + Sales Management: let the user choose the invoice policy on the + order""", + 'author': 'ACSONE SA/NV, Odoo Community Association (OCA)', + 'website': 'https://github.com/OCA/sale-workflow', + 'category': 'Sales Management', + 'version': '10.0.1.0.0', + 'license': 'AGPL-3', + 'depends': [ + 'sale', + 'sale_stock', + ], + 'data': [ + 'views/product_template_view.xml', + 'views/sale_view.xml', + ], +} diff --git a/sale_invoice_policy/i18n/es.po b/sale_invoice_policy/i18n/es.po new file mode 100644 index 00000000000..13dceb7a303 --- /dev/null +++ b/sale_invoice_policy/i18n/es.po @@ -0,0 +1,61 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_invoice_policy +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-11 13:13+0000\n" +"PO-Revision-Date: 2017-09-11 13:13+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: sale_invoice_policy +#: selection:product.template,default_invoice_policy:0 +#: selection:sale.order,invoice_policy:0 +msgid "Delivered quantities" +msgstr "Cantidades entregadas" + +#. module: sale_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_delivery_carrier_default_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_product_product_default_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_product_template_default_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_order_invoice_policy +msgid "Invoicing Policy" +msgstr "Política de Facturación" + +#. module: sale_invoice_policy +#: model:ir.model.fields,help:sale_invoice_policy.field_delivery_carrier_default_invoice_policy +#: model:ir.model.fields,help:sale_invoice_policy.field_product_product_default_invoice_policy +#: model:ir.model.fields,help:sale_invoice_policy.field_product_template_default_invoice_policy +#: model:ir.model.fields,help:sale_invoice_policy.field_sale_order_invoice_policy +msgid "Ordered Quantity: Invoice based on the quantity the customer ordered.\n" +"Delivered Quantity: Invoiced based on the quantity the vendor delivered (time or deliveries)." +msgstr "Cantidad ordenada: Factura basada en la cantidad pedida por el cliente.\n" +"Cantidad entregada: Facturada en función de la cantidad entregada por el proveedor (tiempo o entregas)." + +#. module: sale_invoice_policy +#: selection:product.template,default_invoice_policy:0 +#: selection:sale.order,invoice_policy:0 +msgid "Ordered quantities" +msgstr "Cantidades Ordenadas" + +#. module: sale_invoice_policy +#: model:ir.model,name:sale_invoice_policy.model_product_template +msgid "Product Template (Multi-Company)" +msgstr "Product Template (Multi-Company)" + +#. module: sale_invoice_policy +#: model:ir.model,name:sale_invoice_policy.model_sale_order +msgid "Sales Order" +msgstr "Pedido de venta" + +#. module: sale_invoice_policy +#: model:ir.model,name:sale_invoice_policy.model_sale_order_line +msgid "Sales Order Line" +msgstr "Línea pedido de venta" diff --git a/sale_invoice_policy/i18n/fr.po b/sale_invoice_policy/i18n/fr.po new file mode 100644 index 00000000000..45c6d81af00 --- /dev/null +++ b/sale_invoice_policy/i18n/fr.po @@ -0,0 +1,61 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_invoice_policy +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-09-11 13:12+0000\n" +"PO-Revision-Date: 2017-09-11 13:12+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: sale_invoice_policy +#: selection:product.template,default_invoice_policy:0 +#: selection:sale.order,invoice_policy:0 +msgid "Delivered quantities" +msgstr "Quantités Livrées" + +#. module: sale_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_delivery_carrier_default_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_product_product_default_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_product_template_default_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_order_invoice_policy +msgid "Invoicing Policy" +msgstr "Politique de facturation" + +#. module: sale_invoice_policy +#: model:ir.model.fields,help:sale_invoice_policy.field_delivery_carrier_default_invoice_policy +#: model:ir.model.fields,help:sale_invoice_policy.field_product_product_default_invoice_policy +#: model:ir.model.fields,help:sale_invoice_policy.field_product_template_default_invoice_policy +#: model:ir.model.fields,help:sale_invoice_policy.field_sale_order_invoice_policy +msgid "Ordered Quantity: Invoice based on the quantity the customer ordered.\n" +"Delivered Quantity: Invoiced based on the quantity the vendor delivered (time or deliveries)." +msgstr "Quantités commandées : facturation basée sur les quantités commandées par le client.\n" +"Quantités livrées : facturation basée sur les quantités que le fournisseur a livré (temps passé dans le cas de prestations)." + +#. module: sale_invoice_policy +#: selection:product.template,default_invoice_policy:0 +#: selection:sale.order,invoice_policy:0 +msgid "Ordered quantities" +msgstr "Quantités Commandées" + +#. module: sale_invoice_policy +#: model:ir.model,name:sale_invoice_policy.model_product_template +msgid "Product Template (Multi-Company)" +msgstr "Product Template (Multi-Company)" + +#. module: sale_invoice_policy +#: model:ir.model,name:sale_invoice_policy.model_sale_order +msgid "Sales Order" +msgstr "Commande de vente" + +#. module: sale_invoice_policy +#: model:ir.model,name:sale_invoice_policy.model_sale_order_line +msgid "Sales Order Line" +msgstr "Ligne de bon de commande" diff --git a/sale_invoice_policy/models/__init__.py b/sale_invoice_policy/models/__init__.py new file mode 100644 index 00000000000..53fa79af356 --- /dev/null +++ b/sale_invoice_policy/models/__init__.py @@ -0,0 +1,3 @@ +from . import product_template +from . import sale_order +from . import sale_order_line diff --git a/sale_invoice_policy/models/product_template.py b/sale_invoice_policy/models/product_template.py new file mode 100644 index 00000000000..6165b6a6c6c --- /dev/null +++ b/sale_invoice_policy/models/product_template.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class ProductTemplate(models.Model): + _inherit = "product.template" + + default_invoice_policy = fields.Selection( + [('order', 'Ordered quantities'), + ('delivery', 'Delivered quantities')], + string='Invoicing Policy', + help='Ordered Quantity: Invoice based on the quantity the customer ' + 'ordered.\n' + 'Delivered Quantity: Invoiced based on the quantity the vendor ' + 'delivered (time or deliveries).', + default='order') + + invoice_policy = fields.Selection(compute="_compute_invoice_policy", + store=False) + + def _compute_invoice_policy(self): + """ + Apply the invoice_policy given by context (if exist) otherwise use the + default invoice policy given by the field with this same name. + If the product is type = 'service', we don't have to apply the invoice + policy given by the context. + :return: + """ + invoice_policy = self.env.context.get('invoice_policy') + for tmpl in self: + if tmpl.type != 'service' and invoice_policy: + tmpl.invoice_policy = invoice_policy + else: + tmpl.invoice_policy = tmpl.default_invoice_policy diff --git a/sale_invoice_policy/models/sale_order.py b/sale_invoice_policy/models/sale_order.py new file mode 100644 index 00000000000..2226f173b46 --- /dev/null +++ b/sale_invoice_policy/models/sale_order.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class SaleOrder(models.Model): + + _inherit = "sale.order" + + invoice_policy = fields.Selection( + [('order', 'Ordered quantities'), + ('delivery', 'Delivered quantities')], + default='delivery', + required=True, + readonly=True, + states={ + 'draft': [('readonly', False)], + 'sent': [('readonly', False)] + }, + help='Ordered Quantity: Invoice based on the quantity the customer ' + 'ordered.\n' + 'Delivered Quantity: Invoiced based on the quantity the vendor ' + 'delivered (time or deliveries).') diff --git a/sale_invoice_policy/models/sale_order_line.py b/sale_invoice_policy/models/sale_order_line.py new file mode 100644 index 00000000000..dd77328548b --- /dev/null +++ b/sale_invoice_policy/models/sale_order_line.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import api, models + + +class SaleOrderLine(models.Model): + + _inherit = 'sale.order.line' + + @api.depends('qty_invoiced', 'qty_delivered', 'product_uom_qty', + 'order_id.state', 'order_id.invoice_policy') + def _get_to_invoice_qty(self): + invoice_policies = set(self.mapped('order_id.invoice_policy')) + line_by_id = {l.id: l for l in self} + for invoice_policy in invoice_policies: + so_lines = self.with_context( + invoice_policy=invoice_policy).filtered( + lambda x, p=invoice_policy: x.order_id.invoice_policy == + p).with_prefetch(self._prefetch) + so_lines.mapped('product_id') + if so_lines: + super(SaleOrderLine, so_lines)._get_to_invoice_qty() + for line in so_lines: + # due to the change of context in compute methods, + # assign the value in the modified context to self + line_by_id[line.id].qty_to_invoice = line.qty_to_invoice + return True + + @api.depends('state', 'product_uom_qty', 'qty_delivered', 'qty_to_invoice', + 'qty_invoiced', 'order_id.invoice_policy') + def _compute_invoice_status(self): + invoice_policies = self.mapped('order_id.invoice_policy') + line_by_id = {l.id: l for l in self} + for invoice_policy in invoice_policies: + so_lines = self.with_context( + invoice_policy=invoice_policy).filtered( + lambda x, p=invoice_policy: x.order_id.invoice_policy == + p).with_prefetch(self._prefetch) + if so_lines: + super(SaleOrderLine, so_lines)._compute_invoice_status() + for line in so_lines: + # due to the change of context in compute methods, + # assign the value in the modified context to self + line_by_id[line.id].invoice_status = line.invoice_status + + return True diff --git a/sale_invoice_policy/tests/__init__.py b/sale_invoice_policy/tests/__init__.py new file mode 100644 index 00000000000..0f947896f44 --- /dev/null +++ b/sale_invoice_policy/tests/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import test_sale_invoice_policy diff --git a/sale_invoice_policy/tests/test_sale_invoice_policy.py b/sale_invoice_policy/tests/test_sale_invoice_policy.py new file mode 100644 index 00000000000..bf1acea0b1e --- /dev/null +++ b/sale_invoice_policy/tests/test_sale_invoice_policy.py @@ -0,0 +1,184 @@ +# -*- coding: utf-8 -*- +# © 2017 Acsone SA/NV (http://www.acsone.eu) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +import odoo.tests.common as common + + +class TestSaleOrderInvoicePolicy(common.TransactionCase): + + def setUp(self): + super(TestSaleOrderInvoicePolicy, self).setUp() + self.product_obj = self.env['product.product'] + self.sale_obj = self.env['sale.order'] + self.partner = self.env.ref("base.res_partner_2") + self.product = self.product_obj.create({ + 'name': 'Test', + 'type': 'consu', + 'list_price': 20.0}) + self.product2 = self.product_obj.create({ + 'name': 'Test 2', + 'type': 'consu', + 'list_price': 45.0}) + self.product3 = self.product_obj.create({ + 'name': 'Test 3 (service)', + 'type': 'service', + 'list_price': 850.5, + }) + + def test_sale_order_invoice_order(self): + """ Test invoicing based on ordered quantities + """ + so = self.env["sale.order"].create({ + 'partner_id': self.env.ref("base.res_partner_2").id, + 'order_line': [ + (0, 0, { + 'product_id': self.product.id, + 'product_uom_qty': 2.0 + }), + (0, 0, { + 'product_id': self.product2.id, + 'product_uom_qty': 3.0 + }) + ], + 'invoice_policy': 'order' + }) + + so.action_confirm() + + self.assertEqual(len(so.picking_ids), 1) + + for picking in so.picking_ids: + picking.action_assign() + self.assertEqual(picking.state, 'assigned') + so_line = so.order_line[0] + self.assertEqual(so_line.qty_to_invoice, 2) + self.assertEqual(so_line.invoice_status, 'to invoice') + so_line = so.order_line[1] + self.assertEqual(so_line.qty_to_invoice, 3) + self.assertEqual(so_line.invoice_status, 'to invoice') + + def test_sale_order_invoice_deliver(self): + """ Test invoicing based on delivered quantities + """ + so = self.env["sale.order"].create( + {'partner_id': self.env.ref("base.res_partner_2").id, + 'order_line': [(0, 0, {'product_id': self.product.id, + 'product_uom_qty': 2.0}), + (0, 0, {'product_id': self.product2.id, + 'product_uom_qty': 3.0})]}) + + so.action_confirm() + + self.assertEqual(len(so.picking_ids), 1) + + for picking in so.picking_ids: + picking.action_assign() + self.assertEqual(picking.state, 'assigned') + + so_line = so.order_line[0] + self.assertEqual(so_line.qty_to_invoice, 0) + self.assertEqual(so_line.invoice_status, 'no') + + so_line = so.order_line[1] + self.assertEqual(so_line.qty_to_invoice, 0) + self.assertEqual(so_line.invoice_status, 'no') + + for picking in so.picking_ids: + wiz_act = picking.do_new_transfer() + wiz = self.env[wiz_act['res_model']].browse(wiz_act['res_id']) + wiz.process() + self.assertEqual(picking.state, 'done') + + so_line = so.order_line[0] + self.assertEqual(so_line.qty_to_invoice, 2) + self.assertEqual(so_line.invoice_status, 'to invoice') + + so_line = so.order_line[1] + self.assertEqual(so_line.qty_to_invoice, 3) + self.assertEqual(so_line.invoice_status, 'to invoice') + + def test_sale_order_invoice_policy_service1(self): + """ + For this test, we check if the invoice policy is correctly updated + (into the product) when the type is 'service'. + The behaviour should be: + - Get the value of the context but if the type is 'service': use the + default_invoice_policy field value + :return: bool + """ + product = self.product3 + invoice_policy = 'delivery' + product.write({ + 'default_invoice_policy': invoice_policy, + }) + self.assertEqual(product.invoice_policy, invoice_policy) + product = product.with_context( + invoice_policy='order', + ) + # Shouldn't be impacted by the context because the type is service + self.assertEqual(product.invoice_policy, invoice_policy) + return True + + def test_sale_order_invoice_policy_service2(self): + """ + For this test, we check if the invoice policy is correctly updated + (into the product) when the type is 'service'. + The behaviour should be: + - Get the value of the context but if the type is 'service': use the + default_invoice_policy field value + :return: bool + """ + product = self.product3 + invoice_policy = 'order' + product.write({ + 'default_invoice_policy': invoice_policy, + }) + self.assertEqual(product.invoice_policy, invoice_policy) + product = product.with_context( + invoice_policy='delivery', + ) + # Shouldn't be impacted by the context because the type is service + self.assertEqual(product.invoice_policy, invoice_policy) + return True + + def test_sale_order_invoice_policy_service3(self): + """ + For this test, we check if the invoice policy is correctly updated + (into the product) when the type is 'service'. + The behaviour should be: + - Get the value of the context but if the type is 'service': use the + default_invoice_policy field value + :return: bool + """ + product = self.product3 + product2 = self.product2 + products = product + products |= product2 + invoice_policy = 'order' + products.write({ + 'default_invoice_policy': invoice_policy, + }) + self.assertEqual(product.invoice_policy, invoice_policy) + self.assertEqual(product2.invoice_policy, invoice_policy) + new_invoice_policy = 'delivery' + product = product.with_context( + invoice_policy=new_invoice_policy, + ) + product2 = product2.with_context( + invoice_policy=new_invoice_policy, + ) + # Shouldn't be impacted by the context because the type is service + self.assertEqual(product.invoice_policy, invoice_policy) + # This one is not a service so it must be impacted by the context + self.assertEqual(product2.invoice_policy, new_invoice_policy) + product = product.with_context( + invoice_policy=invoice_policy, + ) + product2 = product2.with_context( + invoice_policy=invoice_policy, + ) + # Shouldn't be impacted by the context because the type is service + self.assertEqual(product.invoice_policy, invoice_policy) + # This one is not a service so it must be impacted by the context + self.assertEqual(product2.invoice_policy, invoice_policy) + return True diff --git a/sale_invoice_policy/views/product_template_view.xml b/sale_invoice_policy/views/product_template_view.xml new file mode 100644 index 00000000000..4c57fc1743c --- /dev/null +++ b/sale_invoice_policy/views/product_template_view.xml @@ -0,0 +1,16 @@ + + + + product.template.invoice.policy + product.template + + + + 1 + + + + + + + \ No newline at end of file diff --git a/sale_invoice_policy/views/sale_view.xml b/sale_invoice_policy/views/sale_view.xml new file mode 100644 index 00000000000..f68e15a3b3c --- /dev/null +++ b/sale_invoice_policy/views/sale_view.xml @@ -0,0 +1,14 @@ + + + + sale.order.form (abi_sale_invoice_policy) + sale.order + + 50 + + + + + + + \ No newline at end of file From 1097143ca0a568adabed1a325612ddbef90ba712 Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Fri, 4 May 2018 12:25:29 +0200 Subject: [PATCH 02/62] [IMP] Add search method, secures _get_to_invoice_qty,compute_invoice_status computation --- sale_invoice_policy/models/product_template.py | 15 ++++++++++++--- sale_invoice_policy/models/sale_order_line.py | 11 ++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/sale_invoice_policy/models/product_template.py b/sale_invoice_policy/models/product_template.py index 6165b6a6c6c..f0188eece29 100644 --- a/sale_invoice_policy/models/product_template.py +++ b/sale_invoice_policy/models/product_template.py @@ -2,7 +2,7 @@ # Copyright 2017 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import fields, models +from odoo import api, fields, models class ProductTemplate(models.Model): @@ -18,9 +18,14 @@ class ProductTemplate(models.Model): 'delivered (time or deliveries).', default='order') - invoice_policy = fields.Selection(compute="_compute_invoice_policy", - store=False) + invoice_policy = fields.Selection( + compute="_compute_invoice_policy", + store=False, + search='_search_invoice_policy', + ) + @api.multi + @api.depends('type') def _compute_invoice_policy(self): """ Apply the invoice_policy given by context (if exist) otherwise use the @@ -35,3 +40,7 @@ def _compute_invoice_policy(self): tmpl.invoice_policy = invoice_policy else: tmpl.invoice_policy = tmpl.default_invoice_policy + + @api.model + def _search_invoice_policy(self, operator, value): + return [('default_invoice_policy', operator, value)] diff --git a/sale_invoice_policy/models/sale_order_line.py b/sale_invoice_policy/models/sale_order_line.py index dd77328548b..8ed1908387b 100644 --- a/sale_invoice_policy/models/sale_order_line.py +++ b/sale_invoice_policy/models/sale_order_line.py @@ -14,11 +14,13 @@ class SaleOrderLine(models.Model): def _get_to_invoice_qty(self): invoice_policies = set(self.mapped('order_id.invoice_policy')) line_by_id = {l.id: l for l in self} + done_lines = self.env['sale.order.line'].browse() for invoice_policy in invoice_policies: so_lines = self.with_context( invoice_policy=invoice_policy).filtered( lambda x, p=invoice_policy: x.order_id.invoice_policy == p).with_prefetch(self._prefetch) + done_lines |= so_lines so_lines.mapped('product_id') if so_lines: super(SaleOrderLine, so_lines)._get_to_invoice_qty() @@ -26,6 +28,9 @@ def _get_to_invoice_qty(self): # due to the change of context in compute methods, # assign the value in the modified context to self line_by_id[line.id].qty_to_invoice = line.qty_to_invoice + # Not to break function if (it could not happen) some records + # were not in so_lines + super(SaleOrderLine, self - done_lines)._get_to_invoice_qty() return True @api.depends('state', 'product_uom_qty', 'qty_delivered', 'qty_to_invoice', @@ -33,16 +38,20 @@ def _get_to_invoice_qty(self): def _compute_invoice_status(self): invoice_policies = self.mapped('order_id.invoice_policy') line_by_id = {l.id: l for l in self} + done_lines = self.env['sale.order.line'].browse() for invoice_policy in invoice_policies: so_lines = self.with_context( invoice_policy=invoice_policy).filtered( lambda x, p=invoice_policy: x.order_id.invoice_policy == p).with_prefetch(self._prefetch) + done_lines |= so_lines if so_lines: super(SaleOrderLine, so_lines)._compute_invoice_status() for line in so_lines: # due to the change of context in compute methods, # assign the value in the modified context to self line_by_id[line.id].invoice_status = line.invoice_status - + # Not to break function if (it could not happen) some records + # were not in so_lines + super(SaleOrderLine, self - done_lines)._compute_invoice_status() return True From 972cbeb36ca59b11644faa39d4cbd294d3af8ffa Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Fri, 4 May 2018 13:46:51 +0200 Subject: [PATCH 03/62] [IMP] sale_invoice_policy: Implement inverse --- sale_invoice_policy/models/product_template.py | 6 ++++++ .../tests/test_sale_invoice_policy.py | 12 ++++++++++++ sale_invoice_policy/views/product_template_view.xml | 2 +- sale_invoice_policy/views/sale_view.xml | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/sale_invoice_policy/models/product_template.py b/sale_invoice_policy/models/product_template.py index f0188eece29..f4d40555494 100644 --- a/sale_invoice_policy/models/product_template.py +++ b/sale_invoice_policy/models/product_template.py @@ -22,8 +22,14 @@ class ProductTemplate(models.Model): compute="_compute_invoice_policy", store=False, search='_search_invoice_policy', + inverse='_inverse_invoice_policy', ) + @api.multi + def _inverse_invoice_policy(self): + for template in self.filtered('invoice_policy'): + template.default_invoice_policy = template.invoice_policy + @api.multi @api.depends('type') def _compute_invoice_policy(self): diff --git a/sale_invoice_policy/tests/test_sale_invoice_policy.py b/sale_invoice_policy/tests/test_sale_invoice_policy.py index bf1acea0b1e..c382080e7eb 100644 --- a/sale_invoice_policy/tests/test_sale_invoice_policy.py +++ b/sale_invoice_policy/tests/test_sale_invoice_policy.py @@ -182,3 +182,15 @@ def test_sale_order_invoice_policy_service3(self): # This one is not a service so it must be impacted by the context self.assertEqual(product2.invoice_policy, invoice_policy) return True + + def test_inverse_invoice_policy(self): + self.product.default_invoice_policy = 'order' + self.assertEquals( + 'order', + self.product.default_invoice_policy + ) + self.product.invoice_policy = 'delivery' + self.assertEquals( + 'delivery', + self.product.default_invoice_policy + ) diff --git a/sale_invoice_policy/views/product_template_view.xml b/sale_invoice_policy/views/product_template_view.xml index 4c57fc1743c..293ddc9311c 100644 --- a/sale_invoice_policy/views/product_template_view.xml +++ b/sale_invoice_policy/views/product_template_view.xml @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/sale_invoice_policy/views/sale_view.xml b/sale_invoice_policy/views/sale_view.xml index f68e15a3b3c..8c6e415544e 100644 --- a/sale_invoice_policy/views/sale_view.xml +++ b/sale_invoice_policy/views/sale_view.xml @@ -11,4 +11,4 @@ - \ No newline at end of file + From e17ba159f21a65f43369e015f05297bc2c872ddc Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Mon, 7 May 2018 12:26:01 +0200 Subject: [PATCH 04/62] [IMP] sale_invoice_policy: Let the availability of choosing no policy on sale order --- sale_invoice_policy/README.rst | 4 +++- sale_invoice_policy/__init__.py | 1 + sale_invoice_policy/__manifest__.py | 1 + .../models/product_template.py | 1 + sale_invoice_policy/models/sale_order.py | 2 -- sale_invoice_policy/post_init_hook.py | 19 +++++++++++++++++++ .../tests/test_sale_invoice_policy.py | 1 + 7 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 sale_invoice_policy/post_init_hook.py diff --git a/sale_invoice_policy/README.rst b/sale_invoice_policy/README.rst index 148f7fe0c9e..4b05fafa7b9 100644 --- a/sale_invoice_policy/README.rst +++ b/sale_invoice_policy/README.rst @@ -13,7 +13,9 @@ Usage ===== * Create Sale Order -* Select Invoicing Policy on Sale Order +* Select Invoicing Policy on Sale Order or let it void +* Either the policy selected on Sale Order would be used, either if not + filled in, the policy would be chosen from product configuration .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot diff --git a/sale_invoice_policy/__init__.py b/sale_invoice_policy/__init__.py index a0fdc10fe11..4b77fe8cec4 100644 --- a/sale_invoice_policy/__init__.py +++ b/sale_invoice_policy/__init__.py @@ -1,2 +1,3 @@ # -*- coding: utf-8 -*- from . import models +from .post_init_hook import post_init_hook diff --git a/sale_invoice_policy/__manifest__.py b/sale_invoice_policy/__manifest__.py index eb6bdd48633..6537ee05188 100644 --- a/sale_invoice_policy/__manifest__.py +++ b/sale_invoice_policy/__manifest__.py @@ -19,4 +19,5 @@ 'views/product_template_view.xml', 'views/sale_view.xml', ], + 'post_init_hook': 'post_init_hook', } diff --git a/sale_invoice_policy/models/product_template.py b/sale_invoice_policy/models/product_template.py index f4d40555494..28ee8836c96 100644 --- a/sale_invoice_policy/models/product_template.py +++ b/sale_invoice_policy/models/product_template.py @@ -21,6 +21,7 @@ class ProductTemplate(models.Model): invoice_policy = fields.Selection( compute="_compute_invoice_policy", store=False, + readonly=True, search='_search_invoice_policy', inverse='_inverse_invoice_policy', ) diff --git a/sale_invoice_policy/models/sale_order.py b/sale_invoice_policy/models/sale_order.py index 2226f173b46..b46df172809 100644 --- a/sale_invoice_policy/models/sale_order.py +++ b/sale_invoice_policy/models/sale_order.py @@ -12,8 +12,6 @@ class SaleOrder(models.Model): invoice_policy = fields.Selection( [('order', 'Ordered quantities'), ('delivery', 'Delivered quantities')], - default='delivery', - required=True, readonly=True, states={ 'draft': [('readonly', False)], diff --git a/sale_invoice_policy/post_init_hook.py b/sale_invoice_policy/post_init_hook.py new file mode 100644 index 00000000000..138a2bfaf01 --- /dev/null +++ b/sale_invoice_policy/post_init_hook.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import api, SUPERUSER_ID + + +def post_init_hook(cr, pool): + """ + As we change the invoice policy to computed field, we must initialize + the default policy with original values + :param cr: + :return: + """ + + env = api.Environment(cr, SUPERUSER_ID, {}) + query = """UPDATE %s + SET default_invoice_policy = invoice_policy + WHERE invoice_policy IS NOT NULL""" % env['product.template']._table + cr.execute(query) diff --git a/sale_invoice_policy/tests/test_sale_invoice_policy.py b/sale_invoice_policy/tests/test_sale_invoice_policy.py index c382080e7eb..c154cb18d5a 100644 --- a/sale_invoice_policy/tests/test_sale_invoice_policy.py +++ b/sale_invoice_policy/tests/test_sale_invoice_policy.py @@ -62,6 +62,7 @@ def test_sale_order_invoice_deliver(self): """ so = self.env["sale.order"].create( {'partner_id': self.env.ref("base.res_partner_2").id, + 'invoice_policy': 'delivery', 'order_line': [(0, 0, {'product_id': self.product.id, 'product_uom_qty': 2.0}), (0, 0, {'product_id': self.product2.id, From d74912879aeb95800d1d2f260e85844626e3cbdf Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Mon, 7 May 2018 16:41:22 +0200 Subject: [PATCH 05/62] [IMP] sale_invoice_policy: Add config for default_policy and if policy is required on Sale Orders --- sale_invoice_policy/__init__.py | 1 + sale_invoice_policy/__manifest__.py | 1 + sale_invoice_policy/models/sale_order.py | 26 ++++++++- sale_invoice_policy/views/sale_view.xml | 3 +- sale_invoice_policy/wizards/__init__.py | 1 + sale_invoice_policy/wizards/res_config.py | 56 +++++++++++++++++++ .../wizards/res_config_view.xml | 20 +++++++ 7 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 sale_invoice_policy/wizards/__init__.py create mode 100644 sale_invoice_policy/wizards/res_config.py create mode 100644 sale_invoice_policy/wizards/res_config_view.xml diff --git a/sale_invoice_policy/__init__.py b/sale_invoice_policy/__init__.py index 4b77fe8cec4..a13dd92bcc2 100644 --- a/sale_invoice_policy/__init__.py +++ b/sale_invoice_policy/__init__.py @@ -1,3 +1,4 @@ # -*- coding: utf-8 -*- from . import models from .post_init_hook import post_init_hook +from . import wizards diff --git a/sale_invoice_policy/__manifest__.py b/sale_invoice_policy/__manifest__.py index 6537ee05188..501140534de 100644 --- a/sale_invoice_policy/__manifest__.py +++ b/sale_invoice_policy/__manifest__.py @@ -16,6 +16,7 @@ 'sale_stock', ], 'data': [ + 'wizards/res_config_view.xml', 'views/product_template_view.xml', 'views/sale_view.xml', ], diff --git a/sale_invoice_policy/models/sale_order.py b/sale_invoice_policy/models/sale_order.py index b46df172809..5586b60b44c 100644 --- a/sale_invoice_policy/models/sale_order.py +++ b/sale_invoice_policy/models/sale_order.py @@ -2,7 +2,7 @@ # Copyright 2017 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import fields, models +from odoo import api, fields, models class SaleOrder(models.Model): @@ -21,3 +21,27 @@ class SaleOrder(models.Model): 'ordered.\n' 'Delivered Quantity: Invoiced based on the quantity the vendor ' 'delivered (time or deliveries).') + invoice_policy_required = fields.Boolean( + compute='_compute_invoice_policy_required', + default=lambda self: self.env['ir.values'].get_default( + 'sale.config.settings', 'sale_invoice_policy_required'), + ) + + @api.model + def default_get(self, fields_list): + res = super(SaleOrder, self).default_get(fields_list) + default_sale_invoice_policy = self.env['ir.values'].get_default( + 'sale.config.settings', 'sale_default_invoice_policy') + if 'invoice_policy' not in res: + res.update({ + 'invoice_policy': default_sale_invoice_policy + }) + return res + + @api.multi + @api.depends() + def _compute_invoice_policy_required(self): + invoice_policy_required = self.env['ir.values'].get_default( + 'sale.config.settings', 'sale_invoice_policy_required') + for sale in self: + sale.invoice_policy_required = invoice_policy_required diff --git a/sale_invoice_policy/views/sale_view.xml b/sale_invoice_policy/views/sale_view.xml index 8c6e415544e..48e8c0cdb24 100644 --- a/sale_invoice_policy/views/sale_view.xml +++ b/sale_invoice_policy/views/sale_view.xml @@ -7,7 +7,8 @@ 50 - + + diff --git a/sale_invoice_policy/wizards/__init__.py b/sale_invoice_policy/wizards/__init__.py new file mode 100644 index 00000000000..ab480f8b58c --- /dev/null +++ b/sale_invoice_policy/wizards/__init__.py @@ -0,0 +1 @@ +from . import res_config diff --git a/sale_invoice_policy/wizards/res_config.py b/sale_invoice_policy/wizards/res_config.py new file mode 100644 index 00000000000..045de6c3476 --- /dev/null +++ b/sale_invoice_policy/wizards/res_config.py @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import api, models, fields + + +class SaleConfigSettings(models.TransientModel): + + _name = 'sale.config.settings' + _inherit = 'sale.config.settings' + + sale_default_invoice_policy = fields.Selection( + selection=[ + ('order', 'Ordered quantities'), + ('delivery', 'Delivered quantities') + ], + related='default_invoice_policy', + readonly=True, + ) + sale_invoice_policy_required = fields.Boolean( + help="This makes Invoice Policy required on Sale Orders" + ) + + @api.multi + def set_default_sale_default_invoice_policy(self): + """ + Set value in an ir_value but get default from the related + :return: + """ + ir_values_obj = self.env['ir.values'] + if self.env['res.users'].has_group('base.group_erp_manager'): + ir_values_obj = ir_values_obj.sudo() + ir_values_obj.set_default( + 'sale.config.settings', + 'sale_default_invoice_policy', + self.sale_default_invoice_policy + ) + + @api.model + def get_default_sale_invoice_policy_required(self, fields_list): + return { + 'sale_invoice_policy_required': self.env['ir.values'].get_default( + 'sale.config.settings', 'sale_invoice_policy_required') + } + + @api.multi + def set_default_sale_invoice_policy_required(self): + ir_values_obj = self.env['ir.values'] + if self.env['res.users'].has_group('base.group_erp_manager'): + ir_values_obj = ir_values_obj.sudo() + ir_values_obj.set_default( + 'sale.config.settings', + 'sale_invoice_policy_required', + self.sale_invoice_policy_required + ) diff --git a/sale_invoice_policy/wizards/res_config_view.xml b/sale_invoice_policy/wizards/res_config_view.xml new file mode 100644 index 00000000000..d5041ce40b7 --- /dev/null +++ b/sale_invoice_policy/wizards/res_config_view.xml @@ -0,0 +1,20 @@ + + + + sale settings + sale.config.settings + + + + + + + From 7bfb0afdd6ca04c61c388d569cdfab7f658f0778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Honor=C3=A9?= Date: Tue, 6 Nov 2018 15:10:20 +0100 Subject: [PATCH 06/62] [FIX] Fix perf issue during compute invoice status (of sale.order.line) --- sale_invoice_policy/models/sale_order_line.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale_invoice_policy/models/sale_order_line.py b/sale_invoice_policy/models/sale_order_line.py index 8ed1908387b..ef4c9657662 100644 --- a/sale_invoice_policy/models/sale_order_line.py +++ b/sale_invoice_policy/models/sale_order_line.py @@ -36,7 +36,7 @@ def _get_to_invoice_qty(self): @api.depends('state', 'product_uom_qty', 'qty_delivered', 'qty_to_invoice', 'qty_invoiced', 'order_id.invoice_policy') def _compute_invoice_status(self): - invoice_policies = self.mapped('order_id.invoice_policy') + invoice_policies = set(self.mapped('order_id.invoice_policy')) line_by_id = {l.id: l for l in self} done_lines = self.env['sale.order.line'].browse() for invoice_policy in invoice_policies: From b785934f9ea3942a6d7423074ff21a549bf774c9 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Tue, 1 Oct 2019 18:50:20 +0000 Subject: [PATCH 07/62] [UPD] Update sale_invoice_policy.pot --- sale_invoice_policy/i18n/es.po | 61 ++++++++++-- sale_invoice_policy/i18n/fr.po | 62 ++++++++++-- .../i18n/sale_invoice_policy.pot | 98 +++++++++++++++++++ 3 files changed, 207 insertions(+), 14 deletions(-) create mode 100644 sale_invoice_policy/i18n/sale_invoice_policy.pot diff --git a/sale_invoice_policy/i18n/es.po b/sale_invoice_policy/i18n/es.po index 13dceb7a303..adf48625c3d 100644 --- a/sale_invoice_policy/i18n/es.po +++ b/sale_invoice_policy/i18n/es.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * sale_invoice_policy +# * sale_invoice_policy # msgid "" msgstr "" @@ -10,22 +10,49 @@ msgstr "" "PO-Revision-Date: 2017-09-11 13:13+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: sale_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_config_settings_sale_default_invoice_policy +msgid "Default Invoicing" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.ui.view,arch_db:sale_invoice_policy.view_sales_config +msgid "Default Sale Order Invoice Policy" +msgstr "" + #. module: sale_invoice_policy #: selection:product.template,default_invoice_policy:0 #: selection:sale.order,invoice_policy:0 msgid "Delivered quantities" msgstr "Cantidades entregadas" +#. module: sale_invoice_policy +#: model:ir.ui.view,arch_db:sale_invoice_policy.view_sales_config +msgid "Invoice Policy required in Sale Orders" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_order_invoice_policy +#, fuzzy +msgid "Invoice policy" +msgstr "Política de Facturación" + +#. module: sale_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_order_invoice_policy_required +#, fuzzy +msgid "Invoice policy required" +msgstr "Política de Facturación" + #. module: sale_invoice_policy #: model:ir.model.fields,field_description:sale_invoice_policy.field_delivery_carrier_default_invoice_policy #: model:ir.model.fields,field_description:sale_invoice_policy.field_product_product_default_invoice_policy #: model:ir.model.fields,field_description:sale_invoice_policy.field_product_template_default_invoice_policy -#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_order_invoice_policy msgid "Invoicing Policy" msgstr "Política de Facturación" @@ -34,10 +61,14 @@ msgstr "Política de Facturación" #: model:ir.model.fields,help:sale_invoice_policy.field_product_product_default_invoice_policy #: model:ir.model.fields,help:sale_invoice_policy.field_product_template_default_invoice_policy #: model:ir.model.fields,help:sale_invoice_policy.field_sale_order_invoice_policy -msgid "Ordered Quantity: Invoice based on the quantity the customer ordered.\n" -"Delivered Quantity: Invoiced based on the quantity the vendor delivered (time or deliveries)." -msgstr "Cantidad ordenada: Factura basada en la cantidad pedida por el cliente.\n" -"Cantidad entregada: Facturada en función de la cantidad entregada por el proveedor (tiempo o entregas)." +msgid "" +"Ordered Quantity: Invoice based on the quantity the customer ordered.\n" +"Delivered Quantity: Invoiced based on the quantity the vendor delivered " +"(time or deliveries)." +msgstr "" +"Cantidad ordenada: Factura basada en la cantidad pedida por el cliente.\n" +"Cantidad entregada: Facturada en función de la cantidad entregada por el " +"proveedor (tiempo o entregas)." #. module: sale_invoice_policy #: selection:product.template,default_invoice_policy:0 @@ -47,9 +78,15 @@ msgstr "Cantidades Ordenadas" #. module: sale_invoice_policy #: model:ir.model,name:sale_invoice_policy.model_product_template -msgid "Product Template (Multi-Company)" +#, fuzzy +msgid "Product Template" msgstr "Product Template (Multi-Company)" +#. module: sale_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_config_settings_sale_invoice_policy_required +msgid "Sale invoice policy required" +msgstr "" + #. module: sale_invoice_policy #: model:ir.model,name:sale_invoice_policy.model_sale_order msgid "Sales Order" @@ -59,3 +96,13 @@ msgstr "Pedido de venta" #: model:ir.model,name:sale_invoice_policy.model_sale_order_line msgid "Sales Order Line" msgstr "Línea pedido de venta" + +#. module: sale_invoice_policy +#: model:ir.model.fields,help:sale_invoice_policy.field_sale_config_settings_sale_invoice_policy_required +msgid "This makes Invoice Policy required on Sale Orders" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.model,name:sale_invoice_policy.model_sale_config_settings +msgid "sale.config.settings" +msgstr "" diff --git a/sale_invoice_policy/i18n/fr.po b/sale_invoice_policy/i18n/fr.po index 45c6d81af00..25b7ec00090 100644 --- a/sale_invoice_policy/i18n/fr.po +++ b/sale_invoice_policy/i18n/fr.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * sale_invoice_policy +# * sale_invoice_policy # msgid "" msgstr "" @@ -10,22 +10,49 @@ msgstr "" "PO-Revision-Date: 2017-09-11 13:12+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: sale_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_config_settings_sale_default_invoice_policy +msgid "Default Invoicing" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.ui.view,arch_db:sale_invoice_policy.view_sales_config +msgid "Default Sale Order Invoice Policy" +msgstr "" + #. module: sale_invoice_policy #: selection:product.template,default_invoice_policy:0 #: selection:sale.order,invoice_policy:0 msgid "Delivered quantities" msgstr "Quantités Livrées" +#. module: sale_invoice_policy +#: model:ir.ui.view,arch_db:sale_invoice_policy.view_sales_config +msgid "Invoice Policy required in Sale Orders" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_order_invoice_policy +#, fuzzy +msgid "Invoice policy" +msgstr "Politique de facturation" + +#. module: sale_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_order_invoice_policy_required +#, fuzzy +msgid "Invoice policy required" +msgstr "Politique de facturation" + #. module: sale_invoice_policy #: model:ir.model.fields,field_description:sale_invoice_policy.field_delivery_carrier_default_invoice_policy #: model:ir.model.fields,field_description:sale_invoice_policy.field_product_product_default_invoice_policy #: model:ir.model.fields,field_description:sale_invoice_policy.field_product_template_default_invoice_policy -#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_order_invoice_policy msgid "Invoicing Policy" msgstr "Politique de facturation" @@ -34,10 +61,15 @@ msgstr "Politique de facturation" #: model:ir.model.fields,help:sale_invoice_policy.field_product_product_default_invoice_policy #: model:ir.model.fields,help:sale_invoice_policy.field_product_template_default_invoice_policy #: model:ir.model.fields,help:sale_invoice_policy.field_sale_order_invoice_policy -msgid "Ordered Quantity: Invoice based on the quantity the customer ordered.\n" -"Delivered Quantity: Invoiced based on the quantity the vendor delivered (time or deliveries)." -msgstr "Quantités commandées : facturation basée sur les quantités commandées par le client.\n" -"Quantités livrées : facturation basée sur les quantités que le fournisseur a livré (temps passé dans le cas de prestations)." +msgid "" +"Ordered Quantity: Invoice based on the quantity the customer ordered.\n" +"Delivered Quantity: Invoiced based on the quantity the vendor delivered " +"(time or deliveries)." +msgstr "" +"Quantités commandées : facturation basée sur les quantités commandées par le " +"client.\n" +"Quantités livrées : facturation basée sur les quantités que le fournisseur a " +"livré (temps passé dans le cas de prestations)." #. module: sale_invoice_policy #: selection:product.template,default_invoice_policy:0 @@ -47,9 +79,15 @@ msgstr "Quantités Commandées" #. module: sale_invoice_policy #: model:ir.model,name:sale_invoice_policy.model_product_template -msgid "Product Template (Multi-Company)" +#, fuzzy +msgid "Product Template" msgstr "Product Template (Multi-Company)" +#. module: sale_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_config_settings_sale_invoice_policy_required +msgid "Sale invoice policy required" +msgstr "" + #. module: sale_invoice_policy #: model:ir.model,name:sale_invoice_policy.model_sale_order msgid "Sales Order" @@ -59,3 +97,13 @@ msgstr "Commande de vente" #: model:ir.model,name:sale_invoice_policy.model_sale_order_line msgid "Sales Order Line" msgstr "Ligne de bon de commande" + +#. module: sale_invoice_policy +#: model:ir.model.fields,help:sale_invoice_policy.field_sale_config_settings_sale_invoice_policy_required +msgid "This makes Invoice Policy required on Sale Orders" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.model,name:sale_invoice_policy.model_sale_config_settings +msgid "sale.config.settings" +msgstr "" diff --git a/sale_invoice_policy/i18n/sale_invoice_policy.pot b/sale_invoice_policy/i18n/sale_invoice_policy.pot new file mode 100644 index 00000000000..bbeeaf048f4 --- /dev/null +++ b/sale_invoice_policy/i18n/sale_invoice_policy.pot @@ -0,0 +1,98 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_invoice_policy +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.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: sale_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_config_settings_sale_default_invoice_policy +msgid "Default Invoicing" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.ui.view,arch_db:sale_invoice_policy.view_sales_config +msgid "Default Sale Order Invoice Policy" +msgstr "" + +#. module: sale_invoice_policy +#: selection:product.template,default_invoice_policy:0 +#: selection:sale.order,invoice_policy:0 +msgid "Delivered quantities" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.ui.view,arch_db:sale_invoice_policy.view_sales_config +msgid "Invoice Policy required in Sale Orders" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_order_invoice_policy +msgid "Invoice policy" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_order_invoice_policy_required +msgid "Invoice policy required" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_delivery_carrier_default_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_product_product_default_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_product_template_default_invoice_policy +msgid "Invoicing Policy" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.model.fields,help:sale_invoice_policy.field_delivery_carrier_default_invoice_policy +#: model:ir.model.fields,help:sale_invoice_policy.field_product_product_default_invoice_policy +#: model:ir.model.fields,help:sale_invoice_policy.field_product_template_default_invoice_policy +#: model:ir.model.fields,help:sale_invoice_policy.field_sale_order_invoice_policy +msgid "Ordered Quantity: Invoice based on the quantity the customer ordered.\n" +"Delivered Quantity: Invoiced based on the quantity the vendor delivered (time or deliveries)." +msgstr "" + +#. module: sale_invoice_policy +#: selection:product.template,default_invoice_policy:0 +#: selection:sale.order,invoice_policy:0 +msgid "Ordered quantities" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.model,name:sale_invoice_policy.model_product_template +msgid "Product Template" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.model.fields,field_description:sale_invoice_policy.field_sale_config_settings_sale_invoice_policy_required +msgid "Sale invoice policy required" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.model,name:sale_invoice_policy.model_sale_order +msgid "Sales Order" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.model,name:sale_invoice_policy.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.model.fields,help:sale_invoice_policy.field_sale_config_settings_sale_invoice_policy_required +msgid "This makes Invoice Policy required on Sale Orders" +msgstr "" + +#. module: sale_invoice_policy +#: model:ir.model,name:sale_invoice_policy.model_sale_config_settings +msgid "sale.config.settings" +msgstr "" + From f893e3188980eb83c3619c47ddefd0ecfd963545 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 2 Oct 2019 00:22:54 +0000 Subject: [PATCH 08/62] [ADD] icon.png --- sale_invoice_policy/static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 sale_invoice_policy/static/description/icon.png diff --git a/sale_invoice_policy/static/description/icon.png b/sale_invoice_policy/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}d0jUxM@u(PQx^-s)697TX`ehR4?GS^qbkof1cslKgkU)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~! zVpnB`o+K7|Al`Q_U;eD$B zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__ zc+blN2UAB0=617@>_u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_ zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)( z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx zOGVPhVRTGPtv0o}RfVP;Nd(|CB)I;*t&QO8h zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9 zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz# z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7tF#6nHA zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K= z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C zuVl&0duN<;uOsB3%T9Fp8t{ED108<+W(nOZd?gDnfNBC3>M8WE61$So|P zVvqH0SNtDTcsUdzaMDpT=Ty0pDHHNL@Z0w$Y`XO z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1 zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_ zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8 zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ> zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}aRBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=@hbCRcfT5jigwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&BE*}XfU|H&(FssBqY=hPCt`d zH?@s2>I(|;fcW&YM6#V#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD z#z-)AXwSRY?OPefw^iI+ z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd z$6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$ z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV z@;rlc*NRK7i3y5BETSKuumEN`Xu_8GP1Ri=OKQ$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6 zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5#ZRj8kg}dS7_V&^%#Do==#`u zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK#HN`!1vBJHnC+RM&yIh8{gG2q zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH zVWo*OwYElb#uyW{Imam6f2rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+ z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC) zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#Boo{AH8n$a zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x! zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X zZ3WYJtHp_ri(}SQAPjv+Y+0=fH4krOP@S&=zZ-t1jW1o@}z;xk8 z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n= z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~NBvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z zzCR$P#uktu+#!w)cX!lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@ zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y< zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6 zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6% z2(}&uGRF;p92eS*sE*oR$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(| z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4PdpwWDop%^}n;dD#K4s#DYA8SHZ z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^WYu2u5kubqmwp%drJ6 z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d} z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&YOi-3|1QKB z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 983ff633351c24ee1f9489430b819efcf4e4fa10 Mon Sep 17 00:00:00 2001 From: ahenriquez Date: Tue, 31 Dec 2019 16:33:55 +0100 Subject: [PATCH 09/62] [MIG]sale_invoice_policy to v12 --- sale_invoice_policy/__init__.py | 1 - sale_invoice_policy/__manifest__.py | 3 +- .../models/product_template.py | 5 +- sale_invoice_policy/models/sale_order.py | 15 +++--- sale_invoice_policy/models/sale_order_line.py | 1 - sale_invoice_policy/post_init_hook.py | 1 - sale_invoice_policy/tests/__init__.py | 1 - .../tests/test_sale_invoice_policy.py | 22 +++++--- sale_invoice_policy/wizards/res_config.py | 50 ++++++++----------- .../wizards/res_config_view.xml | 8 +-- 10 files changed, 51 insertions(+), 56 deletions(-) diff --git a/sale_invoice_policy/__init__.py b/sale_invoice_policy/__init__.py index a13dd92bcc2..e4adb3fbf04 100644 --- a/sale_invoice_policy/__init__.py +++ b/sale_invoice_policy/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from . import models from .post_init_hook import post_init_hook from . import wizards diff --git a/sale_invoice_policy/__manifest__.py b/sale_invoice_policy/__manifest__.py index 501140534de..2aeea3b3920 100644 --- a/sale_invoice_policy/__manifest__.py +++ b/sale_invoice_policy/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2017 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { @@ -9,7 +8,7 @@ 'author': 'ACSONE SA/NV, Odoo Community Association (OCA)', 'website': 'https://github.com/OCA/sale-workflow', 'category': 'Sales Management', - 'version': '10.0.1.0.0', + 'version': '12.0.1.0.0', 'license': 'AGPL-3', 'depends': [ 'sale', diff --git a/sale_invoice_policy/models/product_template.py b/sale_invoice_policy/models/product_template.py index 28ee8836c96..ef629245b0a 100644 --- a/sale_invoice_policy/models/product_template.py +++ b/sale_invoice_policy/models/product_template.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2017 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -11,7 +10,7 @@ class ProductTemplate(models.Model): default_invoice_policy = fields.Selection( [('order', 'Ordered quantities'), ('delivery', 'Delivered quantities')], - string='Invoicing Policy', + string='Default Invoicing Policy', help='Ordered Quantity: Invoice based on the quantity the customer ' 'ordered.\n' 'Delivered Quantity: Invoiced based on the quantity the vendor ' @@ -32,7 +31,7 @@ def _inverse_invoice_policy(self): template.default_invoice_policy = template.invoice_policy @api.multi - @api.depends('type') + @api.depends('type', 'default_invoice_policy') def _compute_invoice_policy(self): """ Apply the invoice_policy given by context (if exist) otherwise use the diff --git a/sale_invoice_policy/models/sale_order.py b/sale_invoice_policy/models/sale_order.py index 5586b60b44c..2ffef6db3bb 100644 --- a/sale_invoice_policy/models/sale_order.py +++ b/sale_invoice_policy/models/sale_order.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2017 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -23,15 +22,15 @@ class SaleOrder(models.Model): 'delivered (time or deliveries).') invoice_policy_required = fields.Boolean( compute='_compute_invoice_policy_required', - default=lambda self: self.env['ir.values'].get_default( - 'sale.config.settings', 'sale_invoice_policy_required'), + default=lambda self: self.env['ir.default'].get( + 'res.config.settings', 'sale_invoice_policy_required'), ) @api.model def default_get(self, fields_list): res = super(SaleOrder, self).default_get(fields_list) - default_sale_invoice_policy = self.env['ir.values'].get_default( - 'sale.config.settings', 'sale_default_invoice_policy') + default_sale_invoice_policy = self.env['ir.default'].get( + 'res.config.settings', 'sale_default_invoice_policy') if 'invoice_policy' not in res: res.update({ 'invoice_policy': default_sale_invoice_policy @@ -39,9 +38,9 @@ def default_get(self, fields_list): return res @api.multi - @api.depends() + @api.depends('partner_id') def _compute_invoice_policy_required(self): - invoice_policy_required = self.env['ir.values'].get_default( - 'sale.config.settings', 'sale_invoice_policy_required') + invoice_policy_required = self.env['ir.default'].get( + 'res.config.settings', 'sale_invoice_policy_required') for sale in self: sale.invoice_policy_required = invoice_policy_required diff --git a/sale_invoice_policy/models/sale_order_line.py b/sale_invoice_policy/models/sale_order_line.py index ef4c9657662..c0357e20cd5 100644 --- a/sale_invoice_policy/models/sale_order_line.py +++ b/sale_invoice_policy/models/sale_order_line.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2017 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/sale_invoice_policy/post_init_hook.py b/sale_invoice_policy/post_init_hook.py index 138a2bfaf01..e82bb4164b4 100644 --- a/sale_invoice_policy/post_init_hook.py +++ b/sale_invoice_policy/post_init_hook.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2017 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import api, SUPERUSER_ID diff --git a/sale_invoice_policy/tests/__init__.py b/sale_invoice_policy/tests/__init__.py index 0f947896f44..f6ba0a75874 100644 --- a/sale_invoice_policy/tests/__init__.py +++ b/sale_invoice_policy/tests/__init__.py @@ -1,2 +1 @@ -# -*- coding: utf-8 -*- from . import test_sale_invoice_policy diff --git a/sale_invoice_policy/tests/test_sale_invoice_policy.py b/sale_invoice_policy/tests/test_sale_invoice_policy.py index c154cb18d5a..337c504fdf6 100644 --- a/sale_invoice_policy/tests/test_sale_invoice_policy.py +++ b/sale_invoice_policy/tests/test_sale_invoice_policy.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- + # © 2017 Acsone SA/NV (http://www.acsone.eu) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). import odoo.tests.common as common @@ -84,11 +84,10 @@ def test_sale_order_invoice_deliver(self): self.assertEqual(so_line.qty_to_invoice, 0) self.assertEqual(so_line.invoice_status, 'no') - for picking in so.picking_ids: - wiz_act = picking.do_new_transfer() - wiz = self.env[wiz_act['res_model']].browse(wiz_act['res_id']) - wiz.process() - self.assertEqual(picking.state, 'done') + for mv in picking.move_lines: + mv.quantity_done = mv.product_uom_qty + picking.button_validate() + self.assertEqual(picking.state, 'done') so_line = so.order_line[0] self.assertEqual(so_line.qty_to_invoice, 2) @@ -195,3 +194,14 @@ def test_inverse_invoice_policy(self): 'delivery', self.product.default_invoice_policy ) + + def test_settings(self): + settings = self.env['res.config.settings'].create({}) + settings.sale_default_invoice_policy = 'delivery' + settings.sale_invoice_policy_required = True + settings.execute() + so = self.env["sale.order"].create({ + 'partner_id': self.env.ref("base.res_partner_2").id, + }) + self.assertEqual(so.invoice_policy, 'delivery') + self.assertTrue(so.invoice_policy_required) diff --git a/sale_invoice_policy/wizards/res_config.py b/sale_invoice_policy/wizards/res_config.py index 045de6c3476..d0f954dc9d6 100644 --- a/sale_invoice_policy/wizards/res_config.py +++ b/sale_invoice_policy/wizards/res_config.py @@ -1,14 +1,13 @@ -# -*- coding: utf-8 -*- # Copyright 2018 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import api, models, fields -class SaleConfigSettings(models.TransientModel): +class ResConfigSettings(models.TransientModel): - _name = 'sale.config.settings' - _inherit = 'sale.config.settings' + _name = 'res.config.settings' + _inherit = 'res.config.settings' sale_default_invoice_policy = fields.Selection( selection=[ @@ -16,41 +15,34 @@ class SaleConfigSettings(models.TransientModel): ('delivery', 'Delivered quantities') ], related='default_invoice_policy', + string="Default Sale Invoice Policy", readonly=True, ) sale_invoice_policy_required = fields.Boolean( help="This makes Invoice Policy required on Sale Orders" ) - @api.multi - def set_default_sale_default_invoice_policy(self): - """ - Set value in an ir_value but get default from the related - :return: - """ - ir_values_obj = self.env['ir.values'] - if self.env['res.users'].has_group('base.group_erp_manager'): - ir_values_obj = ir_values_obj.sudo() - ir_values_obj.set_default( - 'sale.config.settings', - 'sale_default_invoice_policy', - self.sale_default_invoice_policy - ) - @api.model - def get_default_sale_invoice_policy_required(self, fields_list): - return { - 'sale_invoice_policy_required': self.env['ir.values'].get_default( - 'sale.config.settings', 'sale_invoice_policy_required') - } + def get_values(self): + res = super(ResConfigSettings, self).get_values() + res.update(sale_invoice_policy_required=self.env['ir.default'].get( + 'res.config.settings', 'sale_invoice_policy_required') + ) + return res @api.multi - def set_default_sale_invoice_policy_required(self): - ir_values_obj = self.env['ir.values'] + def set_values(self): + super(ResConfigSettings, self).set_values() + ir_default_obj = self.env['ir.default'] if self.env['res.users'].has_group('base.group_erp_manager'): - ir_values_obj = ir_values_obj.sudo() - ir_values_obj.set_default( - 'sale.config.settings', + ir_default_obj = ir_default_obj.sudo() + ir_default_obj.set( + 'res.config.settings', 'sale_invoice_policy_required', self.sale_invoice_policy_required ) + ir_default_obj.set( + 'res.config.settings', + 'sale_default_invoice_policy', + self.sale_default_invoice_policy + ) diff --git a/sale_invoice_policy/wizards/res_config_view.xml b/sale_invoice_policy/wizards/res_config_view.xml index d5041ce40b7..87e475ed994 100644 --- a/sale_invoice_policy/wizards/res_config_view.xml +++ b/sale_invoice_policy/wizards/res_config_view.xml @@ -2,10 +2,10 @@ sale settings - sale.config.settings - + res.config.settings + - +