[MERGE] forward port branch saas-11 up to dce35ca44b9

1 files changed, 66 insertions, 18 deletions

diff --git a/addons/l10n_vn/data/account_tax_data.xml b/addons/l10n_vn/data/account_tax_data.xml
index ce7787c7a71..b455ec18332 100644
--- a/addons/l10n_vn/data/account_tax_data.xml
+++ b/addons/l10n_vn/data/account_tax_data.xml
@@ -1,28 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <!-- Tax Definitions -->
-    <record id="tax_tag_purchase_10" model="account.account.tag">
-        <field name="name">Thuế GTGT được khấu trừ 10%</field>
+    <record id="tag_vn_01" model="account.account.tag">
+        <field name="name">HHDV mua vào</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tax_tag_purchase_5" model="account.account.tag">
-        <field name="name">Thuế GTGT được khấu trừ 5%</field>
+    <record id="tag_vn_02" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV mua vào</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tax_tag_purchase_0" model="account.account.tag">
-        <field name="name">Thuế GTGT được khấu trừ 0%</field>
+    <record id="tag_vn_03" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV mua vào chịu thuế 0%</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tax_tag_sale_10" model="account.account.tag">
-        <field name="name">Thuế GTGT phải nộp 10%</field>
+    <record id="tag_vn_04" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV mua vào chịu thuế 5%</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tax_tag_sale_5" model="account.account.tag">
-        <field name="name">Thuế GTGT phải nộp 5%</field>
+    <record id="tag_vn_05" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV mua vào chịu thuế 10%</field>
         <field name="applicability">taxes</field>
     </record>
-    <record id="tax_tag_sale_0" model="account.account.tag">
-        <field name="name">Thuế GTGT phải nộp 0%</field>
+    <record id="tag_vn_06" model="account.account.tag">
+        <field name="name">Giá trị HHDV mua vào</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_07" model="account.account.tag">
+        <field name="name">Giá trị HHDV mua vào chịu thuế 0%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_08" model="account.account.tag">
+        <field name="name">Giá trị HHDV mua vào chịu thuế 5%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_09" model="account.account.tag">
+        <field name="name">Giá trị HHDV mua vào chịu thuế 10%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_10" model="account.account.tag">
+        <field name="name">HHDV bán ra</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_11" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV bán ra</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_12" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV bán ra chịu thuế 0%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_13" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV bán ra chịu thuế 5%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_14" model="account.account.tag">
+        <field name="name">Thuế GTGT HHDV bán ra chịu thuế 10%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_15" model="account.account.tag">
+        <field name="name">Giá trị HHDV bán ra</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_16" model="account.account.tag">
+        <field name="name">Giá trị HHDV bán ra chịu thuế 0%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_17" model="account.account.tag">
+        <field name="name">Giá trị HHDV bán ra chịu thuế 5%</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_vn_18" model="account.account.tag">
+        <field name="name">Giá trị HHDV bán ra chịu thuế 10%</field>
         <field name="applicability">taxes</field>
     </record>
 
@@ -36,7 +84,7 @@
         <field name="account_id" ref="chart1331"/>
         <field name="refund_account_id" ref="chart1331"/>
         <field name="type_tax_use">purchase</field>
-        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_purchase_10')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_vn_09'),ref('tag_vn_05')])]"/>
     </record>
     <record id="tax_purchase_vat5" model="account.tax.template">
         <field name="chart_template_id" ref="vn_template"/>
@@ -47,7 +95,7 @@
         <field name="account_id" ref="chart1331"/>
         <field name="refund_account_id" ref="chart1331"/>
         <field name="type_tax_use">purchase</field>
-        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_purchase_5')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_vn_08'),ref('tag_vn_04')])]"/>
     </record>
     <record id="tax_purchase_vat0" model="account.tax.template">
         <field name="chart_template_id" ref="vn_template"/>
@@ -58,7 +106,7 @@
         <field name="account_id" ref="chart1331"/>
         <field name="refund_account_id" ref="chart1331"/>
         <field name="type_tax_use">purchase</field>
-        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_purchase_0')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_vn_07')])]"/>
     </record>
 
     <!-- for sale -->
@@ -71,7 +119,7 @@
         <field name="account_id" ref="chart33311"/>
         <field name="refund_account_id" ref="chart33311"/>
         <field name="type_tax_use">sale</field>
-        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_sale_10')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_vn_18'),ref('tag_vn_14')])]"/>
     </record>
     <record id="tax_sale_vat5" model="account.tax.template">
         <field name="chart_template_id" ref="vn_template"/>
@@ -82,7 +130,7 @@
         <field name="account_id" ref="chart33311"/>
         <field name="refund_account_id" ref="chart33311"/>
         <field name="type_tax_use">sale</field>
-        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_sale_5')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_vn_17'),ref('tag_vn_13')])]"/>
     </record>
     <record id="tax_sale_vat0" model="account.tax.template">
         <field name="chart_template_id" ref="vn_template"/>
@@ -93,6 +141,6 @@
         <field name="account_id" ref="chart33311"/>
         <field name="refund_account_id" ref="chart33311"/>
         <field name="type_tax_use">sale</field>
-        <field name="tag_ids" eval="[(6,0,[ref('tax_tag_sale_0')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_vn_16')])]"/>
     </record>
 </odoo>