From 69bb037dcd01efce129ef519fbe9326f1b0fd9a0 Mon Sep 17 00:00:00 2001 From: Luc De Meyer Date: Sun, 26 Dec 2021 20:55:48 +0100 Subject: [PATCH] [14.0][FIX]intrastat_product_declaration - fix amount by removing legacy currency conversion [UPD] Update intrastat_product.pot [UPD] README.rst intrastat_product 14.0.1.5.0 Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: intrastat-extrastat-14.0/intrastat-extrastat-14.0-intrastat_product Translate-URL: https://translation.odoo-community.org/projects/intrastat-extrastat-14-0/intrastat-extrastat-14-0-intrastat_product/ --- intrastat_product/README.rst | 2 + intrastat_product/__manifest__.py | 2 +- intrastat_product/i18n/fr.po | 50 ++++++++++++++++--- intrastat_product/i18n/intrastat_product.pot | 42 +++++++++++++--- .../models/intrastat_product_declaration.py | 10 ---- .../static/description/index.html | 3 ++ 6 files changed, 85 insertions(+), 24 deletions(-) diff --git a/intrastat_product/README.rst b/intrastat_product/README.rst index 99de851..ba983e7 100644 --- a/intrastat_product/README.rst +++ b/intrastat_product/README.rst @@ -131,6 +131,7 @@ Credits Authors ~~~~~~~ +* ACSONE SA/NV * brain-tec AG * Akretion * Noviat @@ -140,6 +141,7 @@ Contributors * Alexis de Lattre, Akretion * Luc De Meyer, Noviat +* Denis Roussel * Tecnativa : * João Marques diff --git a/intrastat_product/__manifest__.py b/intrastat_product/__manifest__.py index 6c6aee9..deb8484 100644 --- a/intrastat_product/__manifest__.py +++ b/intrastat_product/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Intrastat Product", - "version": "14.0.1.4.1", + "version": "14.0.1.5.0", "category": "Intrastat", "license": "AGPL-3", "summary": "Base module for Intrastat Product", diff --git a/intrastat_product/i18n/fr.po b/intrastat_product/i18n/fr.po index d6d6d5e..dbc7d74 100644 --- a/intrastat_product/i18n/fr.po +++ b/intrastat_product/i18n/fr.po @@ -224,6 +224,12 @@ msgstr "Remettre en brouillon" msgid "Before going back to draft, you must delete the XML export." msgstr "" +#. module: intrastat_product +#: code:addons/intrastat_product/models/intrastat_product_declaration.py:0 +#, python-format +msgid "Cannot delete the declaration %s because it is in Done state." +msgstr "" + #. module: intrastat_product #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region__code #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction__code @@ -357,6 +363,7 @@ msgstr "Pays d'origine de l'article i.e. article 'made in ____'." #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__create_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line__create_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region__create_uid +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view__create_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction__create_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode__create_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit__create_uid @@ -369,6 +376,7 @@ msgstr "Créé par" #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__create_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line__create_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region__create_date +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view__create_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction__create_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode__create_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit__create_date @@ -493,6 +501,7 @@ msgstr "Expéditions" #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__display_name #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line__display_name #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region__display_name +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view__display_name #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction__display_name #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode__display_name #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit__display_name @@ -626,6 +635,7 @@ msgstr "Codes S.H." #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__id #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line__id #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region__id +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view__id #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction__id #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode__id #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit__id @@ -777,6 +787,11 @@ msgstr "Région pour la DEB" msgid "Intrastat Regions" msgstr "Régions pour la DEB" +#. module: intrastat_product +#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_result_view_form +msgid "Intrastat Result View" +msgstr "" + #. module: intrastat_product #: model:ir.model.fields,field_description:intrastat_product.field_hs_code__intrastat_unit_id #: model:ir.model.fields,help:intrastat_product.field_intrastat_product_computation_line__intrastat_unit_id @@ -857,8 +872,8 @@ msgstr "Transactions pour la DEB" #. module: intrastat_product #: code:addons/intrastat_product/models/intrastat_product_declaration.py:0 #, python-format -msgid "Invalid Year !" -msgstr "Année invalide !" +msgid "Invalid Year!" +msgstr "" #. module: intrastat_product #: model:ir.model,name:intrastat_product.model_stock_location @@ -920,6 +935,7 @@ msgstr "Kg" #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration____last_update #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line____last_update #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region____last_update +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view____last_update #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction____last_update #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode____last_update #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit____last_update @@ -938,6 +954,7 @@ msgstr "Dernière Modification le" #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__write_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line__write_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region__write_uid +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view__write_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction__write_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode__write_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit__write_uid @@ -950,6 +967,7 @@ msgstr "Dernière modification par" #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__write_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line__write_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region__write_date +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view__write_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction__write_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode__write_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit__write_date @@ -1072,6 +1090,7 @@ msgstr "Aucun enregistrement trouvé pour la période sélectionnée !" #. module: intrastat_product #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__note +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view__note #: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_form msgid "Notes" msgstr "Notes" @@ -1106,6 +1125,11 @@ msgstr "" msgid "Number of unread messages" msgstr "Nombre de messages non plus" +#. module: intrastat_product +#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_result_view_form +msgid "Ok" +msgstr "" + #. module: intrastat_product #: code:addons/intrastat_product/models/intrastat_product_declaration.py:0 #, python-format @@ -1193,6 +1217,11 @@ msgstr "" msgid "Period" msgstr "Période" +#. module: intrastat_product +#: model:ir.model,name:intrastat_product.model_intrastat_result_view +msgid "Pop-up to show errors on intrastat report generation" +msgstr "" + #. module: intrastat_product #: model:intrastat.transport_mode,name:intrastat_product.intrastat_transport_5 msgid "Post" @@ -1403,6 +1432,12 @@ msgstr "L'action de la déclaration a été mise à 'néant'." msgid "The VAT number '%s' is invalid." msgstr "" +#. module: intrastat_product +#: code:addons/intrastat_product/models/intrastat_product_declaration.py:0 +#, python-format +msgid "The VAT number is not set for the partner '%s'." +msgstr "" + #. module: intrastat_product #: code:addons/intrastat_product/models/intrastat_product_declaration.py:0 #, python-format @@ -1532,11 +1567,6 @@ msgstr "" msgid "Unread Messages Counter" msgstr "Pays pour la DEB" -#. module: intrastat_product -#: model:ir.model.fields,help:intrastat_product.field_intrastat_product_declaration__company_country_code -msgid "Used in views and methods of localization modules." -msgstr "Used in views and methods of localization modules." - #. module: intrastat_product #: model:ir.model.fields,help:intrastat_product.field_intrastat_product_declaration__revision msgid "Used to keep track of changes" @@ -1635,6 +1665,12 @@ msgstr "Vous devez configurer le pays de la société !" msgid "for period %s" msgstr "" +#~ msgid "Invalid Year !" +#~ msgstr "Année invalide !" + +#~ msgid "Used in views and methods of localization modules." +#~ msgstr "Used in views and methods of localization modules." + #, fuzzy #~ msgid "Company Country code" #~ msgstr "Code pays de la société" diff --git a/intrastat_product/i18n/intrastat_product.pot b/intrastat_product/i18n/intrastat_product.pot index 9a9e01f..31ec071 100644 --- a/intrastat_product/i18n/intrastat_product.pot +++ b/intrastat_product/i18n/intrastat_product.pot @@ -209,6 +209,12 @@ msgstr "" msgid "Before going back to draft, you must delete the XML export." msgstr "" +#. module: intrastat_product +#: code:addons/intrastat_product/models/intrastat_product_declaration.py:0 +#, python-format +msgid "Cannot delete the declaration %s because it is in Done state." +msgstr "" + #. module: intrastat_product #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region__code #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction__code @@ -338,6 +344,7 @@ msgstr "" #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__create_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line__create_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region__create_uid +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view__create_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction__create_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode__create_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit__create_uid @@ -350,6 +357,7 @@ msgstr "" #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__create_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line__create_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region__create_date +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view__create_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction__create_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode__create_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit__create_date @@ -473,6 +481,7 @@ msgstr "" #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__display_name #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line__display_name #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region__display_name +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view__display_name #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction__display_name #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode__display_name #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit__display_name @@ -606,6 +615,7 @@ msgstr "" #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__id #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line__id #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region__id +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view__id #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction__id #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode__id #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit__id @@ -757,6 +767,11 @@ msgstr "" msgid "Intrastat Regions" msgstr "" +#. module: intrastat_product +#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_result_view_form +msgid "Intrastat Result View" +msgstr "" + #. module: intrastat_product #: model:ir.model.fields,field_description:intrastat_product.field_hs_code__intrastat_unit_id #: model:ir.model.fields,help:intrastat_product.field_intrastat_product_computation_line__intrastat_unit_id @@ -836,7 +851,7 @@ msgstr "" #. module: intrastat_product #: code:addons/intrastat_product/models/intrastat_product_declaration.py:0 #, python-format -msgid "Invalid Year !" +msgid "Invalid Year!" msgstr "" #. module: intrastat_product @@ -899,6 +914,7 @@ msgstr "" #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration____last_update #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line____last_update #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region____last_update +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view____last_update #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction____last_update #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode____last_update #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit____last_update @@ -917,6 +933,7 @@ msgstr "" #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__write_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line__write_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region__write_uid +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view__write_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction__write_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode__write_uid #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit__write_uid @@ -929,6 +946,7 @@ msgstr "" #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__write_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration_line__write_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_region__write_date +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view__write_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transaction__write_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_transport_mode__write_date #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_unit__write_date @@ -1051,6 +1069,7 @@ msgstr "" #. module: intrastat_product #: model:ir.model.fields,field_description:intrastat_product.field_intrastat_product_declaration__note +#: model:ir.model.fields,field_description:intrastat_product.field_intrastat_result_view__note #: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_product_declaration_view_form msgid "Notes" msgstr "" @@ -1085,6 +1104,11 @@ msgstr "" msgid "Number of unread messages" msgstr "" +#. module: intrastat_product +#: model_terms:ir.ui.view,arch_db:intrastat_product.intrastat_result_view_form +msgid "Ok" +msgstr "" + #. module: intrastat_product #: code:addons/intrastat_product/models/intrastat_product_declaration.py:0 #, python-format @@ -1167,6 +1191,11 @@ msgstr "" msgid "Period" msgstr "" +#. module: intrastat_product +#: model:ir.model,name:intrastat_product.model_intrastat_result_view +msgid "Pop-up to show errors on intrastat report generation" +msgstr "" + #. module: intrastat_product #: model:intrastat.transport_mode,name:intrastat_product.intrastat_transport_5 msgid "Post" @@ -1374,6 +1403,12 @@ msgstr "" msgid "The VAT number '%s' is invalid." msgstr "" +#. module: intrastat_product +#: code:addons/intrastat_product/models/intrastat_product_declaration.py:0 +#, python-format +msgid "The VAT number is not set for the partner '%s'." +msgstr "" + #. module: intrastat_product #: code:addons/intrastat_product/models/intrastat_product_declaration.py:0 #, python-format @@ -1496,11 +1531,6 @@ msgstr "" msgid "Unread Messages Counter" msgstr "" -#. module: intrastat_product -#: model:ir.model.fields,help:intrastat_product.field_intrastat_product_declaration__company_country_code -msgid "Used in views and methods of localization modules." -msgstr "" - #. module: intrastat_product #: model:ir.model.fields,help:intrastat_product.field_intrastat_product_declaration__revision msgid "Used to keep track of changes" diff --git a/intrastat_product/models/intrastat_product_declaration.py b/intrastat_product/models/intrastat_product_declaration.py index b36da44..6a9176c 100644 --- a/intrastat_product/models/intrastat_product_declaration.py +++ b/intrastat_product/models/intrastat_product_declaration.py @@ -424,16 +424,6 @@ class IntrastatProductDeclaration(models.Model): return weight, suppl_unit_qty - def _get_amount(self, inv_line, notedict): - invoice = inv_line.move_id - amount = invoice.currency_id._convert( - inv_line.price_subtotal, - self.company_id.currency_id, - self.company_id, - invoice.date, - ) - return amount - def _get_region(self, inv_line, notedict): """ For supplier invoices/refunds: if the invoice line is linked diff --git a/intrastat_product/static/description/index.html b/intrastat_product/static/description/index.html index 793da6e..18ecb5f 100644 --- a/intrastat_product/static/description/index.html +++ b/intrastat_product/static/description/index.html @@ -469,6 +469,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

Authors

    +
  • ACSONE SA/NV
  • brain-tec AG
  • Akretion
  • Noviat
    • @@ -481,6 +482,8 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

  • Luc De Meyer, Noviat <info@noviat.com>

    • +

  • Denis Roussel <denis.roussel@acsone.eu>

    +

  • Tecnativa <www.tecnativa.com>: