From 5888531e5c1cf358dd37ab5e3bd78c4031f3bf96 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 6 Jan 2012 12:11:49 +0100
Subject: [PATCH 1/4] [FIX] account: fixed the generation of tax from sale and
 purchase rates in wizard

bzr revid: qdp-launchpad@openerp.com-20120106111149-ztmuqg58980a0tu3
---
 addons/account/account.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 6589ec724a2..432a90a653e 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3265,14 +3265,20 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         obj_tax_temp = self.pool.get('account.tax.template')
         chart_template = obj_wizard.chart_template_id
         vals = {}
+        # get the ids of all the parents of the selected account chart template
+        current_chart_template = chart_template
+        all_parents = [current_chart_template.id]
+        while current_chart_template.parent_id:
+            current_chart_template = current_chart_template.parent_id
+            all_parents.append(current_chart_template.id)
         # create tax templates and tax code templates from purchase_tax_rate and sale_tax_rate fields
         if not chart_template.complete_tax_set:
-            if obj_wizard.sale_tax:
-                value = obj_wizard.sale_tax_rate
-                obj_tax_temp.write(cr, uid, [obj_wizard.sale_tax.id], {'amount': value/100.0, 'name': _('Tax %.2f%%') % value})
-            if obj_wizard.purchase_tax:
-                value = obj_wizard.purchase_tax_rate
-                obj_tax_temp.write(cr, uid, [obj_wizard.purchase_tax.id], {'amount': value/100.0, 'name': _('Purchase Tax %.2f%%') % value})
+            value = obj_wizard.sale_tax_rate
+            ref_tax_ids = obj_tax_temp.search(cr, uid, [('type_tax_use','in', ('sale','all')), ('chart_template_id', 'in', all_parents)], context=context, order="sequence, id desc", limit=1)
+            obj_tax_temp.write(cr, uid, ref_tax_ids, {'amount': value/100.0, 'name': _('Tax %.2f%%') % value})
+            value = obj_wizard.purchase_tax_rate
+            ref_tax_ids = obj_tax_temp.search(cr, uid, [('type_tax_use','in', ('purchase','all')), ('chart_template_id', 'in', all_parents)], context=context, order="sequence, id desc", limit=1)
+            obj_tax_temp.write(cr, uid, ref_tax_ids, {'amount': value/100.0, 'name': _('Purchase Tax %.2f%%') % value})
         return True
 
     def execute(self, cr, uid, ids, context=None):

From 77cd2d2608cfc45e194cf46aa42ed72405590d0b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 6 Jan 2012 12:13:30 +0100
Subject: [PATCH 2/4] [IMP] l10n_us: added a minimal set for COT, taxes and
 fiscal positions. Removed sign on account.account.type (field does not exist
 anymore. It is hanlded by the financial reports)

bzr revid: qdp-launchpad@openerp.com-20120106111330-zn783lc6fz4nptr8
---
 addons/l10n_us/__openerp__.py                 |  2 +
 .../l10n_us/account_chart_template_after.xml  | 14 +--
 addons/l10n_us/account_tax_code_template.xml  | 95 +++++++++++++++++++
 addons/l10n_us/account_tax_template.xml       | 93 ++++++++++++++++++
 addons/l10n_us/l10n_us_account_type.xml       | 18 +---
 5 files changed, 197 insertions(+), 25 deletions(-)
 create mode 100644 addons/l10n_us/account_tax_code_template.xml
 create mode 100644 addons/l10n_us/account_tax_template.xml

diff --git a/addons/l10n_us/__openerp__.py b/addons/l10n_us/__openerp__.py
index f497b4f5ddf..273a4fe1d17 100644
--- a/addons/l10n_us/__openerp__.py
+++ b/addons/l10n_us/__openerp__.py
@@ -35,6 +35,8 @@
         "l10n_us_account_type.xml",
         'account_chart_template.xml',
         'account.account.template.csv',
+        'account_tax_code_template.xml',
+        'account_tax_template.xml',
         'account_chart_template_after.xml',
         'l10n_us_wizard.xml'
     ],
diff --git a/addons/l10n_us/account_chart_template_after.xml b/addons/l10n_us/account_chart_template_after.xml
index 20fbcb80859..3c570126fcd 100644
--- a/addons/l10n_us/account_chart_template_after.xml
+++ b/addons/l10n_us/account_chart_template_after.xml
@@ -2,47 +2,37 @@
 <openerp>
     <data>
 
-        <record id="atax0" model="account.tax.code.template">
-            <field name="name">Tax Template</field>
-        </record>
-
         <record id="account_chart_template_basic" model="account.chart.template">
             <field name="account_root_id" ref="coa_basic"/>
             <field name="bank_account_view_id" ref="cash_expenditure"/>
