diff --git a/account_invoice_import_facturx/i18n/account_invoice_import_facturx.pot b/account_invoice_import_facturx/i18n/account_invoice_import_facturx.pot
new file mode 100644
index 0000000000..eca21c010e
--- /dev/null
+++ b/account_invoice_import_facturx/i18n/account_invoice_import_facturx.pot
@@ -0,0 +1,112 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_import_facturx
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
+msgid "(also called ZUGFeRD 2.0) and"
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
+msgid ": PDF file with an XML attachment in CrossIndustryInvoice format."
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:504
+#, python-format
+msgid "AllowanceTotalAmount (%s) doesn't match the total of the allowance lines (%s). Maybe it is because the Factur-X XML file is at BASIC level, and we don't have the details of taxes for the allowance lines."
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:482
+#, python-format
+msgid "ChargeTotalAmount (%s) doesn't match the total of the charge lines (%s). Maybe it is because the Factur-X XML file is at BASIC level, and we don't have the details of taxes for the charge lines."
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
+msgid "Factur-X"
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:311
+#, python-format
+msgid "For the moment, in the Factur-X import, we only support type code 380 and 381. (TypeCode is %s)"
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:441
+#, python-format
+msgid "Global"
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:455
+#, python-format
+msgid "Logistics Service"
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:181
+#, python-format
+msgid "Misc Allowance"
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:188
+#, python-format
+msgid "Misc Charge"
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:498
+#, python-format
+msgid "Misc Global Allowance"
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:476
+#, python-format
+msgid "Misc Global Charge"
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:370
+#, python-format
+msgid "The GrandTotalAmount is %s but the sum of the lines plus the total charge plus the total trade allowance plus the total taxes is %s."
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:293
+#, python-format
+msgid "The XML file embedded in the Factur-X invoice is invalid according to the official XML Schema Definition."
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:190
+#, python-format
+msgid "Unknown ChargeIndicator %s"
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: model:ir.model,name:account_invoice_import_facturx.model_account_invoice_import
+msgid "Wizard to import supplier invoices/refunds"
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
+msgid "ZUGFeRD 1.0"
+msgstr ""
+
diff --git a/account_invoice_import_facturx/i18n/de.po b/account_invoice_import_facturx/i18n/de.po
index 529fa607fe..5a0be8b6a6 100644
--- a/account_invoice_import_facturx/i18n/de.po
+++ b/account_invoice_import_facturx/i18n/de.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* account_invoice_import_factur-x
+# 	* account_invoice_import_factur-x
 #
 msgid ""
 msgstr ""
@@ -16,162 +16,158 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.6.1\n"
 
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid "(also called ZUGFeRD 2.0) and"
 msgstr "(auch ZUGFeRD 2.0 genannt) und"
 
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid ": PDF file with an XML attachment in CrossIndustryInvoice format."
 msgstr ""
 ": PDF Datei mit einem XML Anhang in landesübergreifendem Rechnungsformat."
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:522
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:504
 #, python-format
-msgid "AllowanceTotalAmount (%s) doesn't match the total of the allowance lines (%s). Maybe it is because the Factur-X XML file is at BASIC level, and we don't have the details of taxes for the allowance lines."
+msgid ""
+"AllowanceTotalAmount (%s) doesn't match the total of the allowance lines "
+"(%s). Maybe it is because the Factur-X XML file is at BASIC level, and we "
+"don't have the details of taxes for the allowance lines."
 msgstr ""
 "Gesamtnachlass (%s) stimmt nicht mit der Summe der Einzelnachlässe (%s) "
 "überein. Möglicherweise ist dies eine Facture-X XML Datei auf BASIC Ebene "
 "und wir haben keine Details zu den Steuern auf die Einzelnachlässe."
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:500
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:482
 #, python-format
