diff --git a/account_payment_term_partner_holiday/README.rst b/account_payment_term_partner_holiday/README.rst new file mode 100644 index 000000000000..a4cd3d921892 --- /dev/null +++ b/account_payment_term_partner_holiday/README.rst @@ -0,0 +1,105 @@ +==================================== +Account Payment Term Partner Holiday +==================================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:afe7b305107611842f1263bcb1bc45fed2405cd569ea078defd85c749ae46592 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--payment-lightgray.png?logo=github + :target: https://github.com/OCA/account-payment/tree/14.0/account_payment_term_partner_holiday + :alt: OCA/account-payment +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-payment-14-0/account-payment-14-0-account_payment_term_partner_holiday + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/account-payment&target_branch=14.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This addon adds the possibility of defining holiday periods in a +partner so as not to use those periods as the due date on invoices. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To use this module, you need to: + +#. Go to 'Contacts' and create a record or edit an existing one. +#. Go to 'Sales & Purchase' tab and create some holiday periods. +#. Go to 'Invoicing > Customers > Invoices' or to 'Invoicing > Vendors > + Invoices' and create or edit a record. +#. If the computed due date is within a holiday period, it's moved to the first available date. + +Known issues / Roadmap +====================== + +* Due dates for invoices are not updated when new holiday periods are created. + +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 to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* `Tecnativa `__: + + * Víctor Martínez + * Pedro M. Baeza + * Luis D. Lafaurie + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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. + +.. |maintainer-victoralmau| image:: https://github.com/victoralmau.png?size=40px + :target: https://github.com/victoralmau + :alt: victoralmau + +Current `maintainer `__: + +|maintainer-victoralmau| + +This module is part of the `OCA/account-payment `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_payment_term_partner_holiday/__init__.py b/account_payment_term_partner_holiday/__init__.py new file mode 100644 index 000000000000..0650744f6bc6 --- /dev/null +++ b/account_payment_term_partner_holiday/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_payment_term_partner_holiday/__manifest__.py b/account_payment_term_partner_holiday/__manifest__.py new file mode 100644 index 000000000000..a100d1916aae --- /dev/null +++ b/account_payment_term_partner_holiday/__manifest__.py @@ -0,0 +1,16 @@ +# Copyright 2021 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Account Payment Term Partner Holiday", + "version": "14.0.1.0.0", + "website": "https://github.com/OCA/account-payment", + "author": "Tecnativa, Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": ["account_payment_term_extension"], + "maintainers": ["victoralmau"], + "development_status": "Beta", + "data": ["security/ir.model.access.csv", "views/res_partner_view.xml"], +} diff --git a/account_payment_term_partner_holiday/i18n/account_payment_term_partner_holiday.pot b/account_payment_term_partner_holiday/i18n/account_payment_term_partner_holiday.pot new file mode 100644 index 000000000000..076928617090 --- /dev/null +++ b/account_payment_term_partner_holiday/i18n/account_payment_term_partner_holiday.pot @@ -0,0 +1,183 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_term_partner_holiday +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.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: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "April" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "August" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model,name:account_payment_term_partner_holiday.model_res_partner +msgid "Contact" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__create_uid +msgid "Created by" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__create_date +msgid "Created on" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__day_from +msgid "Day from" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__day_to +msgid "Day to" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "December" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__display_name +msgid "Display Name" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "February" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__id +msgid "ID" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "January" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model,name:account_payment_term_partner_holiday.model_account_move +msgid "Journal Entries" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "July" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "June" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday____last_update +msgid "Last Modified on" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__write_date +msgid "Last Updated on" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "March" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "May" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__month_from +msgid "Month from" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.constraint,message:account_payment_term_partner_holiday.constraint_res_partner_holiday_month_consistency +msgid "Month from should be higher than month from" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__month_to +msgid "Month to" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "November" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "October" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__partner_id +msgid "Partner" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model,name:account_payment_term_partner_holiday.model_res_partner_holiday +msgid "Partner Holidays" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model,name:account_payment_term_partner_holiday.model_account_payment_term +msgid "Payment Terms" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner__holiday_ids +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_users__holiday_ids +msgid "Payment Terms Holidays" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "September" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "You can't set the ending holidays period before the beginning." +msgstr "" diff --git a/account_payment_term_partner_holiday/i18n/es.po b/account_payment_term_partner_holiday/i18n/es.po new file mode 100644 index 000000000000..ba7d3bbace64 --- /dev/null +++ b/account_payment_term_partner_holiday/i18n/es.po @@ -0,0 +1,190 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_term_partner_holiday +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-07-02 08:02+0000\n" +"PO-Revision-Date: 2021-07-02 10:03+0200\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: \n" +"X-Generator: Poedit 2.3\n" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "April" +msgstr "Abril" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "August" +msgstr "Agosto" + +#. module: account_payment_term_partner_holiday +#: model:ir.model,name:account_payment_term_partner_holiday.model_res_partner +msgid "Contact" +msgstr "Contacto" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__create_uid +msgid "Created by" +msgstr "Creado por" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__create_date +msgid "Created on" +msgstr "Creado e" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__day_from +msgid "Day from" +msgstr "Día desde" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__day_to +msgid "Day to" +msgstr "Día hasta" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "December" +msgstr "Diciembre" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__display_name +msgid "Display Name" +msgstr "Nombre a mostrar" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "February" +msgstr "Febrero" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__id +msgid "ID" +msgstr "ID" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "January" +msgstr "Enero" + +#. module: account_payment_term_partner_holiday +#: model:ir.model,name:account_payment_term_partner_holiday.model_account_move +msgid "Journal Entries" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "July" +msgstr "Julio" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "June" +msgstr "Junio" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday____last_update +msgid "Last Modified on" +msgstr "Última modificación el" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__write_uid +msgid "Last Updated by" +msgstr "Última actualización por" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__write_date +msgid "Last Updated on" +msgstr "Última actualización el" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "March" +msgstr "Marzo" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "May" +msgstr "Mayo" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__month_from +msgid "Month from" +msgstr "Mes desde" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.constraint,message:account_payment_term_partner_holiday.constraint_res_partner_holiday_month_consistency +msgid "Month from should be higher than month from" +msgstr "" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__month_to +msgid "Month to" +msgstr "Mes hasta" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "November" +msgstr "Noviembre" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "October" +msgstr "Octubre" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner_holiday__partner_id +msgid "Partner" +msgstr "Contacto" + +#. module: account_payment_term_partner_holiday +#: model:ir.model,name:account_payment_term_partner_holiday.model_res_partner_holiday +msgid "Partner Holidays" +msgstr "Vacaciones de contacto" + +#. module: account_payment_term_partner_holiday +#: model:ir.model,name:account_payment_term_partner_holiday.model_account_payment_term +msgid "Payment Terms" +msgstr "Plazos de pago" + +#. module: account_payment_term_partner_holiday +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_partner__holiday_ids +#: model:ir.model.fields,field_description:account_payment_term_partner_holiday.field_res_users__holiday_ids +msgid "Payment Terms Holidays" +msgstr "Vacaciones de términos de pago" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "September" +msgstr "Septiembre" + +#. module: account_payment_term_partner_holiday +#: code:addons/account_payment_term_partner_holiday/models/res_partner.py:0 +#, python-format +msgid "You can't set the ending holidays period before the beginning." +msgstr "" + +#~ msgid "Invoice" +#~ msgstr "Factura" diff --git a/account_payment_term_partner_holiday/models/__init__.py b/account_payment_term_partner_holiday/models/__init__.py new file mode 100644 index 000000000000..810b018a375f --- /dev/null +++ b/account_payment_term_partner_holiday/models/__init__.py @@ -0,0 +1,3 @@ +from . import account_move +from . import account_payment_term +from . import res_partner diff --git a/account_payment_term_partner_holiday/models/account_move.py b/account_payment_term_partner_holiday/models/account_move.py new file mode 100644 index 000000000000..7991dcb1ae04 --- /dev/null +++ b/account_payment_term_partner_holiday/models/account_move.py @@ -0,0 +1,43 @@ +# Copyright 2021 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import api, models + + +class AccountMove(models.Model): + _inherit = "account.move" + + def _recompute_payment_terms_lines(self): + _self = self + if self.partner_id: + _self = self.with_context(move_partner_id=self.partner_id.id) + return super(AccountMove, _self)._recompute_payment_terms_lines() + + @api.onchange("invoice_date_due") + def _onchange_invoice_date_due_account_payment_term_partner_holiday(self): + """Recompute the due date to the next available date according to + the holiday periods set in the partner. + + It must only be re-calculated when a payment term is not set. + This prevents the due date to be changed again and that another + given number of days are added according to what is set on the + payment term. + """ + if ( + self.invoice_date_due + and self.partner_id + and not self.invoice_payment_term_id + ): + new_invoice_date_due = self.partner_id._get_valid_due_date( + self.invoice_date_due + ) + if new_invoice_date_due != self.invoice_date_due: + self.invoice_date_due = new_invoice_date_due + + def action_post(self): + """Inject a context for getting the partner when computing payment term.""" + for move in self: + super( + AccountMove, self.with_context(move_partner_id=move.partner_id.id) + ).action_post() + return False diff --git a/account_payment_term_partner_holiday/models/account_payment_term.py b/account_payment_term_partner_holiday/models/account_payment_term.py new file mode 100644 index 000000000000..ed61c448f472 --- /dev/null +++ b/account_payment_term_partner_holiday/models/account_payment_term.py @@ -0,0 +1,35 @@ +# Copyright 2021 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class AccountPaymentTerm(models.Model): + _inherit = "account.payment.term" + + def compute(self, value, date_ref=False, currency=None): + """Compute the due date taking into account the holiday periods + set in the partner. + + Once an initial date resulting of the payment term is computed, + compute the first available date after that. + Then, apply_payment_days() and apply_holidays() to prevent + incompatibilities. + """ + result = super().compute(value=value, date_ref=date_ref, currency=currency) + ctx = self.env.context + partner_id = ctx.get("move_partner_id", ctx.get("default_partner_id")) + if partner_id: + partner = self.env["res.partner"].browse(partner_id) + result2 = [] + for key, item in enumerate(result): + next_date = partner._get_valid_due_date(item[0]) + if next_date != item[0]: + line = self.line_ids[key] + next_date = self.apply_payment_days(line, next_date) + next_date = self.apply_holidays(next_date) + result2.append((fields.Date.to_string(next_date), item[1])) + else: + result2.append(item) + result = result2 + return result diff --git a/account_payment_term_partner_holiday/models/res_partner.py b/account_payment_term_partner_holiday/models/res_partner.py new file mode 100644 index 000000000000..5c8909e52cc8 --- /dev/null +++ b/account_payment_term_partner_holiday/models/res_partner.py @@ -0,0 +1,122 @@ +# Copyright 2021 Tecnativa - Víctor Martínez +# Copyright 2021 Tecnativa - João Marques +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +import calendar + +from dateutil.relativedelta import relativedelta + +from odoo import _, api, fields, models +from odoo.exceptions import ValidationError + + +class ResPartner(models.Model): + _inherit = "res.partner" + + holiday_ids = fields.One2many( + comodel_name="res.partner.holiday", + inverse_name="partner_id", + string="Payment Terms Holidays", + copy=True, + auto_join=True, + ) + + def _get_valid_due_date(self, date): + if isinstance(date, str): + date = fields.Date.from_string(date) + is_date_in_holiday = self.is_date_in_holiday(date) + while is_date_in_holiday: + date = is_date_in_holiday[1] + relativedelta(days=1) + is_date_in_holiday = self.is_date_in_holiday(date) + return date + + def is_date_in_holiday(self, date): + if isinstance(date, str): + date = fields.Date.from_string(date) + for holiday in self.commercial_partner_id.holiday_ids: + holiday_start_date = self._generate_field_date( + date.year, int(holiday.month_from), int(holiday.day_from) + ) + holiday_end_date = self._generate_field_date( + date.year, int(holiday.month_to), int(holiday.day_to) + ) + if date >= holiday_start_date and date <= holiday_end_date: + return [holiday_start_date, holiday_end_date] + return False + + def _generate_field_date(self, year, month, day): + # When the user selects a date that does not exist, assume the last day + # for that month + days = (day, max(calendar.monthrange(year, month))) + return fields.Date.from_string("%s-%s-%s" % (year, month, min(days))) + + +class ResPartnerHoliday(models.Model): + _name = "res.partner.holiday" + _description = "Partner Holidays" + _order = "month_from, day_from, id" + + @api.model + def _selection_days(self): + return [(str(i), str(i)) for i in range(1, 32)] + + @api.model + def _selection_months(self): + return [ + ("01", _("January")), + ("02", _("February")), + ("03", _("March")), + ("04", _("April")), + ("05", _("May")), + ("06", _("June")), + ("07", _("July")), + ("08", _("August")), + ("09", _("September")), + ("10", _("October")), + ("11", _("November")), + ("12", _("December")), + ] + + partner_id = fields.Many2one( + comodel_name="res.partner", + string="Partner", + required=True, + ondelete="cascade", + index=True, + copy=False, + ) + day_from = fields.Selection( + selection="_selection_days", + required=True, + ) + month_from = fields.Selection( + selection="_selection_months", + required=True, + ) + day_to = fields.Selection( + selection="_selection_days", + required=True, + ) + month_to = fields.Selection( + selection="_selection_months", + required=True, + ) + + _sql_constraints = [ + ( + "month_consistency", + "CHECK(month_from <= month_to)", + "Month from should be higher than month from", + ), + ] + + @api.constrains("day_from", "month_from", "day_to", "month_to") + def _check_from_end_dates(self): + for item in self: + if (int(item.month_from) > int(item.month_to)) or ( + int(item.month_to) == int(item.month_from) + and int(item.day_from) > int(item.day_to) + ): + raise ValidationError( + _("You can't set the ending holidays period before the beginning.") + ) diff --git a/account_payment_term_partner_holiday/readme/CONTRIBUTORS.rst b/account_payment_term_partner_holiday/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000000..75285d0fda33 --- /dev/null +++ b/account_payment_term_partner_holiday/readme/CONTRIBUTORS.rst @@ -0,0 +1,5 @@ +* `Tecnativa `__: + + * Víctor Martínez + * Pedro M. Baeza + * Luis D. Lafaurie diff --git a/account_payment_term_partner_holiday/readme/DESCRIPTION.rst b/account_payment_term_partner_holiday/readme/DESCRIPTION.rst new file mode 100644 index 000000000000..3a3a82725c14 --- /dev/null +++ b/account_payment_term_partner_holiday/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This addon adds the possibility of defining holiday periods in a +partner so as not to use those periods as the due date on invoices. diff --git a/account_payment_term_partner_holiday/readme/ROADMAP.rst b/account_payment_term_partner_holiday/readme/ROADMAP.rst new file mode 100644 index 000000000000..f5bb4e6008b1 --- /dev/null +++ b/account_payment_term_partner_holiday/readme/ROADMAP.rst @@ -0,0 +1 @@ +* Due dates for invoices are not updated when new holiday periods are created. diff --git a/account_payment_term_partner_holiday/readme/USAGE.rst b/account_payment_term_partner_holiday/readme/USAGE.rst new file mode 100644 index 000000000000..42a7cfd678b6 --- /dev/null +++ b/account_payment_term_partner_holiday/readme/USAGE.rst @@ -0,0 +1,7 @@ +To use this module, you need to: + +#. Go to 'Contacts' and create a record or edit an existing one. +#. Go to 'Sales & Purchase' tab and create some holiday periods. +#. Go to 'Invoicing > Customers > Invoices' or to 'Invoicing > Vendors > + Invoices' and create or edit a record. +#. If the computed due date is within a holiday period, it's moved to the first available date. diff --git a/account_payment_term_partner_holiday/security/ir.model.access.csv b/account_payment_term_partner_holiday/security/ir.model.access.csv new file mode 100644 index 000000000000..4ae1fd2dcf2b --- /dev/null +++ b/account_payment_term_partner_holiday/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink +access_res_partner_holiday,res_partner_holiday,model_res_partner_holiday,base.group_user,1,1,1,1 diff --git a/account_payment_term_partner_holiday/static/description/icon.png b/account_payment_term_partner_holiday/static/description/icon.png new file mode 100644 index 000000000000..3a0328b516c4 Binary files /dev/null and b/account_payment_term_partner_holiday/static/description/icon.png differ diff --git a/account_payment_term_partner_holiday/static/description/index.html b/account_payment_term_partner_holiday/static/description/index.html new file mode 100644 index 000000000000..4b9a17f7b8e4 --- /dev/null +++ b/account_payment_term_partner_holiday/static/description/index.html @@ -0,0 +1,448 @@ + + + + + + +Account Payment Term Partner Holiday + + + +
+

