diff --git a/addons/l10n_vn/__openerp__.py b/addons/l10n_vn/__openerp__.py
index d102ab871bd..ef8efe0555d 100644
--- a/addons/l10n_vn/__openerp__.py
+++ b/addons/l10n_vn/__openerp__.py
@@ -5,7 +5,7 @@
 
 {
     "name" : "Vietnam - Accounting",
-    "version" : "1.0",
+    "version" : "2.0",
     "author" : "General Solutions",
     'website': 'http://gscom.vn',
     'category': 'Localization',
diff --git a/addons/l10n_vn/account_tax.xml b/addons/l10n_vn/account_tax.xml
index 107ef8ba626..068839b4079 100644
--- a/addons/l10n_vn/account_tax.xml
+++ b/addons/l10n_vn/account_tax.xml
@@ -2,28 +2,76 @@
 <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>
 
@@ -37,7 +85,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"/>
@@ -48,7 +96,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"/>
@@ -59,7 +107,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 -->
@@ -72,7 +120,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"/>
@@ -83,7 +131,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"/>
@@ -94,7 +142,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_0')])]"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_vn_16')])]"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_vn/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_vn/migrations/2.0/post-migrate_tags_on_taxes.py
new file mode 100644
index 00000000000..fa56fd00dfa
--- /dev/null
+++ b/addons/l10n_vn/migrations/2.0/post-migrate_tags_on_taxes.py
@@ -0,0 +1,6 @@
+from openerp.modules.registry import RegistryManager
+
+def migrate(cr, version):
+    registry = RegistryManager.get(cr.dbname)
+    from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
+    migrate_tags_on_taxes(cr, registry)