From 7dd9ab32f131d54163b967f00e53c7168a3c141a Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Mon, 30 Sep 2019 12:26:44 +0200 Subject: [PATCH] [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 29343c43..c2177ab8 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 5062d167..6b6a64b5 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 @@ class TestSaleOrder(TransactionCase): 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 @@ class TestSaleOrder(TransactionCase): 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(