diff --git a/contract_invoice_start_end_dates/README.rst b/contract_invoice_start_end_dates/README.rst index 0e75c2bf2..6570c0de9 100644 --- a/contract_invoice_start_end_dates/README.rst +++ b/contract_invoice_start_end_dates/README.rst @@ -14,19 +14,19 @@ 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/10.0/contract_invoice_start_end_dates + :target: https://github.com/OCA/contract/tree/12.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-10-0/contract-10-0-contract_invoice_start_end_dates + :target: https://translation.odoo-community.org/projects/contract-12-0/contract-12-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/10.0 + :target: https://runbot.odoo-community.org/runbot/110/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| -This module automatically add start and end dates to the invoice line -generated by a contract if the product is marked as 'must have date'. +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** @@ -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. @@ -72,6 +72,14 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/contract `_ project on GitHub. +.. |maintainer-florian-dacosta| image:: https://github.com/florian-dacosta.png?size=40px + :target: https://github.com/florian-dacosta + :alt: florian-dacosta + +Current `maintainer `__: + +|maintainer-florian-dacosta| + +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/__init__.py b/contract_invoice_start_end_dates/__init__.py index 0f9fbab01..0650744f6 100644 --- a/contract_invoice_start_end_dates/__init__.py +++ b/contract_invoice_start_end_dates/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- -# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html from . import models diff --git a/contract_invoice_start_end_dates/__manifest__.py b/contract_invoice_start_end_dates/__manifest__.py index 40f46108c..6a94c162f 100644 --- a/contract_invoice_start_end_dates/__manifest__.py +++ b/contract_invoice_start_end_dates/__manifest__.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# Copyright 2019 Akretion +# Copyright 2019-2020 Akretion France (http://www.akretion.com/) # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html { @@ -8,13 +7,13 @@ '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': [ - ], + '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 new file mode 100644 index 000000000..416a31b55 --- /dev/null +++ b/contract_invoice_start_end_dates/i18n/contract_invoice_start_end_dates.pot @@ -0,0 +1,20 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * contract_invoice_start_end_dates +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: contract_invoice_start_end_dates +#: model:ir.model,name:contract_invoice_start_end_dates.model_contract_line +msgid "Contract Line" +msgstr "" + diff --git a/contract_invoice_start_end_dates/models/__init__.py b/contract_invoice_start_end_dates/models/__init__.py index f20c3dcc4..6143a3650 100644 --- a/contract_invoice_start_end_dates/models/__init__.py +++ b/contract_invoice_start_end_dates/models/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- -# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html -from . import account_analytic_account +from . import contract_line diff --git a/contract_invoice_start_end_dates/models/account_analytic_account.py b/contract_invoice_start_end_dates/models/account_analytic_account.py deleted file mode 100644 index 060bff603..000000000 --- a/contract_invoice_start_end_dates/models/account_analytic_account.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2019 - Akretion -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from odoo import api, models - - -class AccountAnalyticAccount(models.Model): - _inherit = 'account.analytic.account' - - @api.model - def _prepare_invoice_line(self, line, invoice_id): - vals = super(AccountAnalyticAccount, self)._prepare_invoice_line( - line, invoice_id) - if line.product_id.must_have_dates: - vals.update({ - 'start_date': self.env.context['date_from'], - 'end_date': self.env.context['date_to'], - }) - return vals diff --git a/contract_invoice_start_end_dates/models/contract_line.py b/contract_invoice_start_end_dates/models/contract_line.py new file mode 100644 index 000000000..361d9ba64 --- /dev/null +++ b/contract_invoice_start_end_dates/models/contract_line.py @@ -0,0 +1,20 @@ +# Copyright 2019-2020 Akretion France (http://www.akretion.com/) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import models + + +class ContractLine(models.Model): + _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) + 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], + }) + return vals diff --git a/contract_invoice_start_end_dates/readme/DESCRIPTION.rst b/contract_invoice_start_end_dates/readme/DESCRIPTION.rst index feb5f9c7e..0dfd06b2d 100644 --- a/contract_invoice_start_end_dates/readme/DESCRIPTION.rst +++ b/contract_invoice_start_end_dates/readme/DESCRIPTION.rst @@ -1,2 +1,2 @@ This module automatically adds start and end dates to the invoice line -generated by a contract if the product is marked as 'must have date'. +generated by a contract if the product is marked as *Must have dates*. diff --git a/contract_invoice_start_end_dates/static/description/index.html b/contract_invoice_start_end_dates/static/description/index.html index 9758a663b..ea0671c17 100644 --- a/contract_invoice_start_end_dates/static/description/index.html +++ b/contract_invoice_start_end_dates/static/description/index.html @@ -3,7 +3,7 @@ - + Contract Invoice Start End Dates