summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-04-15 18:33:51 +0200
committerChristophe Simonis <chs@odoo.com>2019-04-15 18:33:51 +0200
commit33f1e5f64be0113e4e3ad7cb8de373d8ab5daa7b (patch)
treebcc933cc17928220ebaf17ddaf2bcf2e6b2d8b3d
parentda28c37a4a2fb8ad300ca93fa5c12b1a4ae2eeb2 (diff)
parent44aedc9b134ce4352301ea231ee486e40b5ef062 (diff)
[MERGE] forward port branch saas-11.3 up to 44aedc9b134
Diffstat
-rw-r--r--addons/account/__init__.py2
-rw-r--r--addons/delivery/models/sale_order.py8
-rw-r--r--addons/delivery/views/delivery_view.xml2
-rw-r--r--addons/l10n_ca/data/account_tax_data.xml2
-rw-r--r--addons/l10n_de_skr03/data/account.account.template.csv10
-rw-r--r--addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml247
-rw-r--r--addons/l10n_de_skr04/data/account.account.template.csv9
-rw-r--r--addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml279
-rw-r--r--addons/point_of_sale/models/pos_order.py2
-rw-r--r--addons/point_of_sale/static/src/js/models.js2
-rw-r--r--addons/purchase/models/account_invoice.py6
-rw-r--r--addons/stock_account/models/product.py36
-rw-r--r--requirements.txt2
-rw-r--r--setup/win32/winpy_requirements.txt2
14 files changed, 485 insertions, 124 deletions
diff --git a/addons/account/__init__.py b/addons/account/__init__.py
index 866c39de02e..86d81923e02 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/delivery/models/sale_order.py b/addons/delivery/models/sale_order.py
index 414b46fe561..ddaff58caa9 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 36c0b222064..11ad0c1bdc4 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.account.template.csv b/addons/l10n_de_skr03/data/account.account.template.csv
index 092915add9a..6c2766952d8 100644
--- a/addons/l10n_de_skr03/data/account.account.template.csv
+++ b/addons/l10n_de_skr03/data/account.account.template.csv
@@ -510,7 +510,7 @@
"account_1784","1784","USt EG-Erwerb Neufahrzeuge ohne UStID","l10n_de.tag_de_asset_bs_B_II_4","account.data_account_type_current_liabilities","l10n_de_skr03.l10n_de_chart_template","False"
"account_1785","1785","Umsatzsteuer nach § 13b UStG","l10n_de.tag_de_asset_bs_B_II_4","account.data_account_type_current_liabilities","l10n_de_skr03.l10n_de_chart_template","False"
"account_1787","1787","Umsatzsteuer nach § 13b UStG 19%","l10n_de.tag_de_asset_bs_B_II_4","account.data_account_type_current_liabilities","l10n_de_skr03.l10n_de_chart_template","False"
-"account_1788","1788","Aufgeschobene Einfuhr-Umsatzsteuer","l10n_de.tag_de_liabilities_bs_D_8","account.data_account_type_current_liabilities","l10n_de_skr03.l10n_de_chart_template","False"
+"account_1788","1788","Aufgeschobene Einfuhr-Umsatzsteuer","l10n_de.tag_de_liabilities_bs_D_8","account.data_account_type_current_liabilities","l10n_de_skr03.l10n_de_chart_template","True"
"account_1789","1789","Umsatzsteuer laufendes Jahr","l10n_de.tag_de_liabilities_bs_D_8","account.data_account_type_current_liabilities","l10n_de_skr03.l10n_de_chart_template","False"
"account_1790","1790","Umsatzsteuer Vorjahr","l10n_de.tag_de_liabilities_bs_D_8","account.data_account_type_current_liabilities","l10n_de_skr03.l10n_de_chart_template","False"
"account_1791","1791","Umsatzsteuer frühere Jahre","l10n_de.tag_de_liabilities_bs_D_8","account.data_account_type_current_liabilities","l10n_de_skr03.l10n_de_chart_template","False"
@@ -845,9 +845,10 @@
"account_3505","3505","Wareneingang 5,5% Vorsteuer","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr03.l10n_de_chart_template","False"
"account_3540","3540","Wareneingang 10,7% Vorsteuer","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr03.l10n_de_chart_template","False"
"account_3550","3550","Steuerfreier EG-Erwerb","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr03.l10n_de_chart_template","False"
-"account_3551","3551","Wareneingang, im Drittland steuerbar","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr03.l10n_de_chart_template","False"
+"account_3551","3551","Wareneingang, im Drittland steuerbar (19%)","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr03.l10n_de_chart_template","False"
"account_3552","3552","Erwerb 1. Abnehmer im Dreiecksgeschäft","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr03.l10n_de_chart_template","False"
"account_3553","3553","Erwerb Waren als letzter Abnehmer innerhalb Dreiecksgeschäft 19% Vorsteuer und 19% Umsatzsteuer","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr03.l10n_de_chart_template","False"
+"account_3557","3551","Wareneingang, im Drittland steuerbar (7%)","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr03.l10n_de_chart_template","False"
"account_3558","3558","Wareneingang, im anderen EG-Land stb.","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr03.l10n_de_chart_template","False"
"account_3559","3559","Steuerfreie Einfuhren","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr03.l10n_de_chart_template","False"
"account_3560","3560","Waren aus USt-Lager 7% Vorsteuer, 7% USt","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr03.l10n_de_chart_template","False"
@@ -1214,7 +1215,7 @@
"account_8730","8730","Gewährte Skonti","l10n_de.tag_de_pl_01","account.data_account_type_revenue","l10n_de_skr03.l10n_de_chart_template","False"
"account_8731","8731","Gewährte Skonti 7% USt","l10n_de.tag_de_pl_01","account.data_account_type_revenue","l10n_de_skr03.l10n_de_chart_template","False"
"account_8736","8736","Gewährte Skonti 19% USt","l10n_de.tag_de_pl_01","account.data_account_type_revenue","l10n_de_skr03.l10n_de_chart_template","False"
-"account_8738","8738","Gewährte Skonti aus Lieferungen von Mobilfunkgeräten/Schaltkreisen, für die der Leistungsempfänger die Umsatzsteuer nach § 13b UStG schuldet","l10n_de.tag_de_pl_01","account.data_account_type_revenue","l10n_de_skr03.l10n_de_chart_template","False"
+"account_8738","8738","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","l10n_de.tag_de_pl_01","account.data_account_type_revenue","l10n_de_skr03.l10n_de_chart_template","False"
"account_8741","8741","Gewährte Skonti Leistungen §13b UStG","l10n_de.tag_de_pl_01","account.data_account_type_revenue","l10n_de_skr03.l10n_de_chart_template","False"
"account_8742","8742","Gewährte Skonti aus Erlöse aus im anderen EU-Land steuerpflichtigen sonstigen Leistungen, für die der Leistungsempfänger die Umsatzsteuer schuldet","l10n_de.tag_de_pl_01","account.data_account_type_revenue","l10n_de_skr03.l10n_de_chart_template","False"
"account_8743","8743","Gewährte Skonti stfr. EG-Lieferung","l10n_de.tag_de_pl_01","account.data_account_type_revenue","l10n_de_skr03.l10n_de_chart_template","False"
@@ -1280,4 +1281,5 @@
"account_9001","9001","Saldenvorträge","","account.data_account_type_other_income","l10n_de_skr03.l10n_de_chart_template","False"
"account_9008","9008","Saldenvorträge Debitoren","","account.data_account_type_other_income","l10n_de_skr03.l10n_de_chart_template","False"
"account_9009","9009","Saldenvorträge Kreditoren","","account.data_account_type_other_income","l10n_de_skr03.l10n_de_chart_template","False"
-"account_9090","9090","Summenvortragskonto","","account.data_account_type_other_income","l10n_de_skr03.l10n_de_chart_template","False" \ No newline at end of file
+"account_9089","9089","Offene Posten aus 2019","","account.data_account_type_other_income","l10n_de_skr03.l10n_de_chart_template","False"
+"account_9090","9090","Summenvortragskonto","","account.data_account_type_other_income","l10n_de_skr03.l10n_de_chart_template","False"
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_skr04/data/account.account.template.csv b/addons/l10n_de_skr04/data/account.account.template.csv
index 77734af2205..e105eb7e831 100644
--- a/addons/l10n_de_skr04/data/account.account.template.csv
+++ b/addons/l10n_de_skr04/data/account.account.template.csv
@@ -548,7 +548,7 @@
"chart_skr04_3840","3840","USt laufendes Jahr","l10n_de.tag_de_liabilities_bs_D_8","account.data_account_type_current_liabilities","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_3841","3841","USt Vorjahr","l10n_de.tag_de_liabilities_bs_D_8","account.data_account_type_non_current_liabilities","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_3845","3845","USt frühere Jahre","l10n_de.tag_de_liabilities_bs_D_8","account.data_account_type_non_current_liabilities","l10n_de_skr04.l10n_chart_de_skr04",""
-"chart_skr04_3850","3850","Aufgeschobene Einfuhrumsatzsteuer","l10n_de.tag_de_liabilities_bs_D_8","account.data_account_type_current_liabilities","l10n_de_skr04.l10n_chart_de_skr04",""
+"chart_skr04_3850","3850","Aufgeschobene Einfuhrumsatzsteuer","l10n_de.tag_de_liabilities_bs_D_8","account.data_account_type_current_liabilities","l10n_de_skr04.l10n_chart_de_skr04","True"
"chart_skr04_3851","3851","Unrichtig oder unberechtigt ausgewiesene Umsatzsteuer","l10n_de.tag_de_asset_bs_B_II_4","account.data_account_type_current_liabilities","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_3854","3854","Steuerzahlungen an andere Länder ","l10n_de.tag_de_liabilities_bs_D_8","account.data_account_type_current_liabilities","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_3860","3860","Verbindlichkeiten aus Umsatzsteuer","l10n_de.tag_de_liabilities_bs_D_8","account.data_account_type_current_liabilities","l10n_de_skr04.l10n_chart_de_skr04",""
@@ -588,6 +588,7 @@
"chart_skr04_4510","4510","Erlöse Abfallverwertung","l10n_de.tag_de_pl_01","account.data_account_type_revenue","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_4520","4520","Erlöse Leergut","l10n_de.tag_de_pl_01","account.data_account_type_revenue","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_4560","4560","Provisionsumsätze","l10n_de.tag_de_pl_01","account.data_account_type_revenue","l10n_de_skr04.l10n_chart_de_skr04",""
+"chart_skr04_4564","4564","Provisionsumsätze (§4Nr.8ff.UStG)","l10n_de.tag_de_pl_01","account.data_account_type_revenue","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_4566","4566","Provisionsumsätze 7 % USt","l10n_de.tag_de_pl_01","account.data_account_type_revenue","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_4569","4569","Provisionsumsätze 19 % USt","l10n_de.tag_de_pl_01","account.data_account_type_revenue","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_4570","4570","Sonstige Erträge aus Provisionen, Lizenzen und Patenten","l10n_de.tag_de_pl_04","account.data_account_type_revenue","l10n_de_skr04.l10n_chart_de_skr04",""
@@ -726,6 +727,8 @@
"chart_skr04_5130","5130","Einkauf - Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_5160","5160","Einkauf - Roh-, Hilfs- und Betriebsstoffe, innergem. Erwerb 7% VSt und 7% USt","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_5162","5162","Einkauf - Roh-, Hilfs- und Betriebsstoffe, innergem. Erwerb 19% VSt und 19% USt","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
+"chart_skr04_5166","5166","Einkauf Roh-, Hilfs- und Betriebsstoffe, innergemeinschaftlicher Erwerb ohne Vorsteuer und 7 % Umsatzsteuer","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
+"chart_skr04_5167","5167","Einkauf Roh-, Hilfs- und Betriebsstoffe, innergemeinschaftlicher Erwerb ohne Vorsteuer und 19 % Umsatzsteuer","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_5189","5189","Erwerb Roh-, Hilfs- und Betriebsstoffe letzter Abnehmer Dreiecksgeschäft","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_5190","5190","Energiestoffe ( Fertigung )","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_5191","5191","Energiestoffe (Fertigung) 7% Vorsteuer","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
@@ -739,7 +742,11 @@
"chart_skr04_5430","5430","Innergemeinschaftlicher Erwerb ohne Vorsteuerabzug und 7% Umsatzsteuer","","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_5435","5435","Innergemeinschaftlicher Erwerb ohne Vorsteuerabzug und 19% Umsatzsteuer","","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_5440","5440","innergem. Erwerb Neufahrz. o. UStID 19 % VSt und 19 % USt","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
+"chart_skr04_5550","5550","Steuerfreier EG-Erwerb","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
+"chart_skr04_5551","5551","Wareneingang, im Drittland steuerbar (19%)","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
+"chart_skr04_5552","5552","Erwerb 1. Abnehmer im Dreiecksgeschäft","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_5553","5553","Erwerb Waren als letzter Abnehmer innerhalb Dreiecksgeschäft","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
+"chart_skr04_5557","5557","Wareneingang, im Drittland steuerbar (7%)","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_5559","5559","Steuerfreie Einfuhren","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_5600","5600","Nicht abziehbare Vorsteuer","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
"chart_skr04_5610","5610","Nicht abziehbare Vorsteuer 7 %","l10n_de.tag_de_pl_05","account.data_account_type_expenses","l10n_de_skr04.l10n_chart_de_skr04",""
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..408719aa2db 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"/>
@@ -348,7 +461,7 @@
<field name="account_id" ref="chart_skr04_1401"/>
<field name="type_tax_use">purchase</field>
<field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_66')])]"/>
- <field name="tax_group_id" ref="tax_group_7"/>
+ <field name="tax_group_id" ref="tax_group_7"/>
</record>
<record id="tax_vst_no_ustpflicht_skr04" model="account.tax.template">
<field name="sequence">16</field>
@@ -386,7 +499,7 @@
<field name="type_tax_use">purchase</field>
<field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_66')])]"/>
<field name="tax_group_id" ref="tax_group_7"/>
- <field name="price_include" eval="True"/>
+ <field name="price_include" eval="True"/>
</record>
<record id="tax_vst_55_farmer_skr04" model="account.tax.template">
<field name="sequence">26</field>
@@ -399,7 +512,7 @@
<field name="account_id" ref="chart_skr04_1400"/>
<field name="type_tax_use">purchase</field>
<field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_66')])]"/>
- <field name="tax_group_id" ref="tax_group_55"/>
+ <field name="tax_group_id" ref="tax_group_55"/>
</record>
<record id="tax_vst_107_farmer_skr04" model="account.tax.template">
<field name="sequence">27</field>
@@ -412,7 +525,7 @@
<field name="account_id" ref="chart_skr04_1400"/>
<field name="type_tax_use">purchase</field>
<field name="tag_ids" eval="[(6,0,[ref('l10n_de.tag_de_66')])]"/>
- <field name="tax_group_id" ref="tax_group_107"/>
+ <field name="tax_group_id" ref="tax_group_107"/>
</record>
<record id="tax_ust_19_eu_skr04" model="account.tax.template">
<field name="sequence">21</field>
@@ -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>
<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">
@@ -1225,7 +1356,7 @@
<record id="chart_skr04_4165" 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>
<record id="chart_skr04_4185" 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"/>
@@ -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">
@@ -1433,7 +1580,7 @@
<record id="chart_skr04_4760" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
- </record>
+ </record>
<record id="chart_skr04_4780" 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"/>
@@ -1441,7 +1588,7 @@
<record id="chart_skr04_4790" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
- </record>
+ </record>
<record id="chart_skr04_4836" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_ust_19_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
@@ -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,10 +1657,18 @@
<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"/>
- </record>
+ </record>
<record id="chart_skr04_5191" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_vst_7_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
@@ -1521,11 +1676,11 @@
<record id="chart_skr04_5192" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_vst_19_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
- </record>
+ </record>
<record id="chart_skr04_5300" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_vst_7_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
- </record>
+ </record>
<record id="chart_skr04_5400" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_vst_19_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"/>
@@ -1585,11 +1748,11 @@
<record id="chart_skr04_5725" model="account.account.template">
<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>
<record id="chart_skr04_5731" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_vst_7_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
- </record>
+ </record>
<record id="chart_skr04_5734" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_vst_7_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
@@ -1609,11 +1772,11 @@
<record id="chart_skr04_5743" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_eu_7_purchase_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
- </record>
+ </record>
<record id="chart_skr04_5750" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_vst_7_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
- </record>
+ </record>
<record id="chart_skr04_5754" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_vst_7_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
@@ -1625,11 +1788,11 @@
<record id="chart_skr04_5760" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_vst_19_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
- </record>
+ </record>
<record id="chart_skr04_5780" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_vst_7_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
- </record>
+ </record>
<record id="chart_skr04_5784" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_vst_7_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
@@ -1649,7 +1812,7 @@
<record id="chart_skr04_5792" 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"/>
- </record>
+ </record>
<record id="chart_skr04_5794" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_vst_55_farmer_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
@@ -1669,7 +1832,7 @@
<record id="chart_skr04_5908" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_vst_7_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
- </record>
+ </record>
<record id="chart_skr04_5910" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_ust_vst_7_purchase_13b_bau_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
@@ -1693,7 +1856,7 @@
<record id="chart_skr04_5925" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_vst_ust_19_purchase_13b_werk_ausland_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
- </record>
+ </record>
<record id="chart_skr04_5951" model="account.account.template">
<field name="tax_ids" eval="[(6, 0, [ref('tax_vst_ust_19_purchase_13b_werk_ausland_skr04')])]"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
@@ -1721,13 +1884,13 @@
<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">
<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>
<record id="chart_skr04_6931" 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"/>
@@ -1747,5 +1910,5 @@
<record id="chart_skr04_6938" model="account.account.template">
<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>
</odoo>
diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index 44148be9ec4..d5eff60786f 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -738,7 +738,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 fec7dc6b05f..097e3e7cd7f 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -2664,7 +2664,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 117fd84b633..a6b0513bd20 100644
--- a/addons/purchase/models/account_invoice.py
+++ b/addons/purchase/models/account_invoice.py
@@ -102,6 +102,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 ea8c358ba91..c7f02a51778 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -209,18 +209,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']:
@@ -236,9 +248,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, [])
@@ -246,10 +258,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/requirements.txt b/requirements.txt
index e95eb80da24..5c35069be76 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,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
libsass==0.12.3
lxml==3.7.1 ; sys_platform != 'win32' and python_version < '3.7'
lxml==4.2.3 ; sys_platform != 'win32' and python_version >= '3.7'
diff --git a/setup/win32/winpy_requirements.txt b/setup/win32/winpy_requirements.txt
index b2978d32134..1e978fcd061 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
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-23 23:01:36 +0000