From 11ffdc68536c8fb9ee6e05c44e42bdcaf1b7786f Mon Sep 17 00:00:00 2001 From: Giovanni Date: Mon, 31 Oct 2022 10:03:58 +0100 Subject: [PATCH] [14.0][MIG] contract_variable_qty_prorated --- contract_variable_qty_prorated/__manifest__.py | 4 ++-- .../data/contract_variable_qty_prorated.xml | 5 ++--- .../models/contract_line.py | 9 ++------- .../readme/CONTRIBUTORS.rst | 1 + .../views/abstract_contract_view.xml | 15 +++++++++------ .../odoo/addons/contract_variable_qty_prorated | 1 + setup/contract_variable_qty_prorated/setup.py | 6 ++++++ 7 files changed, 23 insertions(+), 18 deletions(-) create mode 120000 setup/contract_variable_qty_prorated/odoo/addons/contract_variable_qty_prorated create mode 100644 setup/contract_variable_qty_prorated/setup.py diff --git a/contract_variable_qty_prorated/__manifest__.py b/contract_variable_qty_prorated/__manifest__.py index 94a040e3d..250d4ee0c 100644 --- a/contract_variable_qty_prorated/__manifest__.py +++ b/contract_variable_qty_prorated/__manifest__.py @@ -6,12 +6,12 @@ "summary": """ This module adds a formula to compute prorated quantity to invoice as extension of the module contract_variable_quantity""", - "version": "12.0.1.1.0", + "version": "14.0.1.0.0", "development_status": "Beta", "license": "AGPL-3", "author": "ACSONE SA/NV,Odoo Community Association (OCA)", "maintainers": ["sbejaoui"], - "website": "https://github.com/oca/contract", + "website": "https://github.com/OCA/contract", "depends": ["contract_variable_quantity"], "data": [ "data/contract_variable_qty_prorated.xml", diff --git a/contract_variable_qty_prorated/data/contract_variable_qty_prorated.xml b/contract_variable_qty_prorated/data/contract_variable_qty_prorated.xml index 01e348997..7c01880a3 100644 --- a/contract_variable_qty_prorated/data/contract_variable_qty_prorated.xml +++ b/contract_variable_qty_prorated/data/contract_variable_qty_prorated.xml @@ -1,10 +1,9 @@ - + - + Prorated Quantity result = 0 diff --git a/contract_variable_qty_prorated/models/contract_line.py b/contract_variable_qty_prorated/models/contract_line.py index 79e2e408d..203261237 100644 --- a/contract_variable_qty_prorated/models/contract_line.py +++ b/contract_variable_qty_prorated/models/contract_line.py @@ -7,10 +7,7 @@ from odoo import api, models class ContractLine(models.Model): _inherit = "contract.line" - @api.multi - def compute_prorated( - self, period_first_date, period_last_date, invoice_date - ): + def compute_prorated(self, period_first_date, period_last_date, invoice_date): self.ensure_one() return self._compute_prorated( period_first_date, @@ -42,9 +39,7 @@ class ContractLine(models.Model): recurring_rule_type == "monthlylastday" and recurring_invoicing_type == "post-paid" ): - relative_delta = self.get_relative_delta( - "monthly", recurring_interval - ) + relative_delta = self.get_relative_delta("monthly", recurring_interval) theoretical_next_date += self.get_relative_delta("daily", 1) if recurring_invoicing_type == "pre-paid": diff --git a/contract_variable_qty_prorated/readme/CONTRIBUTORS.rst b/contract_variable_qty_prorated/readme/CONTRIBUTORS.rst index 724261d73..ada0e7632 100644 --- a/contract_variable_qty_prorated/readme/CONTRIBUTORS.rst +++ b/contract_variable_qty_prorated/readme/CONTRIBUTORS.rst @@ -1,2 +1,3 @@ * Souheil Bejaoui * Thomas Binsfeld +* Giovanni Serra diff --git a/contract_variable_qty_prorated/views/abstract_contract_view.xml b/contract_variable_qty_prorated/views/abstract_contract_view.xml index 3a4e3b617..a458eb89d 100644 --- a/contract_variable_qty_prorated/views/abstract_contract_view.xml +++ b/contract_variable_qty_prorated/views/abstract_contract_view.xml @@ -1,19 +1,22 @@ - - + - - Contract Line Form View (in abstract_contract_view.xml) + Contract Line Form View (in abstract_contract_view.xml) contract.abstract.contract.line - + - + True diff --git a/setup/contract_variable_qty_prorated/odoo/addons/contract_variable_qty_prorated b/setup/contract_variable_qty_prorated/odoo/addons/contract_variable_qty_prorated new file mode 120000 index 000000000..967dc9728 --- /dev/null +++ b/setup/contract_variable_qty_prorated/odoo/addons/contract_variable_qty_prorated @@ -0,0 +1 @@ +../../../../contract_variable_qty_prorated \ No newline at end of file diff --git a/setup/contract_variable_qty_prorated/setup.py b/setup/contract_variable_qty_prorated/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/contract_variable_qty_prorated/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)