-msgid "ChargeTotalAmount (%s) doesn't match the total of the charge lines (%s). Maybe it is because the Factur-X XML file is at BASIC level, and we don't have the details of taxes for the charge lines."
+msgid ""
+"ChargeTotalAmount (%s) doesn't match the total of the charge lines (%s). "
+"Maybe it is because the Factur-X XML file is at BASIC level, and we don't "
+"have the details of taxes for the charge lines."
 msgstr ""
 "Die Gesamtgebühren (%s) stimmen nicht mit der Summe der Einzelgebühren (%s) "
 "überein. Möglicherweise ist dies eine Facture-X XML Datei auf BASIC Ebene "
 "und wir haben keine Details zu den Steuern auf die Einzelgebühren."
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:296
-#, python-format
-msgid "Could not detect if the invoice is a Factur-X or ZUGFeRD invoice."
-msgstr ""
-"Es konnte nicht ermittelt werden ob es ich bei der Rechnung um eine Factur-X "
-"oder ZUGFeRD Rechnung handelt."
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_insurance_purchase_16_34
-msgid "DE-INSURANCE-buy-16.34"
-msgstr "DE-INSURANCE-buy-16.34"
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_insurance_purchase_19
-msgid "DE-INSURANCE-buy-19.0"
-msgstr "DE-INSURANCE-buy-19.0"
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_vat_purchase_19
-msgid "DE-VAT-buy-19.0"
-msgstr "DE-VAT-buy-19.0"
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_vat_purchase_7
-msgid "DE-VAT-buy-7.0"
-msgstr "DE-VAT-buy-7.0"
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.fr_vat_purchase_20
-msgid "FR VAT purchase 20.0%"
-msgstr "FR VAT purchase 20.0%"
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.fr_vat_purchase_20
-msgid "FR-VAT-buy-20.0"
-msgstr "FR-VAT-buy-20.0"
-
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid "Factur-X"
 msgstr "Factur-X"
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:329
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:311
 #, python-format
-msgid "For the moment, in the Factur-X import, we only support type code 380 and 381. (TypeCode is %s)"
+msgid ""
+"For the moment, in the Factur-X import, we only support type code 380 and "
+"381. (TypeCode is %s)"
 msgstr ""
-"Zurzeit unterstützt der Factur-X Import nur  die Schlüssel 380 und 381.  ("
-"Der Schlüssel ist %s)"
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_insurance_purchase_16_34
-msgid "German Insurance purchase 16.34%"
-msgstr "Deutscher Versicherungskauf 16.34%"
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_insurance_purchase_19
-msgid "German Insurance purchase 19.0%"
-msgstr "Deutscher Versicherungskauf 19.0%"
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_vat_purchase_19
-msgid "German VAT purchase 19.0%"
-msgstr "German VAT purchase 19.0%"
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_vat_purchase_7
-msgid "German VAT purchase 7.0%"
-msgstr "German VAT purchase 7.0%"
-
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:459
+"Zurzeit unterstützt der Factur-X Import nur  die Schlüssel 380 und 381.  "
+"(Der Schlüssel ist %s)"
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:441
 #, python-format
 msgid "Global"
 msgstr "Global"
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:473
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:455
 #, python-format
 msgid "Logistics Service"
 msgstr "Logistik Dienstleistung"
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:182
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:181
 #, python-format
 msgid "Misc Allowance"
 msgstr "Sonstiger Nachlass"
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:189
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:188
 #, python-format
 msgid "Misc Charge"
 msgstr "Sonstige Gebühr"
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:516
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:498
 #, python-format
 msgid "Misc Global Allowance"
 msgstr "Sonstiger weltweiter Nachlass"
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:494
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:476
 #, python-format
 msgid "Misc Global Charge"
 msgstr "Sonstige weltweite Gebühr"
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:388
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:370
 #, python-format
-msgid "The GrandTotalAmount is %s but the sum of the lines plus the total charge plus the total trade allowance plus the total taxes is %s."
+msgid ""
+"The GrandTotalAmount is %s but the sum of the lines plus the total charge "
+"plus the total trade allowance plus the total taxes is %s."
 msgstr ""
 "Der Gesamtbetrag ist %s, aber die Summe der Einzelpositionen zuzüglich der "
 "gesamten Gebühren, gesamten Handelsnachlässe und gesamten Steuern ist %s."
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:191
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:293
+#, python-format
+msgid ""
+"The XML file embedded in the Factur-X invoice is invalid according to the "
+"official XML Schema Definition."
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:190
 #, python-format
 msgid "Unknown ChargeIndicator %s"
 msgstr "Unbekannter Gebührenindikator %s"
 
-#. module: account_invoice_import_factur-x
-#: model:ir.model,name:account_invoice_import_factur-x.model_account_invoice_import
+#. module: account_invoice_import_facturx
+#: model:ir.model,name:account_invoice_import_facturx.model_account_invoice_import
 msgid "Wizard to import supplier invoices/refunds"
-msgstr "Wizard zum Import von Lieferantenrechnungen und Lieferantengutschriften"
+msgstr ""
+"Wizard zum Import von Lieferantenrechnungen und Lieferantengutschriften"
 
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid "ZUGFeRD 1.0"
 msgstr "ZUGFeRD 1.0"
