mirror of
https://github.com/OCA/contract.git
synced 2025-02-13 17:57:24 +02:00
[FIX] contract: Template lines handling (#92)
Update contract template lines handling to fix #80, and fix #59 #100
This commit is contained in:
committed by
Christopher Rogos
parent
8dce5c58af
commit
d8ced6beda
@@ -31,7 +31,7 @@ class TestContract(TransactionCase):
|
||||
'date_start': '2016-02-15',
|
||||
'recurring_next_date': '2016-02-29',
|
||||
})
|
||||
self.contract_line = self.env['account.analytic.invoice.line'].create({
|
||||
self.line_vals = {
|
||||
'analytic_account_id': self.contract.id,
|
||||
'product_id': self.product.id,
|
||||
'name': 'Services from #START# to #END#',
|
||||
@@ -39,17 +39,28 @@ class TestContract(TransactionCase):
|
||||
'uom_id': self.product.uom_id.id,
|
||||
'price_unit': 100,
|
||||
'discount': 50,
|
||||
})
|
||||
}
|
||||
self.acct_line = self.env['account.analytic.invoice.line'].create(
|
||||
self.line_vals,
|
||||
)
|
||||
|
||||
def _add_template_line(self, overrides=None):
|
||||
if overrides is None:
|
||||
overrides = {}
|
||||
vals = self.line_vals.copy()
|
||||
vals['analytic_account_id'] = self.template.id
|
||||
vals.update(overrides)
|
||||
return self.env['account.analytic.contract.line'].create(vals)
|
||||
|
||||
def test_check_discount(self):
|
||||
with self.assertRaises(ValidationError):
|
||||
self.contract_line.write({'discount': 120})
|
||||
self.acct_line.write({'discount': 120})
|
||||
|
||||
def test_contract(self):
|
||||
self.assertAlmostEqual(self.contract_line.price_subtotal, 50.0)
|
||||
res = self.contract_line._onchange_product_id()
|
||||
self.assertAlmostEqual(self.acct_line.price_subtotal, 50.0)
|
||||
res = self.acct_line._onchange_product_id()
|
||||
self.assertIn('uom_id', res['domain'])
|
||||
self.contract_line.price_unit = 100.0
|
||||
self.acct_line.price_unit = 100.0
|
||||
|
||||
self.contract.partner_id = False
|
||||
with self.assertRaises(ValidationError):
|
||||
@@ -122,10 +133,10 @@ class TestContract(TransactionCase):
|
||||
|
||||
def test_uom(self):
|
||||
uom_litre = self.env.ref('product.product_uom_litre')
|
||||
self.contract_line.uom_id = uom_litre.id
|
||||
self.contract_line._onchange_product_id()
|
||||
self.assertEqual(self.contract_line.uom_id,
|
||||
self.contract_line.product_id.uom_id)
|
||||
self.acct_line.uom_id = uom_litre.id
|
||||
self.acct_line._onchange_product_id()
|
||||
self.assertEqual(self.acct_line.uom_id,
|
||||
self.acct_line.product_id.uom_id)
|
||||
|
||||
def test_onchange_product_id(self):
|
||||
line = self.env['account.analytic.invoice.line'].new()
|
||||
@@ -134,8 +145,8 @@ class TestContract(TransactionCase):
|
||||
|
||||
def test_no_pricelist(self):
|
||||
self.contract.pricelist_id = False
|
||||
self.contract_line.quantity = 2
|
||||
self.assertAlmostEqual(self.contract_line.price_subtotal, 100.0)
|
||||
self.acct_line.quantity = 2
|
||||
self.assertAlmostEqual(self.acct_line.price_subtotal, 100.0)
|
||||
|
||||
def test_check_journal(self):
|
||||
contract_no_journal = self.contract.copy()
|
||||
@@ -146,7 +157,7 @@ class TestContract(TransactionCase):
|
||||
contract_no_journal.recurring_create_invoice()
|
||||
|
||||
def test_onchange_contract_template_id(self):
|
||||
""" It should change the contract values to match the template. """
|
||||
"""It should change the contract values to match the template."""
|
||||
self.contract.contract_template_id = self.template
|
||||
self.contract._onchange_contract_template_id()
|
||||
res = {
|
||||
@@ -156,6 +167,88 @@ class TestContract(TransactionCase):
|
||||
del self.template_vals['name']
|
||||
self.assertDictEqual(res, self.template_vals)
|
||||
|
||||
def test_onchange_contract_template_id_lines(self):
|
||||
"""It should create invoice lines for the contract lines."""
|
||||
|
||||
self.acct_line.unlink()
|
||||
self.line_vals['analytic_account_id'] = self.template.id
|
||||
self.env['account.analytic.contract.line'].create(self.line_vals)
|
||||
self.contract.contract_template_id = self.template
|
||||
|
||||
self.assertFalse(self.contract.recurring_invoice_line_ids,
|
||||
'Recurring lines were not removed.')
|
||||
|
||||
self.contract._onchange_contract_template_id()
|
||||
del self.line_vals['analytic_account_id']
|
||||
|
||||
self.assertEqual(len(self.contract.recurring_invoice_line_ids), 1)
|
||||
|
||||
for key, value in self.line_vals.items():
|
||||
test_value = self.contract.recurring_invoice_line_ids[0][key]
|
||||
try:
|
||||
test_value = test_value.id
|
||||
except AttributeError:
|
||||
pass
|
||||
self.assertEqual(test_value, value)
|
||||
|
||||
def test_send_mail_contract(self):
|
||||
result = self.contract.action_contract_send()
|
||||
self.assertEqual(result['res_model'], 'mail.compose.message')
|
||||
|
||||
def test_contract_onchange_product_id_domain_blank(self):
|
||||
"""It should return a blank UoM domain when no product."""
|
||||
line = self.env['account.analytic.contract.line'].new()
|
||||
res = line._onchange_product_id()
|
||||
self.assertFalse(res['domain']['uom_id'])
|
||||
|
||||
def test_contract_onchange_product_id_domain(self):
|
||||
"""It should return UoM category domain."""
|
||||
line = self._add_template_line()
|
||||
res = line._onchange_product_id()
|
||||
self.assertEqual(
|
||||
res['domain']['uom_id'][0],
|
||||
('category_id', '=', self.product.uom_id.category_id.id),
|
||||
)
|
||||
|
||||
def test_contract_onchange_product_id_uom(self):
|
||||
"""It should update the UoM for the line."""
|
||||
line = self._add_template_line(
|
||||
{'uom_id': self.env.ref('product.product_uom_litre').id}
|
||||
)
|
||||
line.product_id.uom_id = self.env.ref('product.product_uom_day').id
|
||||
line._onchange_product_id()
|
||||
self.assertEqual(line.uom_id,
|
||||
line.product_id.uom_id)
|
||||
|
||||
def test_contract_onchange_product_id_name(self):
|
||||
"""It should update the name for the line."""
|
||||
line = self._add_template_line()
|
||||
line.product_id.description_sale = 'Test'
|
||||
line._onchange_product_id()
|
||||
self.assertEqual(line.name,
|
||||
'\n'.join([line.product_id.name,
|
||||
line.product_id.description_sale,
|
||||
]))
|
||||
|
||||
def test_contract(self):
|
||||
self.assertAlmostEqual(self.acct_line.price_subtotal, 50.0)
|
||||
res = self.acct_line._onchange_product_id()
|
||||
self.assertIn('uom_id', res['domain'])
|
||||
self.acct_line.price_unit = 100.0
|
||||
|
||||
self.contract.partner_id = False
|
||||
with self.assertRaises(ValidationError):
|
||||
self.contract.recurring_create_invoice()
|
||||
self.contract.partner_id = self.partner.id
|
||||
|
||||
self.contract.recurring_create_invoice()
|
||||
self.invoice_monthly = self.env['account.invoice'].search(
|
||||
[('contract_id', '=', self.contract.id)])
|
||||
self.assertTrue(self.invoice_monthly)
|
||||
self.assertEqual(self.contract.recurring_next_date, '2016-03-29')
|
||||
|
||||
self.inv_line = self.invoice_monthly.invoice_line_ids[0]
|
||||
self.assertTrue(self.inv_line.invoice_line_tax_ids)
|
||||
self.assertAlmostEqual(self.inv_line.price_subtotal, 50.0)
|
||||
self.assertEqual(self.contract.partner_id.user_id,
|
||||
self.invoice_monthly.user_id)
|
||||
|
||||
Reference in New Issue
Block a user