[MERGE] forward port branch 11.0 up to 0b2dbbb337b

16 files changed, 529 insertions, 107 deletions

diff --git a/addons/account/__init__.py b/addons/account/__init__.py
index dc3a8f3e476..35c6e44d75c 100644
--- a/addons/account/__init__.py
+++ b/addons/account/__init__.py
@@ -45,6 +45,8 @@ def _auto_install_l10n(cr, registry):
             'PL', 'PT', 'RO', 'SI', 'TR', 'UK', 'VE', 'VN'
             ]:
             module_list.append('base_vat')
+        if country_code == 'MX':
+            module_list.append('l10n_mx_edi')
 
         # European countries will be using SEPA
         europe = env.ref('base.europe', raise_if_not_found=False)
diff --git a/addons/account/models/account_payment.py b/addons/account/models/account_payment.py
index 7f09875044e..7cee63c3122 100644
--- a/addons/account/models/account_payment.py
+++ b/addons/account/models/account_payment.py
@@ -257,11 +257,13 @@ class account_register_payments(models.TransientModel):
         '''
         amount = self._compute_payment_amount(invoices=invoices) if self.multi else self.amount
         payment_type = ('inbound' if amount > 0 else 'outbound') if self.multi else self.payment_type
+        communication = (' '.join([inv.reference or inv.number for inv in invoices])
+                         if self.multi else self.communication)
         return {
             'journal_id': self.journal_id.id,
             'payment_method_id': self.payment_method_id.id,
             'payment_date': self.payment_date,
-            'communication': self.communication,
+            'communication': communication,  # DO NOT FORWARD PORT TO V12 OR ABOVE
             'invoice_ids': [(6, 0, invoices.ids)],
             'payment_type': payment_type,
             'amount': abs(amount),
diff --git a/addons/delivery/models/sale_order.py b/addons/delivery/models/sale_order.py
index d0ca0a7c424..50da5d99eaa 100644
--- a/addons/delivery/models/sale_order.py
+++ b/addons/delivery/models/sale_order.py
@@ -99,9 +99,15 @@ class SaleOrder(models.Model):
             taxes_ids = self.fiscal_position_id.map_tax(taxes, carrier.product_id, self.partner_id).ids
 
         # Create the sales order line
+        carrier_with_partner_lang = carrier.with_context(lang=self.partner_id.lang)
+        if carrier_with_partner_lang.product_id.description_sale:
+            so_description = '%s: %s' % (carrier_with_partner_lang.name,
+                                        carrier_with_partner_lang.product_id.description_sale)
+        else:
+            so_description = carrier_with_partner_lang.name
         values = {
             'order_id': self.id,
-            'name': carrier.with_context(lang=self.partner_id.lang).name,
+            'name': so_description,
             'product_uom_qty': 1,
             'product_uom': carrier.product_id.uom_id.id,
             'product_id': carrier.product_id.id,
diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index f0c867bce0f..e52d5e13e0a 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -93,7 +93,7 @@
                                     <label for="free_over"/>
                                 </div>
                                 <field nolabel="1" name="amount" attrs="{'required':[('free_over','!=', False)], 'invisible':[('free_over','=', False)]}"/>
-                                <field name="product_id" context="{'default_type': 'service', 'sale_ok': False, 'purchase_ok': False}" />
+                                <field name="product_id" context="{'default_type': 'service', 'default_sale_ok': False, 'default_purchase_ok': False}" />
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </group>
                         </group>
diff --git a/addons/l10n_ca/data/account_tax_data.xml b/addons/l10n_ca/data/account_tax_data.xml
index 803e63c0435..174c30ef360 100644
--- a/addons/l10n_ca/data/account_tax_data.xml
+++ b/addons/l10n_ca/data/account_tax_data.xml
@@ -112,7 +112,7 @@
         <field name="type_tax_use">sale</field>
         <field name="amount">100</field>
         <field name="amount_type">group</field>
-        <field name="children_tax_ids" eval="[(6,0,[ref('pst_bc_sale_en')])]"/>
+        <field name="children_tax_ids" eval="[(6,0,[ref('pst_bc_sale_en'), ref('gstpst_sale_bc_gst_en')])]"/>
         <field name="tag_ids" eval="[(6,0,[ref('tag_gstpst_bc_sale')])]"/>
         <field name="tax_group_id" ref="tax_group_fix"/>
     </record>
diff --git a/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml b/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml
index 41d065d79c9..4d172b2999c 100644
--- a/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml
+++ b/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml
@@ -77,7 +77,74 @@
             <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_93')])]"/>
             <field name="tax_group_id" ref="tax_group_0"/>
         </record>
-
+        <record id="tax_eu_19_purchase_ust_no_vst_skr03" model="account.tax.template">
+            <field name="sequence">97</field>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+            <field name="name">19% Umsatzsteuer aus innergem. Erwerb (kein Vorsteuerabzug)</field>
+            <field name="description">19% USt innerg. Erw. - 0% Vorsteuer</field>
+            <field name="amount_type">percent</field>
+            <field name="amount">-19</field>
+            <field name="refund_account_id" ref="account_1779"/>
+            <field name="account_id" ref="account_1779"/>
+            <field name="type_tax_use">none</field>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_89')])]"/>
+            <field name="tax_group_id" ref="tax_group_19"/>
+        </record>
+        <record id="tax_eu_19_purchase_vst_no_vst_skr03" model="account.tax.template">
+            <field name="sequence">97</field>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+            <field name="name">19% Vorsteuer aus innergem. Erwerb (kein Vorsteuerabzug)</field>
+            <field name="description">19% VSt innerg. Erw. - 0% Vorsteuer</field>
+            <field name="amount_type">percent</field>
+            <field name="amount">19</field>
+            <field name="type_tax_use">none</field>
+            <field name="tax_group_id" ref="tax_group_19"/>
+        </record>
+        <record id="tax_eu_19_purchase_no_vst_skr03" model="account.tax.template">
+            <field name="sequence">20</field>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+            <field name="name">Innergem. Erwerb 19%USt/0%VSt</field>
+            <field name="description">innergem. Erwerb 19% - 0% Vorsteuer</field>
+            <field name="amount_type">group</field>
+            <field name="amount">0</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="children_tax_ids" eval="[(6,0,[ref('tax_eu_19_purchase_ust_no_vst_skr03'), ref('tax_eu_19_purchase_vst_no_vst_skr03')])]"/>
+            <field name="tax_group_id" ref="tax_group_19"/>
+        </record>
+        <record id="tax_eu_7_purchase_ust_no_vst_skr03" model="account.tax.template">
+            <field name="sequence">97</field>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+            <field name="name">7% Umsatzsteuer aus innergem. Erwerb (kein Vorsteuerabzug)</field>
+            <field name="description">7% USt innerg. Erw. - 0% Vorsteuer</field>
+            <field name="amount_type">percent</field>
+            <field name="amount">-7</field>
+            <field name="refund_account_id" ref="account_1779"/>
+            <field name="account_id" ref="account_1779"/>
+            <field name="type_tax_use">none</field>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_93')])]"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+        </record>
+        <record id="tax_eu_7_purchase_vst_no_vst_skr03" model="account.tax.template">
+            <field name="sequence">97</field>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+            <field name="name">7% Vorsteuer aus innergem. Erwerb (kein Vorsteuerabzug)</field>
+            <field name="description">7% VSt innerg. Erw. - 0% Vorsteuer</field>
+            <field name="amount_type">percent</field>
+            <field name="amount">7</field>
+            <field name="type_tax_use">none</field>
+            <field name="tax_group_id" ref="tax_group_7"/>
+        </record>
+        <record id="tax_eu_7_purchase_no_vst_skr03" model="account.tax.template">
+            <field name="sequence">20</field>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+            <field name="name">Innergem. Erwerb 7%USt/0%VSt</field>
+            <field name="description">innergem. Erwerb 7% - 0% Vorsteuer</field>
+            <field name="amount_type">group</field>
+            <field name="amount">0</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="children_tax_ids" eval="[(6,0,[ref('tax_eu_7_purchase_ust_no_vst_skr03'), ref('tax_eu_7_purchase_vst_no_vst_skr03')])]"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+        </record>
         <record id="tax_eu_car_purchase_ust_skr03" model="account.tax.template">
             <field name="sequence">99</field>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -163,29 +230,75 @@
         <record id="tax_import_19_skr03" model="account.tax.template">
             <field name="sequence">20</field>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
-            <field name="name">19% Einfuhrumsatzsteuer</field>
+            <field name="name">19% Einfuhrumsatzsteuer (abzugsf. Vorsteuer)</field>
             <field name="description">19% EUSt</field>
             <field name="amount_type">percent</field>
             <field name="amount">19</field>
             <field name="refund_account_id" ref="account_1588"/>
             <field name="account_id" ref="account_1588"/>
-            <field name="type_tax_use">purchase</field>
+            <field name="type_tax_use">none</field>
             <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_62')])]"/>
             <field name="tax_group_id" ref="tax_group_19"/>
         </record>
-        <record id="tax_import_7_skr03" model="account.tax.template">
+        <record id="tax_import_19_payable_skr03" model="account.tax.template">
+            <field name="sequence">98</field>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+            <field name="name">19% Einfuhrumsatzsteuer (zu bezahlender Aufschub)</field>
+            <field name="description">19% EUSt (zu bezahlender Aufschub)</field>
+            <field name="amount_type">percent</field>
+            <field name="amount">-19</field>
+            <field name="refund_account_id" ref="account_1788"/>
+            <field name="account_id" ref="account_1788"/>
+            <field name="type_tax_use">none</field>
+            <field name="tax_group_id" ref="tax_group_19"/>
+        </record>
+        <record id="tax_import_19_and_payable_skr03" model="account.tax.template">
             <field name="sequence">21</field>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
-            <field name="name">7% Einfuhrumsatzsteuer</field>
-            <field name="description">7% EUSt</field>
+            <field name="name">19% Einfuhrumsatzsteuer (§21 Abs.3 UstG)</field>
+            <field name="description">Einfuhrumsatzsteuer 19%</field>
+            <field name="amount_type">group</field>
+            <field name="amount">0</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="children_tax_ids" eval="[(6,0,[ref('tax_import_19_skr03'), ref('tax_import_19_payable_skr03')])]"/>
+            <field name="tax_group_id" ref="tax_group_19"/>
+        </record>
+        <record id="tax_import_7_skr03" model="account.tax.template">
+            <field name="sequence">98</field>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+            <field name="name">7% Einfuhrumsatzsteuer (abzugsf. Vorsteuer)</field>
+            <field name="description">7% EUSt (abzugsf. Vorsteuer)</field>
             <field name="amount_type">percent</field>
             <field name="amount">7</field>
             <field name="refund_account_id" ref="account_1588"/>
             <field name="account_id" ref="account_1588"/>
-            <field name="type_tax_use">purchase</field>
+            <field name="type_tax_use">none</field>
             <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_62')])]"/>
             <field name="tax_group_id" ref="tax_group_7"/>
         </record>
+        <record id="tax_import_7_payable_skr03" model="account.tax.template">
+            <field name="sequence">98</field>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+            <field name="name">7% Einfuhrumsatzsteuer (zu bezahlender Aufschub)</field>
+            <field name="description">7% EUSt (zu bezahlender Aufschub)</field>
+            <field name="amount_type">percent</field>
+            <field name="amount">-7</field>
+            <field name="refund_account_id" ref="account_1788"/>
+            <field name="account_id" ref="account_1788"/>
+            <field name="type_tax_use">none</field>
+            <field name="tax_group_id" ref="tax_group_7"/>
+        </record>
+        <record id="tax_import_7_and_payable_skr03" model="account.tax.template">
+            <field name="sequence">21</field>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+            <field name="name">7% Einfuhrumsatzsteuer (§21 Abs.3 UstG)</field>
+            <field name="description">Einfuhrumsatzsteuer 7%</field>
+            <field name="amount_type">group</field>
+            <field name="amount">0</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="children_tax_ids" eval="[(6,0,[ref('tax_import_7_skr03'), ref('tax_import_7_payable_skr03')])]"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+        </record>
         <record id="tax_eu_purchase_tax_free_skr03" model="account.tax.template">
             <field name="sequence">22</field>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -816,7 +929,6 @@
             <field name="children_tax_ids" eval="[(6,0,[ref('tax_ust_19_purchase_3eck_last_skr03'), ref('tax_vst_19_purchase_3eck_last_skr03')])]"/>
             <field name="tax_group_id" ref="tax_group_0"/>
         </record>
-
         <record id="tax_ust_19_purchase_13b_werk_ausland_skr03" model="account.tax.template">
             <field name="sequence">105</field>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -969,23 +1081,38 @@
             <field name="children_tax_ids" eval="[(6,0,[ref('tax_ust_7_purchase_13a_auslagerung_skr03'), ref('tax_vst_7_purchase_13a_auslagerung_skr03')])]"/>
             <field name="tax_group_id" ref="tax_group_0"/>
         </record>
+        <record id="fiscal_position_domestic_skr03" model="account.fiscal.position.template">
+            <field name="sequence">1</field>
+            <field name="name">Geschäftspartner Inland</field>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+            <field name="auto_apply" eval="True" />
+            <field name="country_id" ref="base.de"></field>
+        </record>
         <record id="fiscal_position_non_eu_partner_service_skr03" model="account.fiscal.position.template">
+            <field name="sequence">6</field>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
-            <field name="name">Dienstleister Ausland</field>
+            <field name="name">Dienstleister Ausland (Nicht-EU)</field>
         </record>
         <record id="fiscal_position_non_eu_partner_skr03" model="account.fiscal.position.template">
+            <field name="sequence">5</field>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
-            <field name="name">Geschäftspartner Ausland</field>
+            <field name="name">Geschäftspartner Ausland (Nicht-EU)</field>
         </record>
         <record id="fiscal_position_eu_vat_id_partner_skr03" model="account.fiscal.position.template">
+            <field name="sequence">2</field>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
             <field name="name">Geschäftspartner EU (mit USt-ID)</field>
+            <field name="auto_apply" eval="True" />
+            <field name="country_group_id" ref="base.europe"></field>
         </record>
         <record id="fiscal_position_eu_vat_id_partner_service_skr03" model="account.fiscal.position.template">
+            <field name="sequence">3</field>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
             <field name="name">Dienstleister EU (mit USt-ID)</field>
+            <field name="vat_required" eval="True" />
         </record>
         <record id="fiscal_position_eu_no_id_partner_skr03" model="account.fiscal.position.template">
+            <field name="sequence">4</field>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
             <field name="name">Geschäftspartner EU (ohne USt-ID)</field>
         </record>
@@ -1021,12 +1148,12 @@
         </record>
         <record id="account_fiscal_position_tax_eu_no_id_purchase_19_skr03" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_eu_no_id_partner_skr03"/>
-            <field name="tax_dest_id" ref="tax_import_19_skr03"/>
+            <field name="tax_dest_id" ref="tax_eu_19_purchase_no_vst_skr03"/>
             <field name="tax_src_id" ref="tax_vst_19_skr03"/>
         </record>
         <record id="account_fiscal_position_tax_eu_no_id_purchase_7_skr03" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_eu_no_id_partner_skr03"/>
-            <field name="tax_dest_id" ref="tax_import_7_skr03"/>
+            <field name="tax_dest_id" ref="tax_eu_7_purchase_no_vst_skr03"/>
             <field name="tax_src_id" ref="tax_vst_7_skr03"/>
         </record>
         <record id="account_fiscal_position_tax_eu_no_id_sale_19_skr03" model="account.fiscal.position.tax.template">
@@ -1056,7 +1183,7 @@
         </record>
         <record id="account_fiscal_position_tax_non_eu_purchase_19_skr03" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_non_eu_partner_skr03"/>
-            <field name="tax_dest_id" ref="tax_import_19_skr03"/>
+            <field name="tax_dest_id" ref="tax_import_19_and_payable_skr03"/>
             <field name="tax_src_id" ref="tax_vst_19_skr03"/>
         </record>
         <record id="account_fiscal_position_tax_non_eu_purchase_services_19_skr03" model="account.fiscal.position.tax.template">
@@ -1066,7 +1193,7 @@
         </record>
         <record id="account_fiscal_position_tax_non_eu_purchase_7_skr03" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_non_eu_partner_skr03"/>
-            <field name="tax_dest_id" ref="tax_import_7_skr03"/>
+            <field name="tax_dest_id" ref="tax_import_7_and_payable_skr03"/>
             <field name="tax_src_id" ref="tax_vst_7_skr03"/>
         </record>
 
@@ -1138,7 +1265,7 @@
         <record id="account_fiscal_position_account_non_eu_purchase_19_skr03" model="account.fiscal.position.account.template">
             <field name="position_id" ref="fiscal_position_non_eu_partner_skr03"/>
             <field name="account_src_id" ref="account_3400" />
-            <field name="account_dest_id" ref="account_3435" />
+            <field name="account_dest_id" ref="account_3551" />
         </record>
         <record id="account_fiscal_position_acc_non_eu_purchase_services_19_skr03" model="account.fiscal.position.account.template">
             <field name="position_id" ref="fiscal_position_non_eu_partner_service_skr03"/>
@@ -1148,7 +1275,7 @@
         <record id="account_fiscal_position_account_non_eu_purchase_7_skr03" model="account.fiscal.position.account.template">
             <field name="position_id" ref="fiscal_position_non_eu_partner_skr03"/>
             <field name="account_src_id" ref="account_3300" />
-            <field name="account_dest_id" ref="account_3430" />
+            <field name="account_dest_id" ref="account_3557" />
         </record>
         <record id="account_fiscal_position_account_eu_no_id_sale_19_skr03" model="account.fiscal.position.account.template">
             <field name="position_id" ref="fiscal_position_eu_no_id_partner_skr03"/>
@@ -1239,11 +1366,11 @@
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_3066" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_eu_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_7_purchase_no_vst_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_3067" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_eu_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_no_vst_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_3070" model="account.account.template">
@@ -1359,11 +1486,11 @@
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_3430" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_7_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_7_purchase_no_vst_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_3435" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_no_vst_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_3440" model="account.account.template">
@@ -1379,17 +1506,21 @@
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_3550" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_purchase_tax_free_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_3551" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_import_19_and_payable_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_3553" model="account.account.template">
             <field name="tax_ids" eval="[(6, 0, [ref('tax_vst_ust_19_purchase_3eck_last_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
+        <record id="account_3557" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_import_7_and_payable_skr03')])]"/>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+        </record>
         <record id="account_3560" model="account.account.template">
             <field name="tax_ids" eval="[(6, 0, [ref('tax_vst_ust_7_purchase_13a_auslagerung_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -1546,12 +1677,16 @@
             <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_sale_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
+        <record id="account_8130" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_3eck_first_skr03')])]"/>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+        </record>
         <record id="account_8135" model="account.account.template">
             <field name="tax_ids" eval="[(6, 0, [ref('tax_free_newcar_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8140" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr03_ohne_vst')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr03_mit_vst')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8150" model="account.account.template">
@@ -1567,7 +1702,7 @@
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8194" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr03_mit_vst')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8195" model="account.account.template">
@@ -1583,23 +1718,27 @@
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8310" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_7_purchase_ust_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_eu_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8315" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_ust_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_eu_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8331" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_ust_goods_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr03')])]"/>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+        </record>
+        <record id="account_8335" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_free_mobil_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8336" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_not_taxable_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8337" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_ust_goods_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_free_bau_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8338" model="account.account.template">
@@ -1619,11 +1758,11 @@
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8514" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr03_ohne_vst')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8515" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr03_mit_vst')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8516" model="account.account.template">
@@ -1635,11 +1774,11 @@
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8574" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr03_ohne_vst')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8575" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr03_mit_vst')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8576" model="account.account.template">
@@ -1658,6 +1797,10 @@
             <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
+        <record id="account_8609" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr03_ohne_vst')])]"/>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+        </record>
         <record id="account_8611" model="account.account.template">
             <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -1674,6 +1817,22 @@
             <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
+        <record id="account_8701" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr03_ohne_vst')])]"/>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+        </record>
+        <record id="account_8702" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr03_mit_vst')])]"/>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+        </record>
+        <record id="account_8703" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr03_ohne_vst')])]"/>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+        </record>
+        <record id="account_8704" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr03_mit_vst')])]"/>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+        </record>
         <record id="account_8705" model="account.account.template">
             <field name="tax_ids" eval="[(6, 0, [ref('tax_export_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -1691,11 +1850,11 @@
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8725" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_7_purchase_ust_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_eu_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8726" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_ust_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_eu_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8731" model="account.account.template">
@@ -1706,8 +1865,12 @@
             <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
+        <record id="account_8738" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_vst_ust_19_purchase_13b_mobil_skr03')])]"/>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+        </record>
         <record id="account_8741" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_ust_goods_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_free_mobil_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8742" model="account.account.template">
@@ -1715,11 +1878,11 @@
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8746" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_7_purchase_ust_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_eu_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8748" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_ust_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_eu_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8750" model="account.account.template">
@@ -1747,7 +1910,7 @@
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8808" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_sale_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8819" model="account.account.template">
@@ -1759,11 +1922,11 @@
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8827" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_third_country_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_export_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8828" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_sale_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8850" model="account.account.template">
@@ -1799,7 +1962,7 @@
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8919" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr03')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_not_taxable_skr03')])]"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
         <record id="account_8920" model="account.account.template">
diff --git a/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml b/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml
index 252f1601cbe..de2314461fc 100644
--- a/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml
+++ b/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml
@@ -4109,7 +4109,7 @@
         <record id="account_1788" model="account.account.template">
             <field name="code">1788</field>
             <field name="name">Aufgeschobene Einfuhr-Umsatzsteuer</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_liabilities_bs_D_8')])]"/>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
@@ -6786,7 +6786,7 @@
         </record>
         <record id="account_3551" model="account.account.template">
             <field name="code">3551</field>
-            <field name="name">Wareneingang, im Drittland steuerbar</field>
+            <field name="name">Wareneingang, im Drittland steuerbar (19%)</field>
             <field name="reconcile" eval="False"/>
             <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_pl_05')])]"/>
             <field name="user_type_id" ref="account.data_account_type_expenses"/>
@@ -6808,6 +6808,14 @@
             <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
+        <record id="account_3557" model="account.account.template">
+            <field name="code">3557</field>
+            <field name="name">Wareneingang, im Drittland steuerbar (7%)</field>
+            <field name="reconcile" eval="False"/>
+            <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_pl_05')])]"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+        </record>
         <record id="account_3558" model="account.account.template">
             <field name="code">3558</field>
             <field name="name">Wareneingang, im anderen EG-Land stb.</field>
@@ -9739,7 +9747,7 @@
         </record>
         <record id="account_8738" model="account.account.template">
             <field name="code">8738</field>
-            <field name="name">Gewährte Skonti aus Lieferungen von Mobilfunkgeräten/Schaltkreisen, für die der Leistungsempfänger die Umsatzsteuer nach § 13b UStG schuldet</field>
+            <field name="name">Gewährte Skonti aus Lieferungen von Mobilfunkgeräten/Schaltkreisen, für die der Leistungsempfänger die Umsatzsteuer nach § 13b Abs. 2 Nr. 10 UStG schuldet</field>
             <field name="reconcile" eval="False"/>
             <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_pl_01')])]"/>
             <field name="user_type_id" ref="account.data_account_type_revenue"/>
@@ -10268,6 +10276,13 @@
             <field name="user_type_id" ref="account.data_account_type_other_income"/>
             <field name="chart_template_id" ref="l10n_de_chart_template"/>
         </record>
+        <record id="account_9089" model="account.account.template">
+            <field name="code">9089</field>
+            <field name="name">Offene Posten aus 2019</field>
+            <field name="reconcile" eval="False"/>
+            <field name="user_type_id" ref="account.data_account_type_other_income"/>
+            <field name="chart_template_id" ref="l10n_de_chart_template"/>
+        </record>
         <record id="l10n_de_chart_template" model="account.chart.template">
                 <field name="code_digits">4</field>
                 <field name="property_account_receivable_id" ref="account_1410"/>
@@ -10281,4 +10296,4 @@
                 <field name="expense_currency_exchange_account_id" ref="account_2150"/>
         </record>
     </data>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml b/addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml
index 83668698edf..143c95210cc 100644
--- a/addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml
+++ b/addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml
@@ -77,7 +77,74 @@
             <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_93')])]"/>
             <field name="tax_group_id" ref="tax_group_0"/>
         </record>
-
+        <record id="tax_eu_19_purchase_ust_no_vst_skr04" model="account.tax.template">
+            <field name="sequence">97</field>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+            <field name="name">19% Umsatzsteuer aus innergem. Erwerb (kein Vorsteuerabzug)</field>
+            <field name="description">19% USt innerg. Erw. - 0% Vorsteuer</field>
+            <field name="amount_type">percent</field>
+            <field name="amount">-19</field>
+            <field name="refund_account_id" ref="chart_skr04_3809"/>
+            <field name="account_id" ref="chart_skr04_3809"/>
+            <field name="type_tax_use">none</field>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_89')])]"/>
+            <field name="tax_group_id" ref="tax_group_19"/>
+        </record>
+        <record id="tax_eu_19_purchase_vst_no_vst_skr04" model="account.tax.template">
+            <field name="sequence">97</field>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+            <field name="name">19% Vorsteuer aus innergem. Erwerb (kein Vorsteuerabzug)</field>
+            <field name="description">19% VSt innerg. Erw. - 0% Vorsteuer</field>
+            <field name="amount_type">percent</field>
+            <field name="amount">19</field>
+            <field name="type_tax_use">none</field>
+            <field name="tax_group_id" ref="tax_group_19"/>
+        </record>
+        <record id="tax_eu_19_purchase_no_vst_skr04" model="account.tax.template">
+            <field name="sequence">20</field>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+            <field name="name">Innergem. Erwerb 19%USt/0%VSt</field>
+            <field name="description">innergem. Erwerb 19% - 0% Vorsteuer</field>
+            <field name="amount_type">group</field>
+            <field name="amount">0</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="children_tax_ids" eval="[(6,0,[ref('tax_eu_19_purchase_ust_no_vst_skr04'), ref('tax_eu_19_purchase_vst_no_vst_skr04')])]"/>
+            <field name="tax_group_id" ref="tax_group_19"/>
+        </record>
+        <record id="tax_eu_7_purchase_ust_no_vst_skr04" model="account.tax.template">
+            <field name="sequence">97</field>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+            <field name="name">7% Umsatzsteuer aus innergem. Erwerb (kein Vorsteuerabzug)</field>
+            <field name="description">7% USt innerg. Erw. - 0% Vorsteuer</field>
+            <field name="amount_type">percent</field>
+            <field name="amount">-7</field>
+            <field name="refund_account_id" ref="chart_skr04_3809"/>
+            <field name="account_id" ref="chart_skr04_3809"/>
+            <field name="type_tax_use">none</field>
+            <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_93')])]"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+        </record>
+        <record id="tax_eu_7_purchase_vst_no_vst_skr04" model="account.tax.template">
+            <field name="sequence">97</field>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+            <field name="name">7% Vorsteuer aus innergem. Erwerb (kein Vorsteuerabzug)</field>
+            <field name="description">7% VSt innerg. Erw. - 0% Vorsteuer</field>
+            <field name="amount_type">percent</field>
+            <field name="amount">7</field>
+            <field name="type_tax_use">none</field>
+            <field name="tax_group_id" ref="tax_group_7"/>
+        </record>
+        <record id="tax_eu_7_purchase_no_vst_skr04" model="account.tax.template">
+            <field name="sequence">20</field>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+            <field name="name">Innergem. Erwerb 7%USt/0%VSt</field>
+            <field name="description">innergem. Erwerb 7% - 0% Vorsteuer</field>
+            <field name="amount_type">group</field>
+            <field name="amount">0</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="children_tax_ids" eval="[(6,0,[ref('tax_eu_7_purchase_ust_no_vst_skr04'), ref('tax_eu_7_purchase_vst_no_vst_skr04')])]"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+        </record>
         <record id="tax_eu_car_purchase_ust_skr04" model="account.tax.template">
             <field name="sequence">99</field>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
@@ -161,31 +228,77 @@
             <field name="tax_group_id" ref="tax_group_0"/>
         </record>
         <record id="tax_import_19_skr04" model="account.tax.template">
-            <field name="sequence">20</field>
+            <field name="sequence">98</field>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
-            <field name="name">19% Einfuhrumsatzsteuer</field>
-            <field name="description">19% EUSt</field>
+            <field name="name">19% Einfuhrumsatzsteuer (abzugsf. Vorsteuer)</field>
+            <field name="description">19% EUSt (abzugsf. Vorsteuer)</field>
             <field name="amount_type">percent</field>
             <field name="amount">19</field>
             <field name="refund_account_id" ref="chart_skr04_1433"/>
             <field name="account_id" ref="chart_skr04_1433"/>
-            <field name="type_tax_use">purchase</field>
+            <field name="type_tax_use">none</field>
             <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_62')])]"/>
             <field name="tax_group_id" ref="tax_group_19"/>
         </record>
-        <record id="tax_import_7_skr04" model="account.tax.template">
+        <record id="tax_import_19_payable_skr04" model="account.tax.template">
+            <field name="sequence">98</field>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+            <field name="name">19% Einfuhrumsatzsteuer (zu bezahlender Aufschub)</field>
+            <field name="description">19% EUSt (zu bezahlender Aufschub)</field>
+            <field name="amount_type">percent</field>
+            <field name="amount">-19</field>
+            <field name="refund_account_id" ref="chart_skr04_3850"/>
+            <field name="account_id" ref="chart_skr04_3850"/>
+            <field name="type_tax_use">none</field>
+            <field name="tax_group_id" ref="tax_group_19"/>
+        </record>
+        <record id="tax_import_19_and_payable_skr04" model="account.tax.template">
             <field name="sequence">21</field>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
-            <field name="name">7% Einfuhrumsatzsteuer</field>
-            <field name="description">7% EUSt</field>
+            <field name="name">19% Einfuhrumsatzsteuer (§21 Abs.3 UstG)</field>
+            <field name="description">Einfuhrumsatzsteuer 19%</field>
+            <field name="amount_type">group</field>
+            <field name="amount">0</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="children_tax_ids" eval="[(6,0,[ref('tax_import_19_skr04'), ref('tax_import_19_payable_skr04')])]"/>
+            <field name="tax_group_id" ref="tax_group_19"/>
+        </record>
+        <record id="tax_import_7_skr04" model="account.tax.template">
+            <field name="sequence">98</field>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+            <field name="name">7% Einfuhrumsatzsteuer (abzugsf. Vorsteuer)</field>
+            <field name="description">7% EUSt (abzugsf. Vorsteuer)</field>
             <field name="amount_type">percent</field>
             <field name="amount">7</field>
             <field name="refund_account_id" ref="chart_skr04_1433"/>
             <field name="account_id" ref="chart_skr04_1433"/>
-            <field name="type_tax_use">purchase</field>
+            <field name="type_tax_use">none</field>
             <field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_62')])]"/>
             <field name="tax_group_id" ref="tax_group_7"/>
         </record>
+        <record id="tax_import_7_payable_skr04" model="account.tax.template">
+            <field name="sequence">98</field>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+            <field name="name">7% Einfuhrumsatzsteuer (zu bezahlender Aufschub)</field>
+            <field name="description">7% EUSt (zu bezahlender Aufschub)</field>
+            <field name="amount_type">percent</field>
+            <field name="amount">-7</field>
+            <field name="refund_account_id" ref="chart_skr04_3850"/>
+            <field name="account_id" ref="chart_skr04_3850"/>
+            <field name="type_tax_use">none</field>
+            <field name="tax_group_id" ref="tax_group_7"/>
+        </record>
+        <record id="tax_import_7_and_payable_skr04" model="account.tax.template">
+            <field name="sequence">21</field>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+            <field name="name">7% Einfuhrumsatzsteuer (§21 Abs.3 UstG)</field>
+            <field name="description">Einfuhrumsatzsteuer 7%</field>
+            <field name="amount_type">group</field>
+            <field name="amount">0</field>
+            <field name="type_tax_use">purchase</field>
+            <field name="children_tax_ids" eval="[(6,0,[ref('tax_import_7_skr04'), ref('tax_import_7_payable_skr04')])]"/>
+            <field name="tax_group_id" ref="tax_group_7"/>
+        </record>
         <record id="tax_eu_purchase_tax_free_skr04" model="account.tax.template">
             <field name="sequence">22</field>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
@@ -965,23 +1078,37 @@
             <field name="children_tax_ids" eval="[(6,0,[ref('tax_ust_7_purchase_13a_auslagerung_skr04'), ref('tax_vst_7_purchase_13a_auslagerung_skr04')])]"/>
             <field name="tax_group_id" ref="tax_group_0"/>
         </record>
+        <record id="fiscal_position_domestic_skr04" model="account.fiscal.position.template">
+            <field name="sequence">1</field>
+            <field name="name">Geschäftspartner Inland</field>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+            <field name="auto_apply" eval="True" />
+            <field name="country_id" ref="base.de"></field>
+        </record>
         <record id="fiscal_position_non_eu_partner_service_skr04" model="account.fiscal.position.template">
+            <field name="sequence">6</field>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
-            <field name="name">Dienstleister Ausland</field>
+            <field name="name">Dienstleister Ausland (Nicht-EU)</field>
         </record>
         <record id="fiscal_position_non_eu_partner_skr04" model="account.fiscal.position.template">
+            <field name="sequence">5</field>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
-            <field name="name">Geschäftspartner Ausland</field>
+            <field name="name">Geschäftspartner Ausland (Nicht-EU)</field>
         </record>
         <record id="fiscal_position_eu_vat_id_partner_skr04" model="account.fiscal.position.template">
+            <field name="sequence">2</field>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
             <field name="name">Geschäftspartner EU (mit USt-ID)</field>
+            <field name="auto_apply" eval="True" />
+            <field name="country_group_id" ref="base.europe"></field>
         </record>
         <record id="fiscal_position_eu_vat_id_partner_service_skr04" model="account.fiscal.position.template">
+            <field name="sequence">3</field>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
             <field name="name">Dienstleister EU (mit USt-ID)</field>
         </record>
         <record id="fiscal_position_eu_no_id_partner_skr04" model="account.fiscal.position.template">
+            <field name="sequence">4</field>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
             <field name="name">Geschäftspartner EU (ohne USt-ID)</field>
         </record>
@@ -1017,12 +1144,12 @@
         </record>
         <record id="chart_skr04_fiscal_position_tax_eu_no_id_purchase_19_skr04" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_eu_no_id_partner_skr04"/>
-            <field name="tax_dest_id" ref="tax_import_19_skr04"/>
+            <field name="tax_dest_id" ref="tax_eu_19_purchase_no_vst_skr04"/>
             <field name="tax_src_id" ref="tax_vst_19_skr04"/>
         </record>
         <record id="chart_skr04_fiscal_position_tax_eu_no_id_purchase_7_skr04" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_eu_no_id_partner_skr04"/>
-            <field name="tax_dest_id" ref="tax_import_7_skr04"/>
+            <field name="tax_dest_id" ref="tax_eu_7_purchase_no_vst_skr04"/>
             <field name="tax_src_id" ref="tax_vst_7_skr04"/>
         </record>
         <record id="chart_skr04_fiscal_position_tax_eu_no_id_sale_19_skr04" model="account.fiscal.position.tax.template">
@@ -1052,7 +1179,7 @@
         </record>
         <record id="chart_skr04_fiscal_position_tax_non_eu_purchase_19_skr04" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_non_eu_partner_skr04"/>
-            <field name="tax_dest_id" ref="tax_import_19_skr04"/>
+            <field name="tax_dest_id" ref="tax_import_19_and_payable_skr04"/>
             <field name="tax_src_id" ref="tax_vst_19_skr04"/>
         </record>
         <record id="chart_skr04_fiscal_position_tax_non_eu_purchase_services_19_skr04" model="account.fiscal.position.tax.template">
@@ -1062,7 +1189,7 @@
         </record>
         <record id="chart_skr04_fiscal_position_tax_non_eu_purchase_7_skr04" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_non_eu_partner_skr04"/>
-            <field name="tax_dest_id" ref="tax_import_7_skr04"/>
+            <field name="tax_dest_id" ref="tax_import_7_and_payable_skr04"/>
             <field name="tax_src_id" ref="tax_vst_7_skr04"/>
         </record>
 
@@ -1134,7 +1261,7 @@
         <record id="chart_skr04_fiscal_position_account_non_eu_purchase_19_skr04" model="account.fiscal.position.account.template">
             <field name="position_id" ref="fiscal_position_non_eu_partner_skr04"/>
             <field name="account_src_id" ref="chart_skr04_5400" />
-            <field name="account_dest_id" ref="chart_skr04_5435" />
+            <field name="account_dest_id" ref="chart_skr04_5551" />
         </record>
         <record id="chart_skr04_fiscal_position_acc_non_eu_purchase_services_19_skr04" model="account.fiscal.position.account.template">
             <field name="position_id" ref="fiscal_position_non_eu_partner_service_skr04"/>
@@ -1144,7 +1271,7 @@
         <record id="chart_skr04_fiscal_position_account_non_eu_purchase_7_skr04" model="account.fiscal.position.account.template">
             <field name="position_id" ref="fiscal_position_non_eu_partner_skr04"/>
             <field name="account_src_id" ref="chart_skr04_5300" />
-            <field name="account_dest_id" ref="chart_skr04_5430" />
+            <field name="account_dest_id" ref="chart_skr04_5557" />
         </record>
         <record id="chart_skr04_fiscal_position_account_eu_no_id_sale_19_skr04" model="account.fiscal.position.account.template">
             <field name="position_id" ref="fiscal_position_eu_no_id_partner_skr04"/>
@@ -1201,17 +1328,21 @@
         <record id="chart_skr04_4125" model="account.account.template">
             <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_sale_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
-        </record>   
+        </record>
+        <record id="chart_skr04_4130" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_3eck_first_skr04')])]"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record> 
         <record id="chart_skr04_4135" model="account.account.template">
             <field name="tax_ids" eval="[(6, 0, [ref('tax_free_newcar_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>   
         <record id="chart_skr04_4139" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr04_mit_vst')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4140" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr04_ohne_vst')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr04_mit_vst')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4150" model="account.account.template">
@@ -1243,11 +1374,15 @@
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4310" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_7_purchase_ust_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_eu_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4315" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_eu_skr04')])]"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record>
+        <record id="chart_skr04_4331" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4336" model="account.account.template">
@@ -1255,7 +1390,7 @@
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4337" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_ust_goods_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_free_bau_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4338" model="account.account.template">
@@ -1278,6 +1413,10 @@
             <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
+        <record id="chart_skr04_4564" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr04_ohne_vst')])]"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record>
         <record id="chart_skr04_4566" model="account.account.template">
             <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_7_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
@@ -1291,11 +1430,11 @@
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4574" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr04_ohne_vst')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4575" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr04_mit_vst')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4576" model="account.account.template">
@@ -1323,7 +1462,7 @@
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4630" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_7_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_not_taxable_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4639" model="account.account.template">
@@ -1378,6 +1517,14 @@
             <field name="tax_ids" eval="[(6, 0, [ref('tax_not_taxable_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
+        <record id="chart_skr04_4702" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr04_mit_vst')])]"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record>
+        <record id="chart_skr04_4704" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_skr04_mit_vst')])]"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record>
         <record id="chart_skr04_4705" model="account.account.template">
             <field name="tax_ids" eval="[(6, 0, [ref('tax_export_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
@@ -1395,11 +1542,11 @@
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4725" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_7_purchase_ust_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_eu_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4726" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_eu_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4731" model="account.account.template">
@@ -1411,7 +1558,7 @@
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4741" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_ust_goods_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_free_mobil_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4742" model="account.account.template">
@@ -1419,11 +1566,11 @@
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4746" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_7_purchase_ust_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_eu_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4748" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_eu_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4750" model="account.account.template">
@@ -1455,7 +1602,7 @@
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4844" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_third_country_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_export_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4845" model="account.account.template">
@@ -1463,7 +1610,7 @@
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4848" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_sale_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_4852" model="account.account.template">
@@ -1510,6 +1657,14 @@
             <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
+        <record id="chart_skr04_5166" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_7_purchase_no_vst_skr04')])]"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record>
+        <record id="chart_skr04_5167" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_no_vst_skr04')])]"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record>
         <record id="chart_skr04_5189" model="account.account.template">
             <field name="tax_ids" eval="[(6, 0, [ref('tax_vst_ust_19_purchase_3eck_last_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
@@ -1539,17 +1694,25 @@
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_5430" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_7_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_7_purchase_no_vst_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_5435" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_19_purchase_no_vst_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_5440" model="account.account.template">
             <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_car_purchase_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
+        <record id="chart_skr04_5550" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_purchase_tax_free_skr04')])]"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record>
+        <record id="chart_skr04_5551" model="account.account.template">
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_import_19_and_payable_skr04')])]"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record>
         <record id="chart_skr04_5553" model="account.account.template">
             <field name="tax_ids" eval="[(6, 0, [ref('tax_vst_ust_19_purchase_3eck_last_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
@@ -1721,7 +1884,7 @@
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_6888" model="account.account.template">
-            <field name="tax_ids" eval="[(6, 0, [ref('tax_free_eu_skr04')])]"/>
+            <field name="tax_ids" eval="[(6, 0, [ref('tax_eu_sale_skr04')])]"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
         <record id="chart_skr04_6892" model="account.account.template">
diff --git a/addons/l10n_de_skr04/data/l10n_de_skr04_chart_data.xml b/addons/l10n_de_skr04/data/l10n_de_skr04_chart_data.xml
index bf2d228287c..5d466ee3f35 100644
--- a/addons/l10n_de_skr04/data/l10n_de_skr04_chart_data.xml
+++ b/addons/l10n_de_skr04/data/l10n_de_skr04_chart_data.xml
@@ -4415,7 +4415,7 @@
         <record id="chart_skr04_3850" model="account.account.template">
             <field name="code">3850</field>
             <field name="name">Aufgeschobene Einfuhrumsatzsteuer</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="tag_ids" eval="[(6, 0, [ref('l10n_de.tag_de_liabilities_bs_D_8')])]"/>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
@@ -4732,6 +4732,14 @@
             <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
+        <record id="chart_skr04_4564" model="account.account.template">
+            <field name="code">4564</field>
+            <field name="name">Provisionsumsätze (§4Nr.8ff.UStG)</field>
+            <field name="reconcile" eval="False"/>
+            <field name="tag_ids" eval="[(6, 0, [ref('l10n_de.tag_de_pl_01')])]"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record>
         <record id="chart_skr04_4566" model="account.account.template">
             <field name="code">4566</field>
             <field name="name">Provisionsumsätze 7 % USt</field>
@@ -5836,6 +5844,22 @@
             <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
+        <record id="chart_skr04_5166" model="account.account.template">
+            <field name="code">5166</field>
+            <field name="name">Einkauf Roh-, Hilfs- und Betriebsstoffe, innergemeinschaftlicher Erwerb ohne Vorsteuer und 7 % Umsatzsteuer</field>
+            <field name="reconcile" eval="False"/>
+            <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_pl_05')])]"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record>
+        <record id="chart_skr04_5167" model="account.account.template">
+            <field name="code">5167</field>
+            <field name="name">Einkauf Roh-, Hilfs- und Betriebsstoffe, innergemeinschaftlicher Erwerb ohne Vorsteuer und 19 % Umsatzsteuer</field>
+            <field name="reconcile" eval="False"/>
+            <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_pl_05')])]"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record>
         <record id="chart_skr04_5189" model="account.account.template">
             <field name="code">5189</field>
             <field name="name">Erwerb Roh-, Hilfs- und Betriebsstoffe letzter Abnehmer Dreiecksgeschäft</field>
@@ -5938,6 +5962,30 @@
             <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
+        <record id="chart_skr04_5550" model="account.account.template">
+            <field name="code">5550</field>
+            <field name="name">Steuerfreier EG-Erwerb</field>
+            <field name="reconcile" eval="False"/>
+            <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_pl_05')])]"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record>
+        <record id="chart_skr04_5551" model="account.account.template">
+            <field name="code">5551</field>
+            <field name="name">Wareneingang, im Drittland steuerbar (19%)</field>
+            <field name="reconcile" eval="False"/>
+            <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_pl_05')])]"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record>
+        <record id="chart_skr04_5552" model="account.account.template">
+            <field name="code">5552</field>
+            <field name="name">Erwerb 1. Abnehmer im Dreiecksgeschäft</field>
+            <field name="reconcile" eval="False"/>
+            <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_pl_05')])]"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record>
         <record id="chart_skr04_5553" model="account.account.template">
             <field name="code">5553</field>
             <field name="name">Erwerb Waren als letzter Abnehmer innerhalb Dreiecksgeschäft</field>
@@ -5946,6 +5994,14 @@
             <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
         </record>
+        <record id="chart_skr04_5557" model="account.account.template">
+            <field name="code">5557</field>
+            <field name="name">Wareneingang, im Drittland steuerbar (7%)</field>
+            <field name="reconcile" eval="False"/>
+            <field name="tag_ids" eval="[(6,0, [ref('l10n_de.tag_de_pl_05')])]"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
+            <field name="chart_template_id" ref="l10n_chart_de_skr04"/>
+        </record>
         <record id="chart_skr04_5559" model="account.account.template">
             <field name="code">5559</field>
             <field name="name">Steuerfreie Einfuhren</field>
diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index becca5a266a..2e88bf0cff4 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -721,7 +721,7 @@ class PosOrder(models.Model):
 
             try:
                 pos_order.action_pos_order_paid()
-            except psycopg2.OperationalError:
+            except psycopg2.DatabaseError:
                 # do not hide transactional errors, the order(s) won't be saved!
                 raise
             except Exception as e:
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 1b4ba84437c..99f68e601ad 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -2659,7 +2659,7 @@ exports.NumpadState = Backbone.Model.extend({
             this.set({
                 buffer: "-" + newChar
             });
-        } else {
+        } else if (!(newChar === '.') || oldBuffer.indexOf('.') === -1) {
             this.set({
                 buffer: (this.get('buffer')) + newChar
             });
diff --git a/addons/purchase/models/account_invoice.py b/addons/purchase/models/account_invoice.py
index 58133887565..4f7b15d8627 100644
--- a/addons/purchase/models/account_invoice.py
+++ b/addons/purchase/models/account_invoice.py
@@ -83,6 +83,12 @@ class AccountInvoice(models.Model):
         if not self.invoice_line_ids:
             #as there's no invoice line yet, we keep the currency of the PO
             self.currency_id = self.purchase_id.currency_id
+
+        vendor_ref = self.purchase_id.partner_ref
+        if vendor_ref:
+            self.reference = ", ".join([self.reference, vendor_ref]) if (
+                    self.reference and vendor_ref not in self.reference) else vendor_ref
+
         new_lines = self.env['account.invoice.line']
         for line in self.purchase_id.order_line - self.invoice_line_ids.mapped('purchase_line_id'):
             data = self._prepare_invoice_line_from_po_line(line)
diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index 6a9f88e39a8..178a077c19e 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -202,18 +202,30 @@ class ProductProduct(models.Model):
             for row in res:
                 fifo_automated_values[(row[0], row[1])] = (row[2], row[3], list(row[4]))
 
-        product_values = {product: 0 for product in self}
-        product_move_ids = {product: [] for product in self}
+        product_values = {product.id: 0 for product in self}
+        product_move_ids = {product.id: [] for product in self}
+
         if to_date:
             domain = [('product_id', 'in', self.ids), ('date', '<=', to_date)] + StockMove._get_all_base_domain()
-            for move in StockMove.search(domain).with_context(prefetch_fields=False):
-                product_values[move.product_id] += move.value
-                product_move_ids[move.product_id].append(move.id)
+            value_field_name = 'value'
         else:
             domain = [('product_id', 'in', self.ids)] + StockMove._get_all_base_domain()
-            for move in StockMove.search(domain).with_context(prefetch_fields=False):
-                product_values[move.product_id] += move.remaining_value
-                product_move_ids[move.product_id].append(move.id)
+            value_field_name = 'remaining_value'
+        
+        StockMove.check_access_rights('read')
+        query = StockMove._where_calc(domain)
+        StockMove._apply_ir_rules(query, 'read')
+        from_clause, where_clause, params = query.get_sql()
+        query_str = """
+            SELECT stock_move.product_id, SUM(COALESCE(stock_move.{}, 0.0)), ARRAY_AGG(stock_move.id)
+            FROM {}
+            WHERE {}
+            GROUP BY stock_move.product_id
+        """.format(value_field_name, from_clause, where_clause)
+        self.env.cr.execute(query_str, params)
+        for product_id, value, move_ids in self.env.cr.fetchall():
+            product_values[product_id] = value
+            product_move_ids[product_id] = move_ids
 
         for product in self:
             if product.cost_method in ['standard', 'average']:
@@ -229,9 +241,9 @@ class ProductProduct(models.Model):
             elif product.cost_method == 'fifo':
                 if to_date:
                     if product.product_tmpl_id.valuation == 'manual_periodic':
-                        product.stock_value = product_values[product]
+                        product.stock_value = product_values[product.id]
                         product.qty_at_date = product.with_context(company_owned=True, owner_id=False).qty_available
-                        product.stock_fifo_manual_move_ids = StockMove.browse(product_move_ids[product])
+                        product.stock_fifo_manual_move_ids = StockMove.browse(product_move_ids[product.id])
                     elif product.product_tmpl_id.valuation == 'real_time':
                         valuation_account_id = product.categ_id.property_stock_valuation_account_id.id
                         value, quantity, aml_ids = fifo_automated_values.get((product.id, valuation_account_id)) or (0, 0, [])
@@ -239,10 +251,10 @@ class ProductProduct(models.Model):
                         product.qty_at_date = quantity
                         product.stock_fifo_real_time_aml_ids = self.env['account.move.line'].browse(aml_ids)
                 else:
-                    product.stock_value, moves = product_values[product], StockMove.browse(product_move_ids[product])
+                    product.stock_value = product_values[product.id]
                     product.qty_at_date = product.with_context(company_owned=True, owner_id=False).qty_available
                     if product.product_tmpl_id.valuation == 'manual_periodic':
-                        product.stock_fifo_manual_move_ids = moves
+                        product.stock_fifo_manual_move_ids = StockMove.browse(product_move_ids[product.id])
                     elif product.product_tmpl_id.valuation == 'real_time':
                         valuation_account_id = product.categ_id.property_stock_valuation_account_id.id
                         value, quantity, aml_ids = fifo_automated_values.get((product.id, valuation_account_id)) or (0, 0, [])
diff --git a/addons/website_sale/models/res_config_settings.py b/addons/website_sale/models/res_config_settings.py
index 287b21450ab..4a96ced5504 100644
--- a/addons/website_sale/models/res_config_settings.py
+++ b/addons/website_sale/models/res_config_settings.py
@@ -9,10 +9,7 @@ class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     def _default_order_mail_template(self):
-        if self.env['ir.module.module'].search([('name', '=', 'website_quote')]).state in ('installed', 'to upgrade'):
-            return self.env.ref('website_quote.confirmation_mail').id
-        else:
-            return self.env.ref('sale.email_template_edi_sale').id
+        return self.env.ref('sale.email_template_edi_sale').id
 
     def _default_recovery_mail_template(self):
         try:
diff --git a/requirements.txt b/requirements.txt
index 4619d232b1f..a94a69d628c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ gevent==1.3.4 ; sys_platform != 'win32' and python_version >= '3.7'
 greenlet==0.4.10 ; python_version < '3.7'
 greenlet==0.4.13 ; python_version >= '3.7'
 html2text==2016.9.19
-Jinja2==2.8.1
+Jinja2==2.10.1
 lxml==3.7.1 ; sys_platform != 'win32' and python_version < '3.7'
 lxml==4.2.3 ; sys_platform != 'win32' and python_version >= '3.7'
 lxml ; sys_platform == 'win32'
diff --git a/setup/win32/winpy_requirements.txt b/setup/win32/winpy_requirements.txt
index f998d871af2..90a4a001195 100644
--- a/setup/win32/winpy_requirements.txt
+++ b/setup/win32/winpy_requirements.txt
@@ -6,7 +6,7 @@ feedparser==5.2.1
 gevent>=1.1.2
 greenlet>=0.4.10
 html2text==2016.9.19
-Jinja2==2.8
+Jinja2==2.10.1
 lxml>=3.5.0
 Mako==1.0.4
 MarkupSafe==0.23