+
+#~ msgid "Could not detect if the invoice is a Factur-X or ZUGFeRD invoice."
+#~ msgstr ""
+#~ "Es konnte nicht ermittelt werden ob es ich bei der Rechnung um eine "
+#~ "Factur-X oder ZUGFeRD Rechnung handelt."
+
+#~ msgid "DE-INSURANCE-buy-16.34"
+#~ msgstr "DE-INSURANCE-buy-16.34"
+
+#~ msgid "DE-INSURANCE-buy-19.0"
+#~ msgstr "DE-INSURANCE-buy-19.0"
+
+#~ msgid "DE-VAT-buy-19.0"
+#~ msgstr "DE-VAT-buy-19.0"
+
+#~ msgid "DE-VAT-buy-7.0"
+#~ msgstr "DE-VAT-buy-7.0"
+
+#~ msgid "FR VAT purchase 20.0%"
+#~ msgstr "FR VAT purchase 20.0%"
+
+#~ msgid "FR-VAT-buy-20.0"
+#~ msgstr "FR-VAT-buy-20.0"
+
+#~ msgid "German Insurance purchase 16.34%"
+#~ msgstr "Deutscher Versicherungskauf 16.34%"
+
+#~ msgid "German Insurance purchase 19.0%"
+#~ msgstr "Deutscher Versicherungskauf 19.0%"
+
+#~ msgid "German VAT purchase 19.0%"
+#~ msgstr "German VAT purchase 19.0%"
+
+#~ msgid "German VAT purchase 7.0%"
+#~ msgstr "German VAT purchase 7.0%"
diff --git a/account_invoice_import_facturx/i18n/es.po b/account_invoice_import_facturx/i18n/es.po
index 13a91c79a9..41605a802c 100644
--- a/account_invoice_import_facturx/i18n/es.po
+++ b/account_invoice_import_facturx/i18n/es.po
@@ -18,18 +18,18 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid "(also called ZUGFeRD 2.0) and"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid ": PDF file with an XML attachment in CrossIndustryInvoice format."
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:522
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:504
 #, python-format
 msgid ""
 "AllowanceTotalAmount (%s) doesn't match the total of the allowance lines "
@@ -37,8 +37,8 @@ msgid ""
 "don't have the details of taxes for the allowance lines."
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:500
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:482
 #, python-format
 msgid ""
 "ChargeTotalAmount (%s) doesn't match the total of the charge lines (%s). "
@@ -46,131 +46,101 @@ msgid ""
 "have the details of taxes for the charge lines."
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:296
-#, python-format
-msgid "Could not detect if the invoice is a Factur-X or ZUGFeRD invoice."
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_insurance_purchase_16_34
-msgid "DE-INSURANCE-buy-16.34"
-msgstr "DE-INSURANCE-buy-16.34"
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_insurance_purchase_19
-msgid "DE-INSURANCE-buy-19.0"
-msgstr "DE-INSURANCE-buy-19.0"
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_vat_purchase_19
-msgid "DE-VAT-buy-19.0"
-msgstr "DE-VAT-buy-19.0"
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_vat_purchase_7
-msgid "DE-VAT-buy-7.0"
-msgstr "DE-VAT-buy-7.0"
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.fr_vat_purchase_20
-msgid "FR VAT purchase 20.0%"
-msgstr "FR VAT purchase 20.0%"
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.fr_vat_purchase_20
-msgid "FR-VAT-buy-20.0"
-msgstr "FR-VAT-buy-20.0"
-
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid "Factur-X"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:329
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:311
 #, python-format
 msgid ""
 "For the moment, in the Factur-X import, we only support type code 380 and "
 "381. (TypeCode is %s)"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_insurance_purchase_16_34
-msgid "German Insurance purchase 16.34%"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_insurance_purchase_19
-msgid "German Insurance purchase 19.0%"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_vat_purchase_19
-msgid "German VAT purchase 19.0%"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_vat_purchase_7
-msgid "German VAT purchase 7.0%"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:459
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:441
 #, python-format
 msgid "Global"
 msgstr "Global"
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:473
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:455
 #, python-format
 msgid "Logistics Service"
 msgstr "Servicio de logística"
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:182
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:181
 #, python-format
 msgid "Misc Allowance"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:189
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:188
 #, python-format
 msgid "Misc Charge"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:516
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:498
 #, python-format
 msgid "Misc Global Allowance"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:494
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:476
 #, python-format
 msgid "Misc Global Charge"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:388
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:370
 #, python-format
 msgid ""
 "The GrandTotalAmount is %s but the sum of the lines plus the total charge "
 "plus the total trade allowance plus the total taxes is %s."
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:191
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:293
+#, python-format
+msgid ""
+"The XML file embedded in the Factur-X invoice is invalid according to the "
+"official XML Schema Definition."
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:190
 #, python-format
 msgid "Unknown ChargeIndicator %s"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: model:ir.model,name:account_invoice_import_factur-x.model_account_invoice_import
