From 209f16dcc4d9b6a2abcc8ae921680a406add92f3 Mon Sep 17 00:00:00 2001 From: Aaron Henriquez Date: Thu, 7 Mar 2019 12:34:56 +0100 Subject: [PATCH] !fixup --- contract_variable_discount/__manifest__.py | 2 +- contract_variable_discount/models/contract.py | 2 +- .../tests/test_contract_variable_discount.py | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/contract_variable_discount/__manifest__.py b/contract_variable_discount/__manifest__.py index 94272149..a99362ab 100644 --- a/contract_variable_discount/__manifest__.py +++ b/contract_variable_discount/__manifest__.py @@ -4,7 +4,7 @@ { 'name': 'Variable discount in contract recurrent invoicing', - 'version': '10.0.1.2.0', + 'version': '10.0.1.0.0', 'category': 'Contract Management', 'license': 'AGPL-3', 'author': "Tecnativa," diff --git a/contract_variable_discount/models/contract.py b/contract_variable_discount/models/contract.py index 893f9e7b..d2e88029 100644 --- a/contract_variable_discount/models/contract.py +++ b/contract_variable_discount/models/contract.py @@ -42,7 +42,7 @@ class AccountAnalyticContractLine(models.Model): selection=[ ('fixed', 'Fixed discount'), ('variable', 'Variable discount'), - ], required=True, default='fixed', string="discount. type") + ], required=True, default='fixed', string="Discount type") discount_formula_id = fields.Many2one( comodel_name="contract.line.discount.formula", string="Formula") diff --git a/contract_variable_discount/tests/test_contract_variable_discount.py b/contract_variable_discount/tests/test_contract_variable_discount.py index b3ca2b00..97b6db30 100644 --- a/contract_variable_discount/tests/test_contract_variable_discount.py +++ b/contract_variable_discount/tests/test_contract_variable_discount.py @@ -44,8 +44,13 @@ class TestContractVariableDiscount(TransactionCase): }) self.formula = self.env['contract.line.discount.formula'].create({ 'name': 'Test formula', - # For testing each of the possible variables - 'code': 'result = 15', + 'code': 'env["res.users"]\n' + 'context.get("lang")\n' + 'user.id\n' + 'contract.id\n' + 'partner.id\n' + 'line.discount_type\n' + 'result = 15', }) self.line_vals = { 'analytic_account_id': self.template.id,