diff --git a/pms/__manifest__.py b/pms/__manifest__.py index f3fc20589..4cad20899 100644 --- a/pms/__manifest__.py +++ b/pms/__manifest__.py @@ -89,7 +89,6 @@ "views/precheckin_portal_templates.xml", "wizards/wizard_massive_changes.xml", "wizards/wizard_advanced_filters.xml", - "views/res_partner_id_category.xml", "views/payment_transaction_views.xml", "views/account_move_line_views.xml", ], diff --git a/pms/i18n/es.po b/pms/i18n/es.po index 30f94d549..39f4c8a4d 100644 --- a/pms/i18n/es.po +++ b/pms/i18n/es.po @@ -3925,16 +3925,6 @@ msgstr "Documento" msgid "Document Number" msgstr "Nº de documento" -#. module: pms -#: model:ir.model.fields,field_description:pms.field_pms_checkin_partner__document_type -#: model:ir.model.fields,field_description:pms.field_pms_folio__document_type -#: model:ir.model.fields,field_description:pms.field_pms_property__vat_document_type -#: model:ir.model.fields,field_description:pms.field_pms_reservation__document_type -#: model:ir.model.fields,field_description:pms.field_res_partner__vat_document_type -#: model:ir.model.fields,field_description:pms.field_res_users__vat_document_type -msgid "Document Type" -msgstr "Tipo de documento" - #. module: pms #: model_terms:ir.ui.view,arch_db:pms.traveller_report msgid "Document number" @@ -10724,15 +10714,6 @@ msgstr "Usuario que creo la ficha" msgid "The value of the down payment amount must be positive." msgstr "El valor del pago inicial debe ser positivo." -#. module: pms -#: model:ir.model.fields,help:pms.field_pms_property__vat_document_type -#: model:ir.model.fields,help:pms.field_res_partner__vat_document_type -#: model:ir.model.fields,help:pms.field_res_users__vat_document_type -msgid "" -"The vat document type of the partner,\n" -" set if is a fiscal document, passport, etc..." -msgstr "" - #. module: pms #: model_terms:ir.ui.view,arch_db:pms.portal_my_folio msgid "There are currently no folios for your account." diff --git a/pms/i18n/pms.pot b/pms/i18n/pms.pot index 93c4848cb..5bb0b9f01 100644 --- a/pms/i18n/pms.pot +++ b/pms/i18n/pms.pot @@ -3603,16 +3603,6 @@ msgstr "" msgid "Document Number" msgstr "" -#. module: pms -#: model:ir.model.fields,field_description:pms.field_pms_checkin_partner__document_type -#: model:ir.model.fields,field_description:pms.field_pms_folio__document_type -#: model:ir.model.fields,field_description:pms.field_pms_property__vat_document_type -#: model:ir.model.fields,field_description:pms.field_pms_reservation__document_type -#: model:ir.model.fields,field_description:pms.field_res_partner__vat_document_type -#: model:ir.model.fields,field_description:pms.field_res_users__vat_document_type -msgid "Document Type" -msgstr "" - #. module: pms #: model_terms:ir.ui.view,arch_db:pms.traveller_report msgid "Document number" @@ -10413,15 +10403,6 @@ msgstr "" msgid "The value of the down payment amount must be positive." msgstr "" -#. module: pms -#: model:ir.model.fields,help:pms.field_pms_property__vat_document_type -#: model:ir.model.fields,help:pms.field_res_partner__vat_document_type -#: model:ir.model.fields,help:pms.field_res_users__vat_document_type -msgid "" -"The vat document type of the partner,\n" -" set if is a fiscal document, passport, etc..." -msgstr "" - #. module: pms #: model_terms:ir.ui.view,arch_db:pms.portal_my_folio msgid "There are currently no folios for your account." diff --git a/pms/models/__init__.py b/pms/models/__init__.py index 5f818c0e6..74020230c 100644 --- a/pms/models/__init__.py +++ b/pms/models/__init__.py @@ -46,6 +46,5 @@ from . import pms_availability from . import res_partner_id_number from . import pms_automated_mails from . import payment_transaction -from . import res_partner_id_category from . import pms_team_member from . import ir_pms_property diff --git a/pms/models/res_partner.py b/pms/models/res_partner.py index 1f1ba3d97..c120544e5 100644 --- a/pms/models/res_partner.py +++ b/pms/models/res_partner.py @@ -124,11 +124,6 @@ class ResPartner(models.Model): store=True, compute="_compute_lastname2", ) - vat = fields.Char( - readonly=False, - store=True, - compute="_compute_vat", - ) country_id = fields.Many2one( readonly=False, store=True, @@ -192,14 +187,6 @@ class ResPartner(models.Model): string="Days from Checkout", help="Days from Checkout to generate the invoice", ) - vat_document_type = fields.Selection( - string="Document Type", - help="""The vat document type of the partner, - set if is a fiscal document, passport, etc...""", - selection=lambda self: self._selection_vat_document_type(), - compute="_compute_vat_document_type", - store=True, - ) residence_street = fields.Char( string="Street of residence", help="Street of the guest's residence", @@ -246,20 +233,6 @@ class ResPartner(models.Model): comodel_name="res.country.state", ) - @api.model - def _selection_vat_document_type(self): - vat_document_types = [ - ("vat", _("VAT")), - ] - document_categories = self.env["res.partner.id_category"].search( - [ - ("is_vat_equivalent", "=", False), - ] - ) - for doc_type in document_categories: - vat_document_types.append((doc_type.name, doc_type.name)) - return vat_document_types - @api.depends("pms_checkin_partner_ids", "pms_checkin_partner_ids.gender") def _compute_gender(self): if hasattr(super(), "_compute_gender"): @@ -578,17 +551,6 @@ class ResPartner(models.Model): elif not record.lastname2: record.lastname2 = False - @api.depends("id_numbers", "id_numbers.name") - def _compute_vat(self): - if hasattr(super(), "_compute_vat"): - super()._compute_vat() - for record in self: - if not record.vat and record.id_numbers: - vat = list(filter(None, set(record.id_numbers.mapped("name")))) - record.vat = vat[0] - elif not record.vat: - record.vat = False - @api.depends("residence_country_id") def _compute_country_id(self): if hasattr(super(), "_compute_country_id"): @@ -678,27 +640,6 @@ class ResPartner(models.Model): ] ) - @api.depends( - "vat", "id_numbers", "id_numbers.category_id", "id_numbers.vat_syncronized" - ) - def _compute_vat_document_type(self): - self.vat_document_type = False - for record in self.filtered("vat"): - document = record.id_numbers.filtered("vat_syncronized") - if document: - if len(document) > 1: - raise ValidationError( - _("There is more than one document with vat syncronized") - ) - if record.vat: - record.vat_document_type = ( - document.category_id.name - if not document.category_id.is_vat_equivalent - else "vat" - ) - else: - record.vat_document_type = "vat" - def action_partner_reservations(self): self.ensure_one() checkin_reservation_ids = ( @@ -853,21 +794,8 @@ class ResPartner(models.Model): def _check_enought_invoice_data(self): self.ensure_one() - if self.vat and self.country_id and self.city and self.street: - return True - return False - - @api.constrains("vat_document_type") - def check_vat(self): - """ - Inherit constrain to allow set vat in - document ids like passport, etc... - """ - for partner in self: - if not partner.vat_document_type or partner.vat_document_type != "vat": - continue - elif hasattr(super(), "check_vat"): - super(ResPartner, partner).check_vat() + # Template to be inherited by localization modules + return True def unlink(self): dummy, various_partner_id = self.env["ir.model.data"].get_object_reference( diff --git a/pms/models/res_partner_id_category.py b/pms/models/res_partner_id_category.py deleted file mode 100644 index c54ea9488..000000000 --- a/pms/models/res_partner_id_category.py +++ /dev/null @@ -1,11 +0,0 @@ -from odoo import fields, models - - -class ResPartnerIdCategory(models.Model): - _inherit = "res.partner.id_category" - - is_vat_equivalent = fields.Boolean( - string="Is VAT Equivalent", - help="If true, this document type is check by vat number", - default=False, - ) diff --git a/pms/views/res_partner_views.xml b/pms/views/res_partner_views.xml index 4fd60e24d..9103d6c85 100644 --- a/pms/views/res_partner_views.xml +++ b/pms/views/res_partner_views.xml @@ -65,12 +65,6 @@ - - - DNI D - True letters = { 0: "T", diff --git a/pms_l10n_es/models/pms_checkin_partner.py b/pms_l10n_es/models/pms_checkin_partner.py index 394f87ce5..7086da9cf 100644 --- a/pms_l10n_es/models/pms_checkin_partner.py +++ b/pms_l10n_es/models/pms_checkin_partner.py @@ -49,7 +49,13 @@ class PmsCheckinParnert(models.Model): ] ) if depends or (country and country.code == CODE_SPAIN): - mandatory_fields.append("residence_state_id") + mandatory_fields.extend( + [ + "residence_state_id", + "residence_street", + "residence_city", + ] + ) return mandatory_fields @api.model diff --git a/pms_l10n_es/models/res_partner.py b/pms_l10n_es/models/res_partner.py index 513812659..fd88333a3 100644 --- a/pms_l10n_es/models/res_partner.py +++ b/pms_l10n_es/models/res_partner.py @@ -1,6 +1,9 @@ import logging -from odoo import api, fields, models +from odoo import _, api, fields, models +from odoo.exceptions import UserError + +from odoo.addons.base_vat.models.res_partner import _eu_country_vat CODE_SPAIN = "ES" @@ -34,6 +37,71 @@ class ResPartner(models.Model): if not res: return res if self.country_id.code == "ES": - if not self.state_id and not self.zip: + if ( + not self.vat + or not self.country_id + or not self.city + or not (self.street and self.street2) + ): return False return True + + def write(self, vals): + res = super(ResPartner, self).write(vals) + # REVIEW: Force Contrain vat + # https://github.com/odoo/odoo/issues/23242 + if vals.get("vat") or vals.get("country_id"): + self.check_vat() + self._pms_check_unique_vat() + return res + + @api.model + def create(self, vals): + records = super(ResPartner, self).create(vals) + # REVIEW: Force Contrain vat + # https://github.com/odoo/odoo/issues/23242 + if vals.get("vat") or vals.get("country_id"): + records.check_vat() + records._pms_check_unique_vat() + return records + + # This function is a candidate to be moved to the module + # partner_vat_unique + def _pms_check_unique_vat(self): + Partner = self.with_context(active_test=False).sudo() + europe = self.env.ref("base.europe") + if not europe: + europe = self.env["res.country.group"].search( + [("name", "=", "Europe")], limit=1 + ) + for partner in self.filtered(lambda p: p.vat and p.country_id): + partner_country_code = partner.commercial_partner_id.country_id.code + vat_country, vat_number = self._split_vat(partner.vat) + if europe and partner.country_id.id in europe.country_ids.ids: + vat_country = _eu_country_vat.get(vat_country, vat_country).upper() + vat_with_code = ( + partner.vat + if partner_country_code.lower() == vat_country + else partner_country_code.upper() + partner.vat + ) + vat_without_code = ( + partner.vat + if partner_country_code.lower() != vat_country + else vat_country + ) + domain = [ + ("company_id", "in", [False, partner.company_id.id]), + "|", + ("vat", "=", vat_with_code), + ("vat", "=", vat_without_code), + ] + domain += [("id", "!=", partner.id), "!", ("id", "child_of", partner.id)] + repeat_partner = Partner.search(domain, limit=1) + if bool(partner.vat) and not partner.parent_id and repeat_partner: + raise UserError( + _("The VAT number %s already exists in other contacts: %s") + % ( + vat_without_code, + repeat_partner.name, + ) + ) diff --git a/pms_l10n_es_SII/README.rst b/pms_l10n_es_SII/README.rst new file mode 100644 index 000000000..7c8d78033 --- /dev/null +++ b/pms_l10n_es_SII/README.rst @@ -0,0 +1,81 @@ +============================== +Payment Acquirer Multiproperty +============================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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%2Fpms-lightgray.png?logo=github + :target: https://github.com/OCA/pms/tree/14.0/payment_acquirer_multi_pms_properties + :alt: OCA/pms +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/pms-14-0/pms-14-0-payment_acquirer_multi_pms_properties + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/293/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Set the pms property in the payment acquirer to filter on website payments + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +Sets one or more properties in the payment acquirer so that payment method is only available for documents of those properties. +If you leave it blank, it will be available to everyone. + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Commit [Sun] + +Contributors +~~~~~~~~~~~~ + +* `Commit [Sun] `: + + * Dario Lodeiros + +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. + +This module is part of the `OCA/pms `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/pms_l10n_es_SII/__init__.py b/pms_l10n_es_SII/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/pms_l10n_es_SII/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/pms_l10n_es_SII/__manifest__.py b/pms_l10n_es_SII/__manifest__.py new file mode 100644 index 000000000..a5ec4c2f2 --- /dev/null +++ b/pms_l10n_es_SII/__manifest__.py @@ -0,0 +1,17 @@ +# Copyright 2009-2020 Noviat. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "PMS AEAT SII Integration", + "author": "Commit [Sun], Odoo Community Association (OCA)", + "website": "https://github.com/OCA/pms", + "category": "Generic Modules/Property Management System", + "version": "14.0.1.0.2", + "license": "AGPL-3", + "depends": [ + "pms", + "l10n_es_aeat_sii_oca", + ], + "data": ["data/pms_data.xml", "views/res_partner_id_category.xml"], + "installable": True, +} diff --git a/pms_l10n_es_SII/data/pms_data.xml b/pms_l10n_es_SII/data/pms_data.xml new file mode 100644 index 000000000..7d567f9f0 --- /dev/null +++ b/pms_l10n_es_SII/data/pms_data.xml @@ -0,0 +1,37 @@ + + + + + + True + + + + 02 + + + 05 + + + 05 + + + 03 + + + 06 + + + 06 + + + diff --git a/pms_l10n_es_SII/models/__init__.py b/pms_l10n_es_SII/models/__init__.py new file mode 100644 index 000000000..0fc6ce7a6 --- /dev/null +++ b/pms_l10n_es_SII/models/__init__.py @@ -0,0 +1,2 @@ +from . import res_partner_id_category +from . import res_partner diff --git a/pms_l10n_es_SII/models/res_partner.py b/pms_l10n_es_SII/models/res_partner.py new file mode 100644 index 000000000..13d62208b --- /dev/null +++ b/pms_l10n_es_SII/models/res_partner.py @@ -0,0 +1,69 @@ +from odoo import api, fields, models + + +class ResPartner(models.Model): + _inherit = "res.partner" + + vat = fields.Char( + readonly=False, + store=True, + compute="_compute_vat", + ) + aeat_identification_type = fields.Selection( + readonly=False, + store=True, + compute="_compute_aeat_identification_type", + ) + aeat_identification = fields.Char( + readonly=False, + store=True, + compute="_compute_aeat_identification", + ) + + @api.depends( + "id_numbers", + "id_numbers.category_id", + "id_numbers.category_id.aeat_identification_type", + ) + def _compute_aeat_identification_type(self): + if hasattr(super(), "_compute_aeat_identification_type"): + super()._compute_aeat_identification_type() + for record in self: + # Passport ("03"), Residential cert. ("04") and Another document ("05") + # are setted in aeat identificacion type. + # NIF/VAT ("02") are setted in partner vat field compute + document = record.id_numbers.filtered( + lambda i: i.category_id.aeat_identification_type in ["03", "05", "06"] + ) + if document and not record.vat: + record.aeat_identification_type = document[ + 0 + ].category_id.aeat_identification_type + elif not record.aeat_identification_type or record.vat: + record.aeat_identification_type = False + + @api.depends("id_numbers", "id_numbers.name") + def _compute_aeat_identification(self): + if hasattr(super(), "_compute_aeat_identification"): + super()._compute_aeat_identification() + for record in self: + document = record.id_numbers.filtered( + lambda i: i.category_id.aeat_identification_type in ["03", "05", "06"] + ) + if document: + record.aeat_identification = document[0].name + elif not record.aeat_identification: + record.aeat_identification = False + + @api.depends("id_numbers", "id_numbers.name") + def _compute_vat(self): + if hasattr(super(), "_compute_vat"): + super()._compute_vat() + for record in self: + vat = record.id_numbers.filtered( + lambda i: i.category_id.aeat_identification_type == "02" + ) + if vat: + record.vat = vat[0].name + elif not record.vat: + record.vat = False diff --git a/pms_l10n_es_SII/models/res_partner_id_category.py b/pms_l10n_es_SII/models/res_partner_id_category.py new file mode 100644 index 000000000..5e062de05 --- /dev/null +++ b/pms_l10n_es_SII/models/res_partner_id_category.py @@ -0,0 +1,26 @@ +from odoo import fields, models + + +class ResPartnerIdCategory(models.Model): + _inherit = "res.partner.id_category" + + aeat_identification_type = fields.Selection( + string="AEAT Identification type equivalent", + help=( + "Used to specify an identification type to send to SII. Normally for " + "sending national and export invoices to SII where the customer country " + "is not Spain, it would calculate an identification type of 04 if the VAT " + "field is filled and 06 if it was not. This field is to specify " + "types of 03 through 05, in the event that the customer doesn't identify " + "with a foreign VAT and instead with their passport " + "or residential certificate. If there is no value it will work as before." + ), + selection=[ + ("02", "NIF - VAT"), + ("03", "Passport"), + ("04", "Official document from the original country"), + ("05", "Residential certificate"), + ("06", "Another document"), + ("07", "Not registered on census"), + ], + ) diff --git a/pms_l10n_es_SII/readme/CONTRIBUTORS.rst b/pms_l10n_es_SII/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..f94c25c48 --- /dev/null +++ b/pms_l10n_es_SII/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Commit [Sun] `: + + * Dario Lodeiros diff --git a/pms_l10n_es_SII/readme/DESCRIPTION.rst b/pms_l10n_es_SII/readme/DESCRIPTION.rst new file mode 100644 index 000000000..1f50e77a1 --- /dev/null +++ b/pms_l10n_es_SII/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +Set automatically SII fields from Checkin document Partners diff --git a/pms_l10n_es_SII/readme/USAGE.rst b/pms_l10n_es_SII/readme/USAGE.rst new file mode 100644 index 000000000..f529c8da2 --- /dev/null +++ b/pms_l10n_es_SII/readme/USAGE.rst @@ -0,0 +1,2 @@ +When you create a new checkin document, this is copied to aeat identification type +Set the various client like a anonimous AEAT diff --git a/pms_l10n_es_SII/static/description/icon.png b/pms_l10n_es_SII/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/pms_l10n_es_SII/static/description/icon.png differ diff --git a/pms_l10n_es_SII/static/description/index.html b/pms_l10n_es_SII/static/description/index.html new file mode 100644 index 000000000..fa8c42020 --- /dev/null +++ b/pms_l10n_es_SII/static/description/index.html @@ -0,0 +1,428 @@ + + + + + + +Payment Acquirer Multiproperty + + + +
+

