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

[FIX] - Get auto_renew_rule_type based on recurring_rule_type

Browse Source
This commit is contained in:
sbejaoui
2019-02-01 15:55:52 +01:00
committed by Adasat
parent 8a44e2a845
commit a16a7e002a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
product_contract/models/contract_line.py
View File

@@ -24,6 +24,14 @@ class AccountAnalyticInvoiceLine(models.Model):
res['sale_line_ids'] = [(6, 0, [self.sale_order_line_id.id])] res['sale_line_ids'] = [(6, 0, [self.sale_order_line_id.id])]
return res return res
@api.multi
def _get_auto_renew_rule_type(self):
"""monthly last day don't make sense for auto_renew_rule_type"""
self.ensure_one()
if self.recurring_rule_type == "monthlylastday":
return "monthly"
return self.recurring_rule_type
@api.onchange('product_id') @api.onchange('product_id')
def _onchange_product_id_recurring_info(self): def _onchange_product_id_recurring_info(self):
for rec in self: for rec in self:
@@ -36,7 +44,7 @@ class AccountAnalyticInvoiceLine(models.Model):
rec.recurring_interval = 1 rec.recurring_interval = 1
rec.is_auto_renew = rec.product_id.is_auto_renew rec.is_auto_renew = rec.product_id.is_auto_renew
rec.auto_renew_interval = rec.product_id.default_qty rec.auto_renew_interval = rec.product_id.default_qty
rec.auto_renew_rule_type = rec.product_id.recurring_rule_type rec.auto_renew_rule_type = rec._get_auto_renew_rule_type()
rec.termination_notice_interval = ( rec.termination_notice_interval = (
rec.product_id.termination_notice_interval rec.product_id.termination_notice_interval
) )

2
product_contract/models/product_template.py
View File

@@ -13,7 +13,7 @@ class ProductTemplate(models.Model):
contract_template_id = fields.Many2one( contract_template_id = fields.Many2one(
comodel_name='account.analytic.contract', string='Contract Template' comodel_name='account.analytic.contract', string='Contract Template'
) )
default_qty = fields.Integer(string="Default Quantity") default_qty = fields.Integer(string="Default Quantity", default=1)
recurring_rule_type = fields.Selection( recurring_rule_type = fields.Selection(
[ [
('daily', 'Day(s)'), ('daily', 'Day(s)'),