+#. module: account_invoice_import_facturx
+#: model:ir.model,name:account_invoice_import_facturx.model_account_invoice_import
 msgid "Wizard to import supplier invoices/refunds"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid "ZUGFeRD 1.0"
 msgstr ""
+
+#~ msgid "DE-INSURANCE-buy-16.34"
+#~ msgstr "DE-INSURANCE-buy-16.34"
+
+#~ msgid "DE-INSURANCE-buy-19.0"
+#~ msgstr "DE-INSURANCE-buy-19.0"
+
+#~ msgid "DE-VAT-buy-19.0"
+#~ msgstr "DE-VAT-buy-19.0"
+
+#~ msgid "DE-VAT-buy-7.0"
+#~ msgstr "DE-VAT-buy-7.0"
+
+#~ msgid "FR VAT purchase 20.0%"
+#~ msgstr "FR VAT purchase 20.0%"
+
+#~ msgid "FR-VAT-buy-20.0"
+#~ msgstr "FR-VAT-buy-20.0"
diff --git a/account_invoice_import_facturx/i18n/fr.po b/account_invoice_import_facturx/i18n/fr.po
index 290fed2c6c..314f4dc73e 100644
--- a/account_invoice_import_facturx/i18n/fr.po
+++ b/account_invoice_import_facturx/i18n/fr.po
@@ -18,18 +18,18 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid "(also called ZUGFeRD 2.0) and"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid ": PDF file with an XML attachment in CrossIndustryInvoice format."
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:522
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:504
 #, python-format
 msgid ""
 "AllowanceTotalAmount (%s) doesn't match the total of the allowance lines "
@@ -37,8 +37,8 @@ msgid ""
 "don't have the details of taxes for the allowance lines."
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:500
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:482
 #, python-format
 msgid ""
 "ChargeTotalAmount (%s) doesn't match the total of the charge lines (%s). "
@@ -46,131 +46,83 @@ msgid ""
 "have the details of taxes for the charge lines."
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:296
-#, python-format
-msgid "Could not detect if the invoice is a Factur-X or ZUGFeRD invoice."
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_insurance_purchase_16_34
-msgid "DE-INSURANCE-buy-16.34"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_insurance_purchase_19
-msgid "DE-INSURANCE-buy-19.0"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_vat_purchase_19
-msgid "DE-VAT-buy-19.0"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_vat_purchase_7
-msgid "DE-VAT-buy-7.0"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.fr_vat_purchase_20
-msgid "FR VAT purchase 20.0%"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.fr_vat_purchase_20
-msgid "FR-VAT-buy-20.0"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid "Factur-X"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:329
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:311
 #, python-format
 msgid ""
 "For the moment, in the Factur-X import, we only support type code 380 and "
 "381. (TypeCode is %s)"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_insurance_purchase_16_34
-msgid "German Insurance purchase 16.34%"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_insurance_purchase_19
-msgid "German Insurance purchase 19.0%"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_vat_purchase_19
-msgid "German VAT purchase 19.0%"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_vat_purchase_7
-msgid "German VAT purchase 7.0%"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:459
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:441
 #, python-format
 msgid "Global"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:473
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:455
 #, python-format
 msgid "Logistics Service"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:182
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:181
 #, python-format
 msgid "Misc Allowance"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:189
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:188
 #, python-format
 msgid "Misc Charge"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:516
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:498
 #, python-format
 msgid "Misc Global Allowance"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:494
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:476
 #, python-format
 msgid "Misc Global Charge"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:388
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:370
 #, python-format
 msgid ""
 "The GrandTotalAmount is %s but the sum of the lines plus the total charge "
 "plus the total trade allowance plus the total taxes is %s."
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:191
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:293
+#, python-format
+msgid ""
+"The XML file embedded in the Factur-X invoice is invalid according to the "
+"official XML Schema Definition."
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:190
 #, python-format
 msgid "Unknown ChargeIndicator %s"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: model:ir.model,name:account_invoice_import_factur-x.model_account_invoice_import