+            <field name="tax_code_root_id" ref="tax_code_chart_root"/>
         </record>
         <record id="account_chart_template_advertising" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>
-            <field name="tax_code_root_id" ref="atax0"/>
         </record>
 
         <record id="account_chart_template_agricultar" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>
-            <field name="tax_code_root_id" ref="atax0"/>
         </record>
 
         <record id="account_chart_template_construction" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>
-            <field name="tax_code_root_id" ref="atax0"/>
         </record>
 
         <record id="account_chart_template_financial_service" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>
-            <field name="tax_code_root_id" ref="atax0"/>
         </record>
 
         <record id="account_chart_template_general_service" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>
-            <field name="tax_code_root_id" ref="atax0"/>
         </record>
 
         <record id="account_chart_template_legal_service" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>
-            <field name="tax_code_root_id" ref="atax0"/>
         </record>
 
         <record id="account_chart_template_general_product" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>
-            <field name="tax_code_root_id" ref="atax0"/>
-        </record>        
+        </record>
     </data>
 </openerp>
diff --git a/addons/l10n_us/account_tax_code_template.xml b/addons/l10n_us/account_tax_code_template.xml
new file mode 100644
index 00000000000..e6265b206fe
--- /dev/null
+++ b/addons/l10n_us/account_tax_code_template.xml
@@ -0,0 +1,95 @@
+<openerp>
+    <data noupdate="1">
+        <!-- Taxes -->
+        <!-- TAX Code Definitions -->
+
+        <!-- Invoiced TAX -->
+
+        <record id="tax_code_chart_root" model="account.tax.code.template">
+            <field name="name">Plan Fees </field>
+        </record>
+
+            <record id="tax_code_balance_net" model="account.tax.code.template">
+                <field name="name">Tax Balance to Pay</field>
+                <field name="parent_id" ref="tax_code_chart_root"/>
+            </record>
+
+            <!-- Input TAX -->
+            <record id="tax_code_input" model="account.tax.code.template">
+                <field name="name">Tax Received</field>
+                <field name="parent_id" ref="tax_code_balance_net"/>
+                <field eval="-1" name="sign"/>
+            </record>
+
+                <record id="tax_code_input_S" model="account.tax.code.template">
+                    <field name="name">Tax Received at default rate</field>
+                    <field name="parent_id" ref="tax_code_input"/>
+                </record>
+
+
+                <record id="tax_code_input_X" model="account.tax.code.template">
+                    <field name="name">Tax Received Rate X (Exempt)</field>
+                    <field name="parent_id" ref="tax_code_input"/>
+                </record>
+
+            <!-- Output TAX -->
+
+            <record id="tax_code_output" model="account.tax.code.template">
+                <field name="name">Tax Paid</field>
+                <field name="parent_id" ref="tax_code_balance_net"/>
+            </record>
+
+                <record id="tax_code_output_S" model="account.tax.code.template">
+                    <field name="name">Tax Paid at default rate</field>
+                    <field name="parent_id" ref="tax_code_output"/>
+                </record>
+
+                <record id="tax_code_output_X" model="account.tax.code.template">
+                    <field name="name">Tax Paid Rate X (Exempt)</field>
+                    <field name="parent_id" ref="tax_code_output"/>
+                </record>
+
+
+            <!-- Invoiced Base of TAX -->
+
+            <!-- Purchases -->
+
+            <record id="tax_code_base_net" model="account.tax.code.template">
+                <field name="name">Tax Bases</field>
+                <field name="parent_id" ref="tax_code_chart_root"/>
+            </record>
+
+                <record id="tax_code_base_purchases" model="account.tax.code.template">
+                    <field name="name">Taxable Purchases Base</field>
+                    <field name="parent_id" ref="tax_code_base_net"/>
+                </record>
+
+                    <record id="tax_code_purch_S" model="account.tax.code.template">
+                        <field name="name">Taxable Purchases at default rate</field>
+                        <field name="parent_id" ref="tax_code_base_purchases"/>
+                    </record>
+
+                    <record id="tax_code_purch_X" model="account.tax.code.template">
+                        <field name="name">Taxable Purchases Type X (Exempt)</field>
+                        <field name="parent_id" ref="tax_code_base_purchases"/>
+                    </record>
+
+                <!-- Sales -->
+
+                <record id="tax_code_base_sales" model="account.tax.code.template">
+                    <field name="name">Base of Taxable Sales</field>
+                    <field name="parent_id" ref="tax_code_base_net"/>
+                </record>
+
+                    <record id="tax_code_sales_S" model="account.tax.code.template">
+                        <field name="name">Taxable Sales at default rate</field>
+                        <field name="parent_id" ref="tax_code_base_sales"/>
+                    </record>
+
+                    <record id="tax_code_sales_X" model="account.tax.code.template">
+                        <field name="name">Taxable Sales Type X (Exempt)</field>
+                        <field name="parent_id" ref="tax_code_base_sales"/>
+                    </record>
+    </data>
+</openerp>
+
diff --git a/addons/l10n_us/account_tax_template.xml b/addons/l10n_us/account_tax_template.xml
new file mode 100644
index 00000000000..4c0dc45c08f
--- /dev/null
+++ b/addons/l10n_us/account_tax_template.xml
@@ -0,0 +1,93 @@
+<openerp>
+    <data noupdate="1">
+        <!-- Taxes -->
+        <record id="otaxs" model="account.tax.template">
+            <field name="chart_template_id" ref="l10n_us.account_chart_template_basic"/>
+            <field name="name">default purchase tax</field>
+            <field eval="0.15" name="amount"/>
+            <field name="sequence">1</field>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="tax_code_purch_S"/>
+            <field name="tax_code_id" ref="tax_code_output_S"/>
+            <field name="ref_base_code_id" ref="tax_code_purch_S"/>
+            <field name="ref_tax_code_id" ref="tax_code_output_S"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="otaxx" model="account.tax.template">
+            <field name="chart_template_id" ref="l10n_us.account_chart_template_basic"/>
+            <field name="name">Exempted Tax (Purchase)</field>
+            <field eval="0.0" name="amount"/>
+            <field name="sequence">10</field>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="tax_code_purch_X"/>
+            <field name="tax_code_id" ref="tax_code_output_X"/>
+            <field name="ref_base_code_id" ref="tax_code_purch_X"/>
+            <field name="ref_tax_code_id" ref="tax_code_output_X"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- Sales + Input VAT -->
+
+        <record id="itaxs" model="account.tax.template">
+            <field name="chart_template_id" ref="l10n_us.account_chart_template_basic"/>
+            <field name="name">default sale tax</field>
+            <field eval="0.15" name="amount"/>
+            <field name="sequence">1</field>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="tax_code_sales_S"/>
+            <field name="tax_code_id" ref="tax_code_input_S"/>
+            <field name="ref_base_code_id" ref="tax_code_sales_S"/>
+            <field name="ref_tax_code_id" ref="tax_code_input_S"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="itaxx" model="account.tax.template">
+            <field name="chart_template_id" ref="l10n_us.account_chart_template_basic"/>
+            <field name="name">Exempted Tax (Sale)</field>
+            <field eval="0.0" name="amount"/>
+            <field name="sequence">10</field>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="tax_code_sales_X"/>
+            <field name="tax_code_id" ref="tax_code_input_X"/>
+            <field name="ref_base_code_id" ref="tax_code_sales_X"/>
+            <field name="ref_tax_code_id" ref="tax_code_input_X"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+
+        <!-- = = = = = = = = = = = = = = = -->
+         <!-- Fiscal Mapping Templates     -->
+        <!-- = = = = = = = = = = = = = = = -->
+
+
+        <record id="fiscal_position_normal_taxes_template1" model="account.fiscal.position.template">
+            <field name="name">Normal Taxes</field>
+            <field name="chart_template_id" ref="l10n_us.account_chart_template_basic"/>
+        </record>
+
+        <record id="fiscal_position_tax_exempt_template2" model="account.fiscal.position.template">
+            <field name="name">Tax Exempt</field>
+            <field name="chart_template_id" ref="l10n_us.account_chart_template_basic"/>
+        </record>
+
+        <!-- = = = = = = = = = = = = = = = -->
+        <!-- Fiscal Position Tax Templates -->
+        <!-- = = = = = = = = = = = = = = = -->
+
+
+        <record id="fiscal_position_tax_exempt" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_tax_exempt_template2"/>
+            <field name="tax_src_id" ref="itaxs"/>
+            <field name="tax_dest_id" ref="itaxx"/>
+        </record>
+
+        <record id="fiscal_position_tax_exempt2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_normal_taxes_template2"/>
+            <field name="tax_src_id" ref="otaxs"/>
+            <field name="tax_dest_id" ref="otaxx"/>
+        </record>
+
+    </data>
+</openerp>
+
diff --git a/addons/l10n_us/l10n_us_account_type.xml b/addons/l10n_us/l10n_us_account_type.xml
index 989916a49ac..1b64a4e6487 100644
--- a/addons/l10n_us/l10n_us_account_type.xml
+++ b/addons/l10n_us/l10n_us_account_type.xml
@@ -60,41 +60,35 @@
             <field name="code">account -pay</field>
             <field name="report_type">liability</field>
             <field name="close_method">unreconciled</field>
