From f4cb05e2f9d33ac4015bd68a27efe7ba63fcaded Mon Sep 17 00:00:00 2001 From: Katherine Zaoral Date: Mon, 25 Jan 2021 21:19:22 +0000 Subject: [PATCH] [ADD] l10n_ar: generic changes to use in QR code AFIP give us new resolution 4291 that request to print QR code in printed version of electronic invoices. For that we: 1) update the xml report footer style 2) add generic method to sanitze the identification number we are sending, the sanitize method is added here in order to be re used for other functionalities across electronic invoice and reports. If we are not able to sanitize the number then we show an error to the user 3) update translations to add new raise message translated term NOTE: Fix pylint errors: This ones pop up when running this PR "Check Style' in runbot closes odoo/odoo#65034 Related: odoo/enterprise#15949 Signed-off-by: Josse Colpaert --- addons/l10n_ar/i18n/es.po | 21 ++++++++++++++++++++- addons/l10n_ar/i18n/l10n_ar.pot | 19 +++++++++++++++++++ addons/l10n_ar/models/res_partner.py | 15 ++++++++++++++- addons/l10n_ar/views/report_invoice.xml | 2 +- 4 files changed, 54 insertions(+), 3 deletions(-) diff --git a/addons/l10n_ar/i18n/es.po b/addons/l10n_ar/i18n/es.po index 3937b291645..7c7df44983b 100644 --- a/addons/l10n_ar/i18n/es.po +++ b/addons/l10n_ar/i18n/es.po @@ -197,16 +197,19 @@ msgid "AFIP Concept" msgstr "Concepto AFIP" #. module: l10n_ar +#: model:ir.model.fields,field_description:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_afip_pos_partner_id #: model:ir.model.fields,field_description:l10n_ar.field_account_journal__l10n_ar_afip_pos_partner_id msgid "AFIP POS Address" msgstr "Dirección PdV AFIP" #. module: l10n_ar +#: model:ir.model.fields,field_description:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_afip_pos_number #: model:ir.model.fields,field_description:l10n_ar.field_account_journal__l10n_ar_afip_pos_number msgid "AFIP POS Number" msgstr "Número PdV AFIP" #. module: l10n_ar +#: model:ir.model.fields,field_description:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_afip_pos_system #: model:ir.model.fields,field_description:l10n_ar.field_account_journal__l10n_ar_afip_pos_system msgid "AFIP POS System" msgstr "Sistema PdV AFIP" @@ -1083,6 +1086,12 @@ msgstr "Tipos de Responsabilidad" msgid "Sequence" msgstr "Secuencia" +#. module: l10n_ar +#: model:ir.model.fields,field_description:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_sequence_ids +#: model:ir.model.fields,field_description:l10n_ar.field_account_journal__l10n_ar_sequence_ids +msgid "Sequences" +msgstr "Secuencias" + #. module: l10n_ar #: model_terms:ir.ui.view,arch_db:l10n_ar.view_move_form msgid "Service Date" @@ -1206,12 +1215,14 @@ msgstr "" "Este campo es requerido para poder imprimir las facturas correctamente" #. module: l10n_ar +#: model:ir.model.fields,help:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_afip_pos_partner_id #: model:ir.model.fields,help:l10n_ar.field_account_journal__l10n_ar_afip_pos_partner_id msgid "This is the address used for invoice reports of this POS" msgstr "" "Esta dirección es la usada para los reportes de facturación de este PdV" #. module: l10n_ar +#: model:ir.model.fields,help:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_afip_pos_number #: model:ir.model.fields,help:l10n_ar.field_account_journal__l10n_ar_afip_pos_number msgid "" "This is the point of sale number assigned by AFIP in order to generate " @@ -1231,6 +1242,7 @@ msgid "Type of gross income: exempt, local, multilateral" msgstr "Tipo de ingreso bruto: exento, local, multilateral" #. module: l10n_ar +#: model:ir.model.fields,field_description:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_share_sequences #: model:ir.model.fields,field_description:l10n_ar.field_account_journal__l10n_ar_share_sequences msgid "Unified Book" msgstr "Libro Unificado" @@ -1253,7 +1265,7 @@ msgstr "Libro Unificado" #: model:product.template,uom_name:l10n_ar.product_product_tasa_estadistica_product_template #: model:product.template,uom_name:l10n_ar.product_product_telefonia_product_template msgid "Units" -msgstr "" +msgstr "Unidades" #. module: l10n_ar #: model:ir.model.fields.selection,name:l10n_ar.selection__account_tax_group__l10n_ar_vat_afip_code__1 @@ -1272,6 +1284,7 @@ msgid "UpApP" msgstr "" #. module: l10n_ar +#: model:ir.model.fields,help:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_share_sequences #: model:ir.model.fields,help:l10n_ar.field_account_journal__l10n_ar_share_sequences msgid "Use same sequence for documents with the same letter" msgstr "Usar la misma secuencia para documentos con misma letra" @@ -1343,6 +1356,12 @@ msgstr "IVA No Gravado" msgid "Warning" msgstr "Alerta" +#. module: l10n_ar +#: code:addons/l10n_ar/models/res_partner.py:0 +#, python-format +msgid "We were not able to sanitize the identification number" +msgstr "No pudimos limpiar el número de identificación" + #. module: l10n_ar #: model_terms:ir.ui.view,arch_db:l10n_ar.view_account_invoice_report_search_inherit msgid "With Document" diff --git a/addons/l10n_ar/i18n/l10n_ar.pot b/addons/l10n_ar/i18n/l10n_ar.pot index f794d684629..ddd7125dd40 100644 --- a/addons/l10n_ar/i18n/l10n_ar.pot +++ b/addons/l10n_ar/i18n/l10n_ar.pot @@ -193,16 +193,19 @@ msgid "AFIP Concept" msgstr "" #. module: l10n_ar +#: model:ir.model.fields,field_description:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_afip_pos_partner_id #: model:ir.model.fields,field_description:l10n_ar.field_account_journal__l10n_ar_afip_pos_partner_id msgid "AFIP POS Address" msgstr "" #. module: l10n_ar +#: model:ir.model.fields,field_description:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_afip_pos_number #: model:ir.model.fields,field_description:l10n_ar.field_account_journal__l10n_ar_afip_pos_number msgid "AFIP POS Number" msgstr "" #. module: l10n_ar +#: model:ir.model.fields,field_description:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_afip_pos_system #: model:ir.model.fields,field_description:l10n_ar.field_account_journal__l10n_ar_afip_pos_system msgid "AFIP POS System" msgstr "" @@ -1046,6 +1049,12 @@ msgstr "" msgid "Sequence" msgstr "" +#. module: l10n_ar +#: model:ir.model.fields,field_description:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_sequence_ids +#: model:ir.model.fields,field_description:l10n_ar.field_account_journal__l10n_ar_sequence_ids +msgid "Sequences" +msgstr "" + #. module: l10n_ar #: model_terms:ir.ui.view,arch_db:l10n_ar.view_move_form msgid "Service Date" @@ -1156,11 +1165,13 @@ msgid "This field is required in order to print the invoice report properly" msgstr "" #. module: l10n_ar +#: model:ir.model.fields,help:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_afip_pos_partner_id #: model:ir.model.fields,help:l10n_ar.field_account_journal__l10n_ar_afip_pos_partner_id msgid "This is the address used for invoice reports of this POS" msgstr "" #. module: l10n_ar +#: model:ir.model.fields,help:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_afip_pos_number #: model:ir.model.fields,help:l10n_ar.field_account_journal__l10n_ar_afip_pos_number msgid "" "This is the point of sale number assigned by AFIP in order to generate " @@ -1179,6 +1190,7 @@ msgid "Type of gross income: exempt, local, multilateral" msgstr "" #. module: l10n_ar +#: model:ir.model.fields,field_description:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_share_sequences #: model:ir.model.fields,field_description:l10n_ar.field_account_journal__l10n_ar_share_sequences msgid "Unified Book" msgstr "" @@ -1220,6 +1232,7 @@ msgid "UpApP" msgstr "" #. module: l10n_ar +#: model:ir.model.fields,help:l10n_ar.field_account_bank_statement_import_journal_creation__l10n_ar_share_sequences #: model:ir.model.fields,help:l10n_ar.field_account_journal__l10n_ar_share_sequences msgid "Use same sequence for documents with the same letter" msgstr "" @@ -1291,6 +1304,12 @@ msgstr "" msgid "Warning" msgstr "" +#. module: l10n_ar +#: code:addons/l10n_ar/models/res_partner.py:0 +#, python-format +msgid "We were not able to sanitize the identification number" +msgstr "" + #. module: l10n_ar #: model_terms:ir.ui.view,arch_db:l10n_ar.view_account_invoice_report_search_inherit msgid "With Document" diff --git a/addons/l10n_ar/models/res_partner.py b/addons/l10n_ar/models/res_partner.py index 134b33b1372..ce2b3a0593b 100644 --- a/addons/l10n_ar/models/res_partner.py +++ b/addons/l10n_ar/models/res_partner.py @@ -2,6 +2,7 @@ from odoo import fields, models, api, _ from odoo.exceptions import UserError, ValidationError import stdnum.ar +import re import logging _logger = logging.getLogger(__name__) @@ -103,10 +104,22 @@ class ResPartner(models.Model): try: module.validate(rec.vat) except module.InvalidChecksum: - raise ValidationError(_('The validation digit is not valid for "%s"', rec.l10n_latam_identification_type_id.name)) + raise ValidationError(_('The validation digit is not valid for "%s"', + rec.l10n_latam_identification_type_id.name)) except module.InvalidLength: raise ValidationError(_('Invalid length for "%s"', rec.l10n_latam_identification_type_id.name)) except module.InvalidFormat: raise ValidationError(_('Only numbers allowed for "%s"', rec.l10n_latam_identification_type_id.name)) except Exception as error: raise ValidationError(repr(error)) + + @api.model + def _get_id_number_sanitize(self): + """ Sanitize the identification number. Return the digits/integer value of the identification number """ + if self.l10n_latam_identification_type_id.l10n_ar_afip_code in ['80', '86']: + # Compact is the number clean up, remove all separators leave only digits + res = int(stdnum.ar.cuit.compact(self.vat)) + else: + id_number = re.sub('[^0-9]', '', self.vat) + res = int(id_number) + return res diff --git a/addons/l10n_ar/views/report_invoice.xml b/addons/l10n_ar/views/report_invoice.xml index d509aad9cc5..4c650039d8c 100644 --- a/addons/l10n_ar/views/report_invoice.xml +++ b/addons/l10n_ar/views/report_invoice.xml @@ -87,7 +87,7 @@
-
+