Account Payment Term Partner Holiday

+ + +

Beta License: AGPL-3 OCA/account-payment Translate me on Weblate Try me on Runboat

+

This addon adds the possibility of defining holiday periods in a +partner so as not to use those periods as the due date on invoices.

+

Table of contents

+ +
+

Usage

+

To use this module, you need to:

+
    +
  1. Go to ‘Contacts’ and create a record or edit an existing one.
    2. +
  2. Go to ‘Sales & Purchase’ tab and create some holiday periods.
    3. +
  3. Go to ‘Invoicing > Customers > Invoices’ or to ‘Invoicing > Vendors > +Invoices’ and create or edit a record.
    4. +
  4. If the computed due date is within a holiday period, it’s moved to the first available date.
    5. +
+
+
+

Known issues / Roadmap

+
    +
  • Due dates for invoices are not updated when new holiday periods are created.
    • +
+
+
+

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 to smash it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Tecnativa
    • +
+
+
+

Contributors

+
    +
  • Tecnativa:
      +
    • Víctor Martínez
      • +
    • Pedro M. Baeza
      • +
    • Luis D. Lafaurie
      • +
    +
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

Current maintainer:

+

victoralmau

+

This module is part of the OCA/account-payment project on GitHub.

+

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

+
+
+
+ + diff --git a/account_payment_term_partner_holiday/tests/__init__.py b/account_payment_term_partner_holiday/tests/__init__.py new file mode 100644 index 000000000000..ad312b2e557d --- /dev/null +++ b/account_payment_term_partner_holiday/tests/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_partner_holiday diff --git a/account_payment_term_partner_holiday/tests/test_partner_holiday.py b/account_payment_term_partner_holiday/tests/test_partner_holiday.py new file mode 100644 index 000000000000..d0719895b34c --- /dev/null +++ b/account_payment_term_partner_holiday/tests/test_partner_holiday.py @@ -0,0 +1,352 @@ +# Copyright 2021 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +import psycopg2 + +from odoo import fields +from odoo.tests import common +from odoo.tests.common import Form +from odoo.tools.misc import mute_logger + + +class TestPartnerHoliday(common.TransactionCase): + def setUp(self): + super().setUp() + self.partner_1 = self.env["res.partner"].create( + { + "name": "Partner test 1", + "holiday_ids": [ + ( + 0, + 0, + { + "day_from": "1", + "month_from": "02", + "day_to": "31", + "month_to": "02", + }, + ), + ( + 0, + 0, + { + "day_from": "1", + "month_from": "03", + "day_to": "1", + "month_to": "04", + }, + ), + ( + 0, + 0, + { + "day_from": "12", + "month_from": "06", + "day_to": "13", + "month_to": "06", + }, + ), + ( + 0, + 0, + { + "day_from": "15", + "month_from": "06", + "day_to": "16", + "month_to": "06", + }, + ), + ], + } + ) + self.partner_1_child = self.env["res.partner"].create( + {"name": "Partner child", "parent_id": self.partner_1.id, "type": "invoice"} + ) + self.partner_2 = self.env["res.partner"].create({"name": "Partner test 2"}) + self.payment_term_immediate = self.env["account.payment.term"].create( + { + "name": "Immediate", + "line_ids": [ + ( + 0, + 0, + { + "value": "balance", + "days": 0, + "option": "day_after_invoice_date", + }, + ) + ], + } + ) + self.payment_term_10_days = self.env["account.payment.term"].create( + { + "name": "10 Days", + "line_ids": [ + ( + 0, + 0, + { + "value": "balance", + "days": 10, + "option": "day_after_invoice_date", + }, + ) + ], + } + ) + self.payment_term_with_holidays = self.env["account.payment.term"].create( + { + "name": "Immediate (with holidays)", + "line_ids": [ + ( + 0, + 0, + { + "value": "balance", + "days": 0, + "option": "day_after_invoice_date", + }, + ) + ], + "holiday_ids": [ + (0, 0, {"holiday": "2021-06-14", "date_postponed": "2021-07-08"}) + ], + } + ) + self.payment_term_immediate_custom = self.env["account.payment.term"].create( + { + "name": "Immediate (with custom payment days)", + "line_ids": [ + ( + 0, + 0, + { + "value": "balance", + "days": 0, + "option": "day_after_invoice_date", + "payment_days": "5,10", + }, + ) + ], + } + ) + self.journal = self.env["account.journal"].create( + {"name": "Test sale", "type": "sale", "code": "TEST-SALE"} + ) + self.product = self.env["product.product"].create( + {"name": "Test product", "type": "service"} + ) + self.env["account.account"].create( + { + "name": "Test Account", + "code": "TEST", + "user_type_id": self.env.ref("account.data_account_type_receivable").id, + "reconcile": True, + } + ) + self.env["account.account"].create( + { + "name": "Test Account", + "code": "ACC", + "user_type_id": self.env.ref( + "account.data_account_type_other_income" + ).id, + "reconcile": True, + } + ) + + def test_check_partner_holiday_constraint(self): + vals = { + "partner_id": self.partner_2.id, + "day_from": "1", + "month_from": "12", + "day_to": "1", + "month_to": "01", + } + with self.assertRaises(psycopg2.IntegrityError), mute_logger("odoo.sql_db"): + self.env["res.partner.holiday"].create(vals) + + def test_check_dates_in_partner_1(self): + self.assertEqual( + self.partner_1.is_date_in_holiday(fields.Date.from_string("2021-02-01")), + [ + fields.Date.from_string("2021-02-01"), + fields.Date.from_string("2021-02-28"), + ], + ) + self.assertEqual( + self.partner_1.is_date_in_holiday(fields.Date.from_string("2021-03-01")), + [ + fields.Date.from_string("2021-03-01"), + fields.Date.from_string("2021-04-01"), + ], + ) + self.assertFalse( + self.partner_1.is_date_in_holiday(fields.Date.from_string("2021-04-02")) + ) + + def test_check_dates_in_partner_1_only_february(self): + self.assertEqual(len(self.partner_1.holiday_ids), 4) + self.partner_1.holiday_ids.filtered(lambda x: x.month_from == "03").unlink() + self.assertEqual(len(self.partner_1.holiday_ids), 3) + self.assertEqual( + self.partner_1.is_date_in_holiday(fields.Date.from_string("2021-02-01")), + [ + fields.Date.from_string("2021-02-01"), + fields.Date.from_string("2021-02-28"), + ], + ) + self.assertFalse( + self.partner_1.is_date_in_holiday(fields.Date.from_string("2021-03-01")) + ) + + def test_check_dates_in_partner_2(self): + self.assertFalse( + self.partner_2.is_date_in_holiday(fields.Date.from_string("2021-02-01")) + ) + self.assertFalse( + self.partner_2.is_date_in_holiday(fields.Date.from_string("2021-02-01")) + ) + self.assertFalse( + self.partner_2.is_date_in_holiday(fields.Date.from_string("2021-02-10")) + ) + self.assertFalse( + self.partner_2.is_date_in_holiday(fields.Date.from_string("2021-04-02")) + ) + + def _set_invoice_form(self, partner_id, date): + move_form = Form( + self.env["account.move"].with_context( + default_journal_id=self.journal.id, + default_partner_id=partner_id, + default_move_type="out_invoice", + default_invoice_date=date, + ), + ) + with move_form.invoice_line_ids.new() as line_form: + line_form.product_id = self.product + return move_form + + def test_invoice_payment_term_partner_1(self): + invoice_form = self._set_invoice_form(self.partner_1.id, "2021-02-01") + invoice_form.invoice_payment_term_id = self.payment_term_immediate + self.assertEqual( + invoice_form.invoice_date_due, fields.Date.from_string("2021-04-02") + ) + invoice_form.invoice_payment_term_id = self.payment_term_10_days + with invoice_form.invoice_line_ids.new() as line: + line.product_id = self.product + invoice = invoice_form.save() + self.assertEqual( + invoice.invoice_date_due, fields.Date.from_string("2021-04-02") + ) + # Set to 2021-04-01 + invoice_form = self._set_invoice_form(self.partner_1.id, "2021-04-01") + invoice_form.invoice_payment_term_id = self.payment_term_10_days + with invoice_form.invoice_line_ids.new() as line: + line.product_id = self.product + invoice = invoice_form.save() + self.assertEqual( + invoice.invoice_date_due, fields.Date.from_string("2021-04-11") + ) + + def test_invoice_payment_term_custom_partner_1(self): + invoice_form = self._set_invoice_form(self.partner_1.id, "2021-06-12") + invoice_form.invoice_payment_term_id = self.payment_term_with_holidays + self.assertEqual( + invoice_form.invoice_date_due, fields.Date.from_string("2021-07-08") + ) + invoice_form = self._set_invoice_form(self.partner_1.id, "2021-02-01") + invoice_form.invoice_payment_term_id = self.payment_term_immediate_custom + self.assertEqual( + invoice_form.invoice_date_due, fields.Date.from_string("2021-04-05") + ) + + def test_invoice_payment_term_partner_1_child(self): + invoice_form = self._set_invoice_form(self.partner_1_child.id, "2021-02-01") + invoice_form.invoice_payment_term_id = self.payment_term_immediate + self.assertEqual( + invoice_form.invoice_date_due, fields.Date.from_string("2021-04-02") + ) + invoice_form.invoice_payment_term_id = self.payment_term_10_days + self.assertEqual( + invoice_form.invoice_date_due, fields.Date.from_string("2021-04-02") + ) + # Set to 2021-04-01 + invoice_form = self._set_invoice_form(self.partner_1_child.id, "2021-04-01") + invoice_form.invoice_payment_term_id = self.payment_term_10_days + with invoice_form.invoice_line_ids.new() as line: + line.product_id = self.product + invoice = invoice_form.save() + self.assertEqual( + invoice.invoice_date_due, fields.Date.from_string("2021-04-11") + ) + + def test_invoice_payment_term_custom_partner_1_child(self): + invoice_form = self._set_invoice_form(self.partner_1_child.id, "2021-06-12") + invoice_form.invoice_payment_term_id = self.payment_term_with_holidays + self.assertEqual( + invoice_form.invoice_date_due, fields.Date.from_string("2021-07-08") + ) + invoice_form = self._set_invoice_form(self.partner_1_child.id, "2021-02-01") + invoice_form.invoice_payment_term_id = self.payment_term_immediate_custom + self.assertEqual( + invoice_form.invoice_date_due, fields.Date.from_string("2021-04-05") + ) + + def test_invoice_payment_term_partner_2(self): + invoice_form = self._set_invoice_form(self.partner_2.id, "2021-02-01") + invoice_form.invoice_payment_term_id = self.payment_term_immediate + self.assertEqual( + invoice_form.invoice_date_due, fields.Date.from_string("2021-02-01") + ) + invoice_form.invoice_payment_term_id = self.payment_term_10_days + with invoice_form.invoice_line_ids.new() as line: + line.product_id = self.product + invoice = invoice_form.save() + self.assertEqual( + invoice.invoice_date_due, fields.Date.from_string("2021-02-11") + ) + + def test_invoice_payment_term_custom_partner_2(self): + invoice_form = self._set_invoice_form(self.partner_2.id, "2021-06-12") + invoice_form.invoice_payment_term_id = self.payment_term_with_holidays + self.assertEqual( + invoice_form.invoice_date_due, fields.Date.from_string("2021-06-12") + ) + invoice_form = self._set_invoice_form(self.partner_2.id, "2021-06-14") + invoice_form.invoice_payment_term_id = self.payment_term_with_holidays + self.assertEqual( + invoice_form.invoice_date_due, fields.Date.from_string("2021-07-08") + ) + invoice_form = self._set_invoice_form(self.partner_2.id, "2021-02-01") + invoice_form.invoice_payment_term_id = self.payment_term_immediate_custom + self.assertEqual( + invoice_form.invoice_date_due, fields.Date.from_string("2021-02-05") + ) + + def test_partner_1_invoice_date_june_13(self): + invoice_form = self._set_invoice_form(self.partner_1.id, "2021-06-13") + invoice_form.invoice_payment_term_id = self.payment_term_immediate + self.assertEqual( + invoice_form.invoice_date_due, fields.Date.from_string("2021-06-14") + ) + + def test_partner_1_get_valid_due_date(self): + self.assertEqual( + self.partner_1._get_valid_due_date(fields.Date.from_string("2021-01-01")), + fields.Date.from_string("2021-01-01"), + ) + self.assertEqual( + self.partner_1._get_valid_due_date(fields.Date.from_string("2021-02-01")), + fields.Date.from_string("2021-04-02"), + ) + self.assertEqual( + self.partner_1._get_valid_due_date(fields.Date.from_string("2021-06-12")), + fields.Date.from_string("2021-06-14"), + ) + self.assertEqual( + self.partner_1._get_valid_due_date(fields.Date.from_string("2021-06-14")), + fields.Date.from_string("2021-06-14"), + ) diff --git a/account_payment_term_partner_holiday/views/res_partner_view.xml b/account_payment_term_partner_holiday/views/res_partner_view.xml new file mode 100644 index 000000000000..35bb35c6c656 --- /dev/null +++ b/account_payment_term_partner_holiday/views/res_partner_view.xml @@ -0,0 +1,23 @@ + + + + res.partner.holiday_ids + res.partner + + + + + + + + + + + + + + + diff --git a/setup/account_payment_term_partner_holiday/odoo/addons/account_payment_term_partner_holiday b/setup/account_payment_term_partner_holiday/odoo/addons/account_payment_term_partner_holiday new file mode 120000 index 000000000000..ce05c502d4cc --- /dev/null +++ b/setup/account_payment_term_partner_holiday/odoo/addons/account_payment_term_partner_holiday @@ -0,0 +1 @@ +../../../../account_payment_term_partner_holiday \ No newline at end of file diff --git a/setup/account_payment_term_partner_holiday/setup.py b/setup/account_payment_term_partner_holiday/setup.py new file mode 100644 index 000000000000..28c57bb64031 --- /dev/null +++ b/setup/account_payment_term_partner_holiday/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)