[FIX] - Fix unit tests

This commit is contained in:
sbejaoui
2019-09-30 14:51:46 +02:00
committed by hkapatel
parent dabc65a6c4
commit af9ad7e7bd
2 changed files with 19 additions and 26 deletions

View File

@@ -32,9 +32,8 @@ class ContractContract(models.Model):
self.mandate_id = False self.mandate_id = False
@api.multi @api.multi
def _prepare_invoice(self, date_invoice, journal=None): def _prepare_invoice(self, date_ref=False):
invoice_vals = super(ContractContract, self)._prepare_invoice( invoice_vals = super(ContractContract, self)._prepare_invoice(date_ref)
date_invoice, journal)
if self.mandate_id: if self.mandate_id:
invoice_vals['mandate_id'] = self.mandate_id.id invoice_vals['mandate_id'] = self.mandate_id.id
elif self.payment_mode_id.payment_method_id.mandate_required: elif self.payment_mode_id.payment_method_id.mandate_required:

View File

@@ -2,9 +2,10 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo.tests import common from odoo.tests import common
from odoo.addons.contract.tests.test_contract import TestContractBase
class TestContractMandate(common.SavepointCase): class TestContractMandate(TestContractBase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
super(TestContractMandate, cls).setUpClass() super(TestContractMandate, cls).setUpClass()
@@ -42,37 +43,30 @@ class TestContractMandate(common.SavepointCase):
'sale_ok': True, 'sale_ok': True,
'taxes_id': [(6, 0, [])], 'taxes_id': [(6, 0, [])],
}) })
cls.contract = cls.env['contract.contract'].create({ cls.contract_with_mandate = cls.contract2.copy(
'name': 'Test contract', {
'partner_id': cls.partner.id, 'partner_id': cls.partner.id,
'recurring_interval': 1,
'contract_line_ids': [(0, 0, {
'quantity': 2.0,
'price_unit': 200.0,
'name': 'Test contract line',
'product_id': cls.product.id,
'uom_id': cls.product.uom_id.id,
})],
'payment_mode_id': cls.payment_mode.id, 'payment_mode_id': cls.payment_mode.id,
'mandate_id': cls.mandate.id, 'mandate_id': cls.mandate.id,
}) }
)
def test_contract_mandate(self): def test_contract_mandate(self):
new_invoice = self.contract.recurring_create_invoice() new_invoice = self.contract_with_mandate.recurring_create_invoice()
self.assertEqual(new_invoice.mandate_id, self.mandate) self.assertEqual(new_invoice.mandate_id, self.mandate)
def test_contract_not_mandate(self): def test_contract_not_mandate(self):
self.contract.mandate_id = False self.contract_with_mandate.mandate_id = False
self.mandate2 = self.mandate.copy({ self.mandate2 = self.mandate.copy(
'unique_mandate_reference': 'BM0000XX2', {'unique_mandate_reference': 'BM0000XX2'}
}) )
self.mandate2.validate() self.mandate2.validate()
self.mandate.state = 'expired' self.mandate.state = 'expired'
new_invoice = self.contract.recurring_create_invoice() new_invoice = self.contract_with_mandate.recurring_create_invoice()
self.assertEqual(new_invoice.mandate_id, self.mandate2) self.assertEqual(new_invoice.mandate_id, self.mandate2)
def test_contract_mandate_default(self): def test_contract_mandate_default(self):
self.payment_mode.mandate_required = False self.payment_mode.mandate_required = False
self.contract.mandate_id = False self.contract_with_mandate.mandate_id = False
new_invoice = self.contract.recurring_create_invoice() new_invoice = self.contract_with_mandate.recurring_create_invoice()
self.assertFalse(new_invoice.mandate_id) self.assertFalse(new_invoice.mandate_id)