diff --git a/contract_invoice_start_end_dates/README.rst b/contract_invoice_start_end_dates/README.rst index 6570c0de9..bcb9221b2 100644 --- a/contract_invoice_start_end_dates/README.rst +++ b/contract_invoice_start_end_dates/README.rst @@ -14,13 +14,13 @@ Contract Invoice Start End Dates :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github - :target: https://github.com/OCA/contract/tree/12.0/contract_invoice_start_end_dates + :target: https://github.com/OCA/contract/tree/14.0/contract_invoice_start_end_dates :alt: OCA/contract .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/contract-12-0/contract-12-0-contract_invoice_start_end_dates + :target: https://translation.odoo-community.org/projects/contract-14-0/contract-14-0-contract_invoice_start_end_dates :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/110/12.0 + :target: https://runbot.odoo-community.org/runbot/110/14.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -39,7 +39,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -58,6 +58,7 @@ Contributors * Alexis de Lattre * Florian da Costa + * Chafique Delli Maintainers ~~~~~~~~~~~ @@ -80,6 +81,6 @@ Current `maintainer `__: |maintainer-florian-dacosta| -This module is part of the `OCA/contract `_ project on GitHub. +This module is part of the `OCA/contract `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/contract_invoice_start_end_dates/__manifest__.py b/contract_invoice_start_end_dates/__manifest__.py index 6a94c162f..5027abe32 100644 --- a/contract_invoice_start_end_dates/__manifest__.py +++ b/contract_invoice_start_end_dates/__manifest__.py @@ -2,18 +2,17 @@ # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html { - 'name': 'Contract Invoice Start End Dates', - 'version': '12.0.1.0.0', - 'category': 'Contract Management', - 'author': 'Akretion, ' - 'Odoo Community Association (OCA)', - 'maintainers': ['florian-dacosta'], - 'website': 'https://github.com/OCA/contract', - 'depends': [ - 'account_invoice_start_end_dates', - 'contract', + "name": "Contract Invoice Start End Dates", + "version": "14.0.1.0.0", + "category": "Contract Management", + "author": "Akretion, Odoo Community Association (OCA)", + "maintainers": ["florian-dacosta"], + "website": "https://github.com/OCA/contract", + "depends": [ + "account_invoice_start_end_dates", + "contract", ], - 'data': [], - 'license': 'AGPL-3', - 'installable': True, + "data": [], + "license": "AGPL-3", + "installable": True, } diff --git a/contract_invoice_start_end_dates/i18n/contract_invoice_start_end_dates.pot b/contract_invoice_start_end_dates/i18n/contract_invoice_start_end_dates.pot index 416a31b55..1b9f128f1 100644 --- a/contract_invoice_start_end_dates/i18n/contract_invoice_start_end_dates.pot +++ b/contract_invoice_start_end_dates/i18n/contract_invoice_start_end_dates.pot @@ -1,12 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * contract_invoice_start_end_dates +# * contract_invoice_start_end_dates # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: <>\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,3 +18,17 @@ msgstr "" msgid "Contract Line" msgstr "" +#. module: contract_invoice_start_end_dates +#: model:ir.model.fields,field_description:contract_invoice_start_end_dates.field_contract_line__display_name +msgid "Display Name" +msgstr "" + +#. module: contract_invoice_start_end_dates +#: model:ir.model.fields,field_description:contract_invoice_start_end_dates.field_contract_line__id +msgid "ID" +msgstr "" + +#. module: contract_invoice_start_end_dates +#: model:ir.model.fields,field_description:contract_invoice_start_end_dates.field_contract_line____last_update +msgid "Last Modified on" +msgstr "" diff --git a/contract_invoice_start_end_dates/models/contract_line.py b/contract_invoice_start_end_dates/models/contract_line.py index 361d9ba64..69f4812ef 100644 --- a/contract_invoice_start_end_dates/models/contract_line.py +++ b/contract_invoice_start_end_dates/models/contract_line.py @@ -5,16 +5,18 @@ from odoo import models class ContractLine(models.Model): - _inherit = 'contract.line' + _inherit = "contract.line" - def _prepare_invoice_line(self, invoice_id=False, invoice_values=False): - vals = super(ContractLine, self)._prepare_invoice_line( - invoice_id=invoice_id, invoice_values=invoice_values) + def _prepare_invoice_line(self, move_form): + vals = super()._prepare_invoice_line(move_form=move_form) if self.product_id.must_have_dates: dates = self._get_period_to_invoice( - self.last_date_invoiced, self.recurring_next_date) - vals.update({ - 'start_date': dates[0], - 'end_date': dates[1], - }) + self.last_date_invoiced, self.recurring_next_date + ) + vals.update( + { + "start_date": dates[0], + "end_date": dates[1], + } + ) return vals diff --git a/contract_invoice_start_end_dates/readme/CONTRIBUTORS.rst b/contract_invoice_start_end_dates/readme/CONTRIBUTORS.rst index 48247114a..bc36ae6c6 100644 --- a/contract_invoice_start_end_dates/readme/CONTRIBUTORS.rst +++ b/contract_invoice_start_end_dates/readme/CONTRIBUTORS.rst @@ -2,3 +2,4 @@ * Alexis de Lattre * Florian da Costa + * Chafique Delli diff --git a/contract_invoice_start_end_dates/static/description/index.html b/contract_invoice_start_end_dates/static/description/index.html index ea0671c17..3dc7cbff1 100644 --- a/contract_invoice_start_end_dates/static/description/index.html +++ b/contract_invoice_start_end_dates/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/contract Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/contract Translate me on Weblate Try me on Runbot

This module automatically adds start and end dates to the invoice line generated by a contract if the product is marked as Must have dates.

Table of contents

@@ -387,7 +387,7 @@ generated by a contract if the product is marked as Must have dates.

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -404,6 +404,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  • Akretion:
    • @@ -417,7 +418,7 @@ mission is to support the collaborative development of Odoo features and promote its widespread use.

    Current maintainer:

    florian-dacosta

    -

    This module is part of the OCA/contract project on GitHub.

    +

    This module is part of the OCA/contract project on GitHub.

    You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

    diff --git a/contract_invoice_start_end_dates/tests/__init__.py b/contract_invoice_start_end_dates/tests/__init__.py new file mode 100644 index 000000000..000c933e5 --- /dev/null +++ b/contract_invoice_start_end_dates/tests/__init__.py @@ -0,0 +1 @@ +from . import test_contract_invoice_start_end_dates diff --git a/contract_invoice_start_end_dates/tests/test_contract_invoice_start_end_dates.py b/contract_invoice_start_end_dates/tests/test_contract_invoice_start_end_dates.py new file mode 100644 index 000000000..d4ecbcedc --- /dev/null +++ b/contract_invoice_start_end_dates/tests/test_contract_invoice_start_end_dates.py @@ -0,0 +1,17 @@ +# Copyright 2022 Akretion France (http://www.akretion.com/) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.addons.contract.tests.test_contract import TestContractBase + + +class TestContractInvoiceStartEndDates(TestContractBase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.contract.date_end = "2018-12-31" + cls.acct_line.product_id.must_have_dates = True + + def test_invoice_start_end_dates(self): + invoice = self.contract.recurring_create_invoice() + self.assertTrue(invoice.invoice_line_ids.start_date) + self.assertTrue(invoice.invoice_line_ids.end_date)