Payment Acquirer Multiproperty

+ + +

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

+

Set the pms property in the payment acquirer to filter on website payments

+

Table of contents

+ +
+

Usage

+

Sets one or more properties in the payment acquirer so that payment method is only available for documents of those properties. +If you leave it blank, it will be available to everyone.

+
+
+

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.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Commit [Sun]
    • +
+
+
+

Contributors

+
    +
  • Commit [Sun] <https://www.commitsun.com>:
      +
    • Dario Lodeiros
      • +
    +
    • +
+
+
+

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.

+

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

+

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

+
+
+
+ + diff --git a/pms/views/res_partner_id_category.xml b/pms_l10n_es_SII/views/res_partner_id_category.xml similarity index 89% rename from pms/views/res_partner_id_category.xml rename to pms_l10n_es_SII/views/res_partner_id_category.xml index f5ae2792f..8a8ca1e8c 100644 --- a/pms/views/res_partner_id_category.xml +++ b/pms_l10n_es_SII/views/res_partner_id_category.xml @@ -8,7 +8,7 @@ /> - + diff --git a/setup/pms_l10n_es_SII/odoo/addons/pms_l10n_es_SII b/setup/pms_l10n_es_SII/odoo/addons/pms_l10n_es_SII new file mode 120000 index 000000000..3a392a36a --- /dev/null +++ b/setup/pms_l10n_es_SII/odoo/addons/pms_l10n_es_SII @@ -0,0 +1 @@ +../../../../pms_l10n_es_SII \ No newline at end of file diff --git a/setup/pms_l10n_es_SII/setup.py b/setup/pms_l10n_es_SII/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/pms_l10n_es_SII/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)