-            <field name="sign" eval="-1"/>            
         </record>
         <record id="user_type_credit_card" model="account.account.type">
             <field name="name">Credit Card</field>
             <field name="code">credit -card</field>
-            <field name="report_type">liability</field>            
+            <field name="report_type">liability</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="-1" />            
         </record>
         <record id="user_type_current_liability" model="account.account.type">
             <field name="name">Current Liability</field>
             <field name="code">current -liability</field>
-            <field name="report_type">liability</field>            
+            <field name="report_type">liability</field>
             <field name="close_method">balance</field>
-            <field name="sign" eval="-1" />            
         </record>
         <record id="user_type_other_current_liability" model="account.account.type">
             <field name="name">Other Current Liability</field>
             <field name="code">other current -liability</field>
-            <field name="report_type">liability</field>            
-            <field name="sign" eval="-1"/>            
+            <field name="report_type">liability</field>
             <field name="close_method">balance</field>
         </record>
         <record id="user_type_long_term_liability" model="account.account.type">
             <field name="name">Long term Liability</field>
             <field name="code">long term -liability</field>
-            <field name="report_type">liability</field>            
-            <field name="sign" eval="-1"/>            
+            <field name="report_type">liability</field>
             <field name="close_method">balance</field>
         </record>
         <record id="user_type_liability" model="account.account.type">
             <field name="name">Liability</field>
             <field name="code">liability</field>
