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] - Should be able to stop a past contract line

Browse Source
This commit is contained in:
sbejaoui
2019-01-11 15:45:39 +01:00
committed by Francisco Ivan Anton Prieto
parent 664ed4346f
commit ae2bf92694
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contract/models/contract_line.py
View File

@@ -999,7 +999,7 @@ class AccountAnalyticInvoiceLine(models.Model):
res = self.env['account.analytic.invoice.line'] res = self.env['account.analytic.invoice.line']
for rec in self: for rec in self:
is_auto_renew = rec.is_auto_renew is_auto_renew = rec.is_auto_renew
rec.is_auto_renew = False rec.stop(rec.date_end, post_message=False)
date_start, date_end = rec._get_renewal_dates() date_start, date_end = rec._get_renewal_dates()
new_line = rec.plan_successor( new_line = rec.plan_successor(
date_start, date_end, is_auto_renew, post_message=False date_start, date_end, is_auto_renew, post_message=False

4
contract/models/contract_line_constraints.py
View File

@@ -303,7 +303,7 @@ CRITERIA_ALLOWED_DICT = {
): Allowed( ): Allowed(
plan_successor=False, plan_successor=False,
stop_plan_successor=False, stop_plan_successor=False,
stop=False, stop=True,
cancel=False, cancel=False,
uncancel=False, uncancel=False,
), ),
@@ -333,7 +333,7 @@ CRITERIA_ALLOWED_DICT = {
): Allowed( ): Allowed(
plan_successor=True, plan_successor=True,
stop_plan_successor=False, stop_plan_successor=False,
stop=False, stop=True,
cancel=False, cancel=False,
uncancel=False, uncancel=False,
), ),

14
contract/tests/test_contract.py
View File

@@ -640,17 +640,13 @@ class TestContract(TestContractBase):
self.assertFalse(self.contract.date_end) self.assertFalse(self.contract.date_end)
def test_stop_contract_line(self): def test_stop_contract_line(self):
"""It should put end to the contract line""" """It should raise a validation error"""
self.acct_line.write( self.acct_line.cancel()
{
'date_start': self.today - relativedelta(months=7),
'recurring_next_date': self.today - relativedelta(months=7),
'date_end': self.today - relativedelta(months=5),
'is_auto_renew': False,
}
)
with self.assertRaises(ValidationError): with self.assertRaises(ValidationError):
self.acct_line.stop(self.today) self.acct_line.stop(self.today)
def test_stop_contract_line(self):
"""It should put end to the contract line"""
self.acct_line.write( self.acct_line.write(
{ {
'date_start': self.today, 'date_start': self.today,