diff --git a/intrastat_base/i18n/intrastat_base.pot b/intrastat_base/i18n/intrastat_base.pot
index 2db5f2d..c09e3fd 100644
--- a/intrastat_base/i18n/intrastat_base.pot
+++ b/intrastat_base/i18n/intrastat_base.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 15.0\n"
+"Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -22,10 +22,17 @@ msgid ""
 msgstr ""
 
 #. module: intrastat_base
-#: model:ir.model.fields,help:intrastat_base.field_account_fiscal_position_template__intrastat
-msgid ""
-"Check this if you want to generate intrastat declarations withthe created "
-"fiscal position"
+#. odoo-python
+#: code:addons/intrastat_base/models/account_fiscal_position.py:0
+#, python-format
+msgid "B2B"
+msgstr ""
+
+#. module: intrastat_base
+#. odoo-python
+#: code:addons/intrastat_base/models/account_fiscal_position.py:0
+#, python-format
+msgid "B2C"
 msgstr ""
 
 #. module: intrastat_base
@@ -38,11 +45,6 @@ msgstr ""
 msgid "Config Settings"
 msgstr ""
 
-#. module: intrastat_base
-#: model:ir.model,name:intrastat_base.model_res_partner
-msgid "Contact"
-msgstr ""
-
 #. module: intrastat_base
 #: model:ir.model,name:intrastat_base.model_account_fiscal_position
 msgid "Fiscal Position"
@@ -54,6 +56,8 @@ msgstr ""
 #: model:ir.ui.menu,name:intrastat_base.menu_intrastat_base_root
 #: model:ir.ui.menu,name:intrastat_base.menu_intrastat_config_root
 #: model_terms:ir.ui.view,arch_db:intrastat_base.product_template_form_view
+#: model_terms:ir.ui.view,arch_db:intrastat_base.view_account_position_filter
+#: model_terms:ir.ui.view,arch_db:intrastat_base.view_account_position_template_search
 #: model_terms:ir.ui.view,arch_db:intrastat_base.view_intrastat_res_config_settings
 msgid "Intrastat"
 msgstr ""
@@ -90,34 +94,25 @@ msgid "List of emails of Users Receiving the Intrastat Reminder"
 msgstr ""
 
 #. module: intrastat_base
+#. odoo-python
 #: code:addons/intrastat_base/models/res_company.py:0
 #, python-format
 msgid "Missing e-mail address on user '%s'."
 msgstr ""
 
 #. module: intrastat_base
-#: model:ir.model,name:intrastat_base.model_product_template
-msgid "Product Template"
-msgstr ""
-
-#. module: intrastat_base
-#: code:addons/intrastat_base/models/res_partner.py:0
+#. odoo-python
+#: code:addons/intrastat_base/models/account_fiscal_position.py:0
 #, python-format
-msgid "Programming Error when calling '_get_intrastat_country_code()"
+msgid "No"
 msgstr ""
 
 #. module: intrastat_base
-#: model:ir.model.fields,help:intrastat_base.field_account_bank_statement_line__intrastat_fiscal_position
-#: model:ir.model.fields,help:intrastat_base.field_account_fiscal_position__intrastat
-#: model:ir.model.fields,help:intrastat_base.field_account_move__intrastat_fiscal_position
-#: model:ir.model.fields,help:intrastat_base.field_account_payment__intrastat_fiscal_position
-msgid ""
-"Set to True if the invoices with this fiscal position should be taken into "
-"account for the generation of the intrastat reports."
+#: model:ir.model,name:intrastat_base.model_product_template
+msgid "Product"
 msgstr ""
 
 #. module: intrastat_base
-#: model:product.product,name:intrastat_base.shipping_costs_exclude
 #: model:product.template,name:intrastat_base.shipping_costs_exclude_product_template
 msgid "Shipping costs"
 msgstr ""
@@ -128,6 +123,25 @@ msgid "Template for Fiscal Position"
 msgstr ""
 
 #. module: intrastat_base
+#. odoo-python
+#: code:addons/intrastat_base/models/account_fiscal_position.py:0
+#, python-format
+msgid ""
+"The fiscal position '%s' has intrastat set to B2B, so the option 'VAT "
+"Required' must be enabled."
+msgstr ""
+
+#. module: intrastat_base
+#. odoo-python
+#: code:addons/intrastat_base/models/account_fiscal_position.py:0
+#, python-format
+msgid ""
+"The fiscal position '%s' has intrastat set to B2C, so the option 'VAT "
+"Required' mustn't be enabled."
+msgstr ""
+
+#. module: intrastat_base
+#. odoo-python
 #: code:addons/intrastat_base/models/product_template.py:0
 #, python-format
 msgid ""
@@ -137,12 +151,7 @@ msgid ""
 msgstr ""
 
 #. module: intrastat_base
-#: model:product.product,uom_name:intrastat_base.shipping_costs_exclude
-#: model:product.template,uom_name:intrastat_base.shipping_costs_exclude_product_template
-msgid "Units"
-msgstr ""
-
-#. module: intrastat_base
+#. odoo-python
 #: code:addons/intrastat_base/models/res_company.py:0
 #, python-format
 msgid "Unknown Error"
@@ -153,3 +162,14 @@ msgstr ""
 #: model:ir.model.fields,field_description:intrastat_base.field_res_config_settings__intrastat_remind_user_ids
 msgid "Users Receiving the Intrastat Reminder"
 msgstr ""
+
+#. module: intrastat_base
+#: model:ir.model.fields,help:intrastat_base.field_account_bank_statement_line__intrastat_fiscal_position
+#: model:ir.model.fields,help:intrastat_base.field_account_fiscal_position__intrastat
+#: model:ir.model.fields,help:intrastat_base.field_account_fiscal_position_template__intrastat
+#: model:ir.model.fields,help:intrastat_base.field_account_move__intrastat_fiscal_position
+#: model:ir.model.fields,help:intrastat_base.field_account_payment__intrastat_fiscal_position
+msgid ""
+"When set to B2B or B2C, the invoices with this fiscal position will be taken"
+" into account for the generation of the intrastat reports."
+msgstr ""