-            <field name="report_type">liability</field>            
-            <field name="sign" eval="-1"/>            
+            <field name="report_type">liability</field>
             <field name="close_method">balance</field>
         </record>
         <!-- Equity -->
@@ -111,14 +105,12 @@
             <field name="code">income</field>
             <field name="report_type">income</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="-1"/>
         </record>
         <record id="user_type_other_income" model="account.account.type">
             <field name="name">Other Income</field>
             <field name="code">other -income</field>
             <field name="report_type">income</field>
             <field name="close_method">none</field>
-            <field name="sign" eval="-1"/>            
         </record>
 
         <!-- Expense -->  

From 76e3032ee759aa2ccadcc7775b5c49d1abe39e44 Mon Sep 17 00:00:00 2001
From: "Dhara (OpenERP)" <>
Date: Fri, 6 Jan 2012 18:38:41 +0530
Subject: [PATCH 3/4] [FIX] reference for the tax template

bzr revid: dhara_openerp-20120106130841-w988cm87052pqnax
---
 addons/l10n_us/account_tax_template.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_us/account_tax_template.xml b/addons/l10n_us/account_tax_template.xml
index 4c0dc45c08f..3dbdc903889 100644
--- a/addons/l10n_us/account_tax_template.xml
+++ b/addons/l10n_us/account_tax_template.xml
@@ -83,7 +83,7 @@
         </record>
 
         <record id="fiscal_position_tax_exempt2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_normal_taxes_template2"/>
+            <field name="position_id" ref="fiscal_position_normal_taxes_template1"/>
             <field name="tax_src_id" ref="otaxs"/>
             <field name="tax_dest_id" ref="otaxx"/>
         </record>

From ca98b4a23575d6125962f19ed4ea93956a37e3c9 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 6 Jan 2012 14:33:03 +0100
Subject: [PATCH 4/4] [FIX] l10n_us: fiscal position

bzr revid: qdp-launchpad@openerp.com-20120106133303-3p405o8c93868eju
---
 addons/l10n_us/account_tax_template.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/l10n_us/account_tax_template.xml b/addons/l10n_us/account_tax_template.xml
index 3dbdc903889..bb15368878e 100644
--- a/addons/l10n_us/account_tax_template.xml
+++ b/addons/l10n_us/account_tax_template.xml
@@ -61,12 +61,12 @@
         <!-- = = = = = = = = = = = = = = = -->
 
 
-        <record id="fiscal_position_normal_taxes_template1" model="account.fiscal.position.template">
+        <record id="fiscal_position_normal_taxes_template" model="account.fiscal.position.template">
             <field name="name">Normal Taxes</field>
             <field name="chart_template_id" ref="l10n_us.account_chart_template_basic"/>
         </record>
 
-        <record id="fiscal_position_tax_exempt_template2" model="account.fiscal.position.template">
+        <record id="fiscal_position_tax_exempt_template" model="account.fiscal.position.template">
             <field name="name">Tax Exempt</field>
             <field name="chart_template_id" ref="l10n_us.account_chart_template_basic"/>
         </record>
@@ -77,13 +77,13 @@
 
 
         <record id="fiscal_position_tax_exempt" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_tax_exempt_template2"/>
+            <field name="position_id" ref="fiscal_position_tax_exempt_template"/>
             <field name="tax_src_id" ref="itaxs"/>
             <field name="tax_dest_id" ref="itaxx"/>
         </record>
 
         <record id="fiscal_position_tax_exempt2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_normal_taxes_template1"/>
+            <field name="position_id" ref="fiscal_position_tax_exempt_template"/>
             <field name="tax_src_id" ref="otaxs"/>
             <field name="tax_dest_id" ref="otaxx"/>
         </record>