diff --git a/contract/models/contract_line_constraints.py b/contract/models/contract_line_constraints.py index ad0faa69a..eeaba307b 100644 --- a/contract/models/contract_line_constraints.py +++ b/contract/models/contract_line_constraints.py @@ -47,7 +47,7 @@ def _expand_none(criteria): def _add(matrix, criteria, allowed): - """ Expand None values to True/False combination """ + """Expand None values to True/False combination""" for c in _expand_none(criteria): matrix[c] = allowed diff --git a/contract/models/res_partner.py b/contract/models/res_partner.py index a9b471ebe..5a7c66101 100644 --- a/contract/models/res_partner.py +++ b/contract/models/res_partner.py @@ -41,14 +41,10 @@ class ResPartner(models.Model): for partner in self: partner_child_ids = partner.child_ids.ids + partner.ids partner.sale_contract_count = sum( - [r[2] for r in result if r[0] in partner_child_ids and r[1] == "sale"] + r[2] for r in result if r[0] in partner_child_ids and r[1] == "sale" ) partner.purchase_contract_count = sum( - [ - r[2] - for r in result - if r[0] in partner_child_ids and r[1] == "purchase" - ] + r[2] for r in result if r[0] in partner_child_ids and r[1] == "purchase" ) def act_show_contract(self): diff --git a/contract/tests/test_contract.py b/contract/tests/test_contract.py index dce80ea27..a124603b1 100644 --- a/contract/tests/test_contract.py +++ b/contract/tests/test_contract.py @@ -309,7 +309,7 @@ class TestContract(TestContractBase): self.contract._recurring_create_invoice() invoice_daily = self.contract._get_related_invoices() self.assertTrue(invoice_daily) - self.assertEquals(self.contract.user_id, invoice_daily.user_id) + self.assertEqual(self.contract.user_id, invoice_daily.user_id) def test_contract_weekly_post_paid(self): recurring_next_date = to_date("2018-03-01") diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..7d41f1be0 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +# generated from manifests external_dependencies +python-dateutil diff --git a/setup/contract/odoo/addons/contract b/setup/contract/odoo/addons/contract new file mode 120000 index 000000000..28176509d --- /dev/null +++ b/setup/contract/odoo/addons/contract @@ -0,0 +1 @@ +../../../../contract \ No newline at end of file diff --git a/setup/contract/setup.py b/setup/contract/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/contract/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)