audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

[12.0][REF] - Product Contract Variable quantity: split from analytic account

Browse Source
This commit is contained in:
sbejaoui
2019-09-30 12:26:44 +02:00
parent 0d5f789293
commit 7dd9ab32f1
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
product_contract_variable_quantity/models/contract_line.py
View File

@@ -2,17 +2,16 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # 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): class ContractLine(models.Model):
_inherit = 'account.analytic.invoice.line' _inherit = 'contract.line'
@api.onchange('product_id') @api.onchange('product_id')
def _onchange_product_id_recurring_info(self): def _onchange_product_id_recurring_info(self):
super( res = super(ContractLine, self)._onchange_product_id_recurring_info()
AccountAnalyticInvoiceLine, self
)._onchange_product_id_recurring_info()
if self.product_id.is_contract: if self.product_id.is_contract:
self.qty_type = self.product_id.qty_type self.qty_type = self.product_id.qty_type
self.qty_formula_id = self.product_id.qty_formula_id self.qty_formula_id = self.product_id.qty_formula_id
return res

4
product_contract_variable_quantity/tests/test_sale_order.py
View File

@@ -11,7 +11,7 @@ class TestSaleOrder(TransactionCase):
super(TestSaleOrder, self).setUp() super(TestSaleOrder, self).setUp()
self.product1 = self.env.ref('product.product_product_1') self.product1 = self.env.ref('product.product_product_1')
self.sale = self.env.ref('sale.sale_order_2') 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'} {'name': 'Template 1'}
) )
self.formula = self.env['contract.line.qty.formula'].create( self.formula = self.env['contract.line.qty.formula'].create(
@@ -51,7 +51,7 @@ class TestSaleOrder(TransactionCase):
self.order_line1.onchange_product() self.order_line1.onchange_product()
self.sale.action_confirm() self.sale.action_confirm()
contract = self.order_line1.contract_id 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 lambda line: line.product_id == self.product1
) )
self.assertEqual( self.assertEqual(