+#. module: account_invoice_import_facturx
+#: model:ir.model,name:account_invoice_import_facturx.model_account_invoice_import
 msgid "Wizard to import supplier invoices/refunds"
 msgstr "Assistant pour importer les PDF de facture fournisseur"
 
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid "ZUGFeRD 1.0"
 msgstr ""
diff --git a/account_invoice_import_facturx/i18n/sl.po b/account_invoice_import_facturx/i18n/sl.po
index 5ab41b35cc..4147a61e50 100644
--- a/account_invoice_import_facturx/i18n/sl.po
+++ b/account_invoice_import_facturx/i18n/sl.po
@@ -19,18 +19,18 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid "(also called ZUGFeRD 2.0) and"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid ": PDF file with an XML attachment in CrossIndustryInvoice format."
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:522
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:504
 #, python-format
 msgid ""
 "AllowanceTotalAmount (%s) doesn't match the total of the allowance lines "
@@ -38,8 +38,8 @@ msgid ""
 "don't have the details of taxes for the allowance lines."
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:500
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:482
 #, python-format
 msgid ""
 "ChargeTotalAmount (%s) doesn't match the total of the charge lines (%s). "
@@ -47,131 +47,83 @@ msgid ""
 "have the details of taxes for the charge lines."
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:296
-#, python-format
-msgid "Could not detect if the invoice is a Factur-X or ZUGFeRD invoice."
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_insurance_purchase_16_34
-msgid "DE-INSURANCE-buy-16.34"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_insurance_purchase_19
-msgid "DE-INSURANCE-buy-19.0"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_vat_purchase_19
-msgid "DE-VAT-buy-19.0"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.de_vat_purchase_7
-msgid "DE-VAT-buy-7.0"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.fr_vat_purchase_20
-msgid "FR VAT purchase 20.0%"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,description:account_invoice_import_factur-x.fr_vat_purchase_20
-msgid "FR-VAT-buy-20.0"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid "Factur-X"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:329
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:311
 #, python-format
 msgid ""
 "For the moment, in the Factur-X import, we only support type code 380 and "
 "381. (TypeCode is %s)"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_insurance_purchase_16_34
-msgid "German Insurance purchase 16.34%"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_insurance_purchase_19
-msgid "German Insurance purchase 19.0%"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_vat_purchase_19
-msgid "German VAT purchase 19.0%"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: model:account.tax,name:account_invoice_import_factur-x.de_vat_purchase_7
-msgid "German VAT purchase 7.0%"
-msgstr ""
-
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:459
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:441
 #, python-format
 msgid "Global"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:473
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:455
 #, python-format
 msgid "Logistics Service"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:182
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:181
 #, python-format
 msgid "Misc Allowance"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:189
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:188
 #, python-format
 msgid "Misc Charge"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:516
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:498
 #, python-format
 msgid "Misc Global Allowance"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:494
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:476
 #, python-format
 msgid "Misc Global Charge"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:388
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:370
 #, python-format
 msgid ""
 "The GrandTotalAmount is %s but the sum of the lines plus the total charge "
 "plus the total trade allowance plus the total taxes is %s."
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: code:addons/account_invoice_import_factur-x/wizard/account_invoice_import.py:191
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:293
+#, python-format
+msgid ""
+"The XML file embedded in the Factur-X invoice is invalid according to the "
+"official XML Schema Definition."
+msgstr ""
+
+#. module: account_invoice_import_facturx
+#: code:addons/account_invoice_import_facturx/wizard/account_invoice_import.py:190
 #, python-format
 msgid "Unknown ChargeIndicator %s"
 msgstr ""
 
-#. module: account_invoice_import_factur-x
-#: model:ir.model,name:account_invoice_import_factur-x.model_account_invoice_import
+#. module: account_invoice_import_facturx
+#: model:ir.model,name:account_invoice_import_facturx.model_account_invoice_import
 msgid "Wizard to import supplier invoices/refunds"
 msgstr "Čarovnik za uvoz prejetih računov/dobropisov"
 
-#. module: account_invoice_import_factur-x
-#: model:ir.ui.view,arch_db:account_invoice_import_factur-x.account_invoice_import_form
+#. module: account_invoice_import_facturx
+#: model_terms:ir.ui.view,arch_db:account_invoice_import_facturx.account_invoice_import_form
 msgid "ZUGFeRD 1.0"
 msgstr ""