[MERGE] forward port branch saas-12.4 up to 98a55917a60

2 files changed, 15 insertions, 1 deletions

diff --git a/addons/l10n_es/data/account.account.template-common.csv b/addons/l10n_es/data/account.account.template-common.csv
index 4ddd6c3bbbc..9ceb82640ae 100644
--- a/addons/l10n_es/data/account.account.template-common.csv
+++ b/addons/l10n_es/data/account.account.template-common.csv
@@ -277,7 +277,7 @@
 "account_common_523","Proveedores de inmovilizado a corto plazo","523","account.data_account_type_payable","l10n_es.account_chart_template_common","l10n_es.account_group_523","True"
 "account_common_524","Acreedores por arrendamiento financiero a corto plazo","524","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_524","False"
 "account_common_525","Efectos a pagar a corto plazo","525","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_525","False"
-"account_common_526","Dividendo activo a pagar","526","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_526","False"
+"account_common_526","Dividendo activo a pagar","526","account.data_account_type_payable","l10n_es.account_chart_template_common","l10n_es.account_group_526","True"
 "account_common_527","Intereses a corto plazo de deudas con entidades de crédito","527","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_527","False"
 "account_common_528","Intereses a corto plazo de deudas","528","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_528","False"
 "account_common_5290","Provisión a corto plazo por retribuciones al personal","5290","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_5290","True"
diff --git a/addons/l10n_es/data/account_tax_data.xml b/addons/l10n_es/data/account_tax_data.xml
index 9461c865a72..dca71560db1 100644
--- a/addons/l10n_es/data/account_tax_data.xml
+++ b/addons/l10n_es/data/account_tax_data.xml
@@ -445,6 +445,7 @@
         <field name="description">P_IVA21_SP_IN</field>
         <field name="type_tax_use">purchase</field>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_10_11'), ref('mod_303_14_15_purchase'), ref('mod_303_36_37'), ref('mod_303_40_41')])]"/>
         <field name="amount_type">percent</field>
         <field name="amount" eval="21"/>
         <field name="tax_group_id" ref="tax_group_iva_21"/>
@@ -550,6 +551,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="amount_type">percent</field>
         <field name="amount" eval="21"/>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_38_39'), ref('mod_303_40_41'), ref('mod_303_10_11'), ref('mod_303_14_15_purchase')])]"/>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         <field name="tax_group_id" ref="tax_group_iva_21"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -716,6 +718,7 @@
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_12_13'), ref('mod_303_14_15_purchase'), ref('mod_303_28_29'), ref('mod_303_40_41')])]"/>
         <field name="name">IVA 4% Adquisición de servicios extracomunitarios</field>
         <field name="tax_group_id" ref="tax_group_iva_4"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -767,6 +770,7 @@
         <field name="description">P_IVA10_SP_EX</field>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         <field name="amount_type">percent</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_12_13'), ref('mod_303_14_15_purchase'), ref('mod_303_28_29'), ref('mod_303_40_41')])]"/>
         <field name="type_tax_use">purchase</field>
         <field name="name">IVA 10% Adquisición de servicios extracomunitarios</field>
         <field name="tax_group_id" ref="tax_group_iva_10"/>
@@ -820,6 +824,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="amount" eval="21"/>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_12_13'), ref('mod_303_14_15_purchase'), ref('mod_303_28_29'), ref('mod_303_40_41')])]"/>
         <field name="amount_type">percent</field>
         <field name="tax_group_id" ref="tax_group_iva_21"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
@@ -869,6 +874,7 @@
         <field name="amount" eval="4"/>
         <field name="description">P_IVA4_IC_BC</field>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_36_37'), ref('mod_303_40_41'), ref('mod_303_10_11'), ref('mod_303_14_15_purchase')])]"/>
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="name">IVA 4% Adquisición Intracomunitario. Bienes corrientes</field>
@@ -924,6 +930,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="name">IVA 4% Adquisición Intracomunitario. Bienes de inversión</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_38_39'), ref('mod_303_40_41'), ref('mod_303_10_11'), ref('mod_303_14_15_purchase')])]"/>
         <field name="tax_group_id" ref="tax_group_iva_4"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -972,6 +979,7 @@
         <field name="amount" eval="10"/>
         <field name="description">P_IVA10_IC_BC</field>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_36_37'), ref('mod_303_40_41'), ref('mod_303_10_11'), ref('mod_303_14_15_purchase')])]"/>
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="name">IVA 10% Adquisición Intracomunitario. Bienes corrientes</field>
@@ -1026,6 +1034,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="name">IVA 10% Adquisición Intracomunitario. Bienes de inversión</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_38_39'), ref('mod_303_40_41'), ref('mod_303_10_11'), ref('mod_303_14_15_purchase')])]"/>
         <field name="tax_group_id" ref="tax_group_iva_10"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -3068,6 +3077,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="name">IVA 10% Adquisición de servicios intracomunitarios</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_10_11'), ref('mod_303_14_15_purchase'), ref('mod_303_36_37'), ref('mod_303_40_41')])]"/>
         <field name="tax_group_id" ref="tax_group_iva_10"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -3119,6 +3129,7 @@
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="name">IVA 4% Adquisición de servicios intracomunitarios</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_10_11'), ref('mod_303_14_15_purchase'), ref('mod_303_36_37'), ref('mod_303_40_41')])]"/>
         <field name="tax_group_id" ref="tax_group_iva_4"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
@@ -3392,6 +3403,7 @@
         <field name="description">P_IVA4_ISP</field>
         <field name="name">IVA 4% Compra con Inversión del Sujeto Pasivo Nacional</field>
         <field name="type_tax_use">purchase</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_28_29'), ref('mod_303_40_41'), ref('mod_303_12_13'), ref('mod_303_14_15_purchase')])]"/>
         <field name="amount_type">percent</field>
         <field name="amount" eval="4"/>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
@@ -3443,6 +3455,7 @@
         <field name="description">P_IVA10_ISP</field>
         <field name="name">IVA 10% Compra con Inversión del Sujeto Pasivo Nacional</field>
         <field name="type_tax_use">purchase</field>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_28_29'), ref('mod_303_40_41'), ref('mod_303_12_13'), ref('mod_303_14_15_purchase')])]"/>
         <field name="amount_type">percent</field>
         <field name="amount" eval="10"/>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
@@ -3496,6 +3509,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="amount_type">percent</field>
         <field name="amount" eval="21"/>
+        <field name="tag_ids" eval="[(6, False, [ref('mod_303_28_29'), ref('mod_303_40_41'), ref('mod_303_12_13'), ref('mod_303_14_15_purchase')])]"/>
         <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         <field name="tax_group_id" ref="tax_group_iva_21"/>
         <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),