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

[IMP] - Contract: add new recurring_rule_type quarterly and semesterly

Browse Source
This commit is contained in:
sbejaoui
2020-04-14 11:25:09 +02:00
parent 47a6c1209f
commit 019ecefa51
4 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contract/models/abstract_contract_line.py
View File

@@ -59,6 +59,8 @@ class ContractAbstractContractLine(models.AbstractModel):
('weekly', 'Week(s)'), ('weekly', 'Week(s)'),
('monthly', 'Month(s)'), ('monthly', 'Month(s)'),
('monthlylastday', 'Month(s) last day'), ('monthlylastday', 'Month(s) last day'),
('quarterly', 'Quarter(s)'),
('semesterly', 'Semester(s)'),
('yearly', 'Year(s)'), ('yearly', 'Year(s)'),
], ],
default='monthly', default='monthly',

4
contract/models/contract_line.py
View File

@@ -799,6 +799,10 @@ class ContractLine(models.Model):
return relativedelta(months=interval) return relativedelta(months=interval)
elif recurring_rule_type == 'monthlylastday': elif recurring_rule_type == 'monthlylastday':
return relativedelta(months=interval, day=1) return relativedelta(months=interval, day=1)
elif recurring_rule_type == 'quarterly':
return relativedelta(months=3 * interval)
elif recurring_rule_type == 'semesterly':
return relativedelta(months=6 * interval)
else: else:
return relativedelta(years=interval) return relativedelta(years=interval)

2
product_contract/models/product_template.py
View File

@@ -22,6 +22,8 @@ class ProductTemplate(models.Model):
('weekly', 'Week(s)'), ('weekly', 'Week(s)'),
('monthly', 'Month(s)'), ('monthly', 'Month(s)'),
('monthlylastday', 'Month(s) last day'), ('monthlylastday', 'Month(s) last day'),
('quarterly', 'Quarter(s)'),
('semesterly', 'Semester(s)'),
('yearly', 'Year(s)'), ('yearly', 'Year(s)'),
], ],
default='monthly', default='monthly',

2
product_contract/models/sale_order_line.py
View File

@@ -27,6 +27,8 @@ class SaleOrderLine(models.Model):
('weekly', 'Week(s)'), ('weekly', 'Week(s)'),
('monthly', 'Month(s)'), ('monthly', 'Month(s)'),
('monthlylastday', 'Month(s) last day'), ('monthlylastday', 'Month(s) last day'),
('quarterly', 'Quarter(s)'),
('semesterly', 'Semester(s)'),
('yearly', 'Year(s)'), ('yearly', 'Year(s)'),
], ],
default='monthly', default='monthly',