From 3c67bf038fcdb58663680d806587b03974c412cb Mon Sep 17 00:00:00 2001
From: Jose Morales <jose@vauxoo.com>
Date: Thu, 29 Dec 2016 22:31:16 +0100
Subject: [PATCH] [FIX] l10n_mx: add missing account in chart template.  Some
 cash basis taxes were assigning the account 208.01.01 but this account was
 not created. Also add tax group

---
 addons/l10n_mx/__manifest__.py             |  1 +
 addons/l10n_mx/data/account_data.xml       | 29 ++++++++++++++++++++++
 addons/l10n_mx/data/account_tax_data.xml   | 14 +++++++++--
 addons/l10n_mx/data/l10n_mx_chart_data.xml | 11 ++++++--
 addons/l10n_mx/models/chart_template.py    | 18 ++++++--------
 5 files changed, 59 insertions(+), 14 deletions(-)
 create mode 100644 addons/l10n_mx/data/account_data.xml

diff --git a/addons/l10n_mx/__manifest__.py b/addons/l10n_mx/__manifest__.py
index 7626d69bcaf..d6476fae95c 100644
--- a/addons/l10n_mx/__manifest__.py
+++ b/addons/l10n_mx/__manifest__.py
@@ -38,6 +38,7 @@ With this module you will have:
     "data": [
         "data/account_tag_data.xml",
         "data/l10n_mx_chart_data.xml",
+        "data/account_data.xml",
         "data/account_tax_data.xml",
         "data/account_chart_template_data.yml",
     ],
diff --git a/addons/l10n_mx/data/account_data.xml b/addons/l10n_mx/data/account_data.xml
new file mode 100644
index 00000000000..68f4a53a17c
--- /dev/null
+++ b/addons/l10n_mx/data/account_data.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+
+        <!-- Account Tax Group -->
+        <record id="tax_group_iva_ret" model="account.tax.group">
+            <field name="name">IVA-RET</field>
+        </record>
+        <record id="tax_group_iva" model="account.tax.group">
+            <field name="name">IVA</field>
+        </record>
+        <record id="tax_group_iva_exent" model="account.tax.group">
+            <field name="name">IVA-EXENTO</field>
+        </record>
+        <record id="tax_group_isr" model="account.tax.group">
+            <field name="name">ISR</field>
+        </record>
+        <record id="tax_group_isr_ret" model="account.tax.group">
+            <field name="name">ISR-RET</field>
+        </record>
+        <record id="tax_group_ieps" model="account.tax.group">
+            <field name="name">IEPS</field>
+        </record>
+        <record id="tax_group_ietu" model="account.tax.group">
+            <field name="name">IETU</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/addons/l10n_mx/data/account_tax_data.xml b/addons/l10n_mx/data/account_tax_data.xml
index 47382e1912e..c5e300e1275 100644
--- a/addons/l10n_mx/data/account_tax_data.xml
+++ b/addons/l10n_mx/data/account_tax_data.xml
@@ -46,25 +46,27 @@
     <record id="tax9" model="account.tax.template">
         <field name="chart_template_id" ref="mx_coa"/>
         <field name="name">IVA(0%) VENTAS</field>
-        <field name="description">ITAX_010-IN</field>
+        <field name="description">IVA</field>
         <field name="amount">0</field>
         <field name="amount_type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="account_id" ref="cuenta209_01"/>
         <field name="refund_account_id" ref="cuenta209_01"/>
         <field name="tag_ids" eval="[(6,0,[ref('tax_tag_01')])]"/>
+        <field name="tax_group_id" ref="tax_group_iva"/>
     </record>
 
     <record id="tax12" model="account.tax.template">
         <field name="chart_template_id" ref="mx_coa"/>
         <field name="name">IVA(16%) VENTAS</field>
-        <field name="description">ITAX_160-IN</field>
+        <field name="description">IVA</field>
         <field name="amount">16</field>
         <field name="amount_type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="account_id" ref="cuenta209_01"/>
         <field name="refund_account_id" ref="cuenta209_01"/>
         <field name="tag_ids" eval="[(6,0,[ref('tax_tag_03')])]"/>
+        <field name="tax_group_id" ref="tax_group_iva"/>
     </record>
 
     <record id="tax1" model="account.tax.template">
@@ -77,6 +79,7 @@
         <field name="account_id" ref="cuenta216_10"/>
         <field name="refund_account_id" ref="cuenta216_10"/>
         <field name="tag_ids" eval="[(6,0,[ref('tax_tag_04')])]"/>
+        <field name="tax_group_id" ref="tax_group_iva_ret"/>
     </record>
 
     <record id="tax2" model="account.tax.template">
@@ -89,6 +92,7 @@
         <field name="account_id" ref="cuenta216_10"/>
         <field name="refund_account_id" ref="cuenta216_10"/>
         <field name="tag_ids" eval="[(6,0,[ref('tax_tag_05')])]"/>
+        <field name="tax_group_id" ref="tax_group_iva_ret"/>
     </record>
 
     <record id="tax3" model="account.tax.template">
@@ -101,6 +105,7 @@
         <field name="account_id" ref="cuenta216_03"/>
         <field name="refund_account_id" ref="cuenta216_03"/>
         <field name="tag_ids" eval="[(6,0,[ref('tax_tag_06')])]"/>
+        <field name="tax_group_id" ref="tax_group_isr_ret"/>
     </record>
 
     <record id="tax5" model="account.tax.template">
@@ -113,6 +118,7 @@
         <field name="account_id" ref="cuenta216_04"/>
         <field name="refund_account_id" ref="cuenta216_04"/>
         <field name="tag_ids" eval="[(6,0,[ref('tax_tag_07')])]"/>
+        <field name="tax_group_id" ref="tax_group_isr_ret"/>
     </record>
 
     <record id="tax7" model="account.tax.template">
@@ -125,6 +131,7 @@
         <field name="account_id" ref="cuenta216_10"/>
         <field name="refund_account_id" ref="cuenta216_10"/>
         <field name="tag_ids" eval="[(6,0,[ref('tax_tag_08')])]"/>
+        <field name="tax_group_id" ref="tax_group_iva_ret"/>
     </record>
 
     <record id="tax8" model="account.tax.template">
@@ -137,6 +144,7 @@
         <field name="account_id" ref="cuenta216_10"/>
         <field name="refund_account_id" ref="cuenta216_10"/>
         <field name="tag_ids" eval="[(6,0,[ref('tax_tag_09')])]"/>
+        <field name="tax_group_id" ref="tax_group_iva_ret"/>
     </record>
 
     <record id="tax13" model="account.tax.template">
@@ -149,6 +157,7 @@
         <field name="account_id" ref="cuenta119_01"/>
         <field name="refund_account_id" ref="cuenta119_01"/>
         <field name="tag_ids" eval="[(6,0,[ref('tax_tag_10')])]"/>
+        <field name="tax_group_id" ref="tax_group_iva"/>
     </record>
 
     <record id="tax14" model="account.tax.template">
@@ -161,6 +170,7 @@
         <field name="account_id" ref="cuenta119_01"/>
         <field name="refund_account_id" ref="cuenta119_01"/>
         <field name="tag_ids" eval="[(6,0,[ref('tax_tag_12')])]"/>
+        <field name="tax_group_id" ref="tax_group_iva"/>
     </record>
   </data>
 </odoo>
diff --git a/addons/l10n_mx/data/l10n_mx_chart_data.xml b/addons/l10n_mx/data/l10n_mx_chart_data.xml
index 1b78dcbe238..5465175a2cc 100644
--- a/addons/l10n_mx/data/l10n_mx_chart_data.xml
+++ b/addons/l10n_mx/data/l10n_mx_chart_data.xml
@@ -154,6 +154,13 @@
         <field name="reconcile" eval="True"/>
         <field name="tag_ids" eval="[(6,0,[ref('account_tag_206_02')])]"/>
     </record>
+    <record id='cuenta208_01' model='account.account.template'>
+        <field name='name'>IVA trasladado cobrado</field>
+        <field name='code'>208.01.01</field>
+        <field name="chart_template_id" ref="mx_coa"/>
+        <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+        <field name="tag_ids" eval="[(6,0,[ref('account_tag_208_01')])]"/>
+    </record>
     <record id='cuenta209_01' model='account.account.template'>
         <field name='name'>IVA trasladado no cobrado</field>
         <field name='code'>209.01.01</field>
@@ -177,12 +184,12 @@
     </record>
     <record id='cuenta216_10' model='account.account.template'>
         <field name='name'>Impuestos retenidos de IVA</field>
-        <field name='code'>216.10.01</field>
+        <field name='code'>216.10.10</field>
         <field name="chart_template_id" ref="mx_coa"/>
         <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
         <field name="tag_ids" eval="[(6,0,[ref('account_tag_216_10')])]"/>
     </record>
-    <record id='cuenta216_13' model='account.account.template'>
+    <record id='cuenta216_10_20' model='account.account.template'>
         <field name='name'>Impuestos retenidos de iva efectivamente pagados</field>
         <field name='code'>216.10.20</field>
         <field name="chart_template_id" ref="mx_coa"/>
diff --git a/addons/l10n_mx/models/chart_template.py b/addons/l10n_mx/models/chart_template.py
index c4dec8e3f7e..b02eafdaa69 100644
--- a/addons/l10n_mx/models/chart_template.py
+++ b/addons/l10n_mx/models/chart_template.py
@@ -29,12 +29,11 @@ class AccountChartTemplate(models.Model):
         account_tax_obj = self.env['account.tax']
         account_obj = self.env['account.account']
         taxes_acc = {
-            'ITAX_010-IN': account_obj.search([('code', '=', '208.01.01')]),
-            'ITAX_160-IN': account_obj.search([('code', '=', '208.01.01')]),
-            'ITAXR_04-OUT': account_obj.search([('code', '=', '216.13.01')]),
-            'ITAXR_10-OUT': account_obj.search([('code', '=', '216.13.01')]),
-            'ITAX_1067-OUT': account_obj.search([('code', '=', '216.13.01')]),
-            'ITAX_167-OUT': account_obj.search([('code', '=', '216.13.01')]),
+            'IVA': account_obj.search([('code', '=', '208.01.01')]),
+            'ITAXR_04-OUT': account_obj.search([('code', '=', '216.10.20')]),
+            'ITAXR_10-OUT': account_obj.search([('code', '=', '216.10.20')]),
+            'ITAX_1067-OUT': account_obj.search([('code', '=', '216.10.20')]),
+            'ITAX_167-OUT': account_obj.search([('code', '=', '216.10.20')]),
             'ITAX_010-OUT': account_obj.search([('code', '=', '208.01.01')]),
             'ITAX_160-OUT': account_obj.search([('code', '=', '208.01.01')])}
 
@@ -67,15 +66,14 @@ class AccountChartTemplate(models.Model):
             acc_template_ref, company, journals_dict=journals_dict)
         if not self == self.env.ref('l10n_mx.mx_coa'):
             return res
+        account = self.env.ref('l10n_mx.1_cuenta118_01')
         res.append({
             'type': 'general',
             'name': _('Effectively Paid'),
             'code': 'CBMX',
             'company_id': company.id,
-            'default_credit_account_id': acc_template_ref.get(
-                self.income_currency_exchange_account_id.id),
-            'default_debit_account_id': acc_template_ref.get(
-                self.expense_currency_exchange_account_id.id),
+            'default_credit_account_id': account.id,
+            'default_debit_account_id': account.id,
             'show_on_dashboard': True,
         })
         return res