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):
diff --git a/addons/l10n_us/__init__.py b/addons/l10n_us/__init__.py
new file mode 100644
index 00000000000..a4a5d907c6b
--- /dev/null
+++ b/addons/l10n_us/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_us/__openerp__.py b/addons/l10n_us/__openerp__.py
new file mode 100644
index 00000000000..273a4fe1d17
--- /dev/null
+++ b/addons/l10n_us/__openerp__.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    "name": "United States - Chart of accounts",
+    "version": "1.1",
+    "author": "OpenERP SA",
+    "category": 'Localization/Account Charts',
+    "description": """
+        United States - Chart of accounts
+    """,
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    "depends": [
+        "account_chart",
+        ],
+    'update_xml': [
+        "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'
+    ],
+    'demo_xml': [
+    ],
+    'test': [
+    ],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_us/account.account.template.csv b/addons/l10n_us/account.account.template.csv
new file mode 100644
index 00000000000..46430ac37f8
--- /dev/null
+++ b/addons/l10n_us/account.account.template.csv
@@ -0,0 +1,121 @@
+"id","code","name","type","user_type:id","parent_id:id","reconcile","chart_template_id:id"
+"coa_basic",0,"Basic","view","l10n_us.user_type_view",,"FALSE","l10n_us.account_chart_template_basic"
+"asset",1,"Assets","view","l10n_us.user_type_current_asset","coa_basic","FALSE","l10n_us.account_chart_template_basic"
+"current_asset",100,"Current Assets","view","l10n_us.user_type_current_asset","asset","FALSE","l10n_us.account_chart_template_basic"
+"cash_expenditure",1000,"Cash or Cash Equivalents","view","l10n_us.user_type_cash","current_asset","FALSE","l10n_us.account_chart_template_basic"
+"receivables",1200,"Receivable","view","l10n_us.user_type_current_asset","current_asset","FALSE","l10n_us.account_chart_template_basic"
+"account_receivable",12001,"Account Receivable","receivable","l10n_us.user_type_account_receivable","receivables","TRUE","l10n_us.account_chart_template_basic"
+"fixed_asset",150,"Fixed Assets","view","l10n_us.user_type_fixed_asset","asset","FALSE","l10n_us.account_chart_template_basic"
+15000,"15000","Furniture and Equipment","other","l10n_us.user_type_fixed_asset","fixed_asset","FALSE","l10n_us.account_chart_template_basic"
+17000,"17000","Accumulated Depreciation","other","l10n_us.user_type_accumulated_depreciation","fixed_asset","FALSE","l10n_us.account_chart_template_basic"
+"liability_equity","2","Liabilities and Equity","view","l10n_us.user_type_liability","coa_basic","FALSE","l10n_us.account_chart_template_basic"
+"liability","20","Liabilities","view","l10n_us.user_type_liability","liability_equity","FALSE","l10n_us.account_chart_template_basic"
+"current_liability","200","Current Liabilities","view","l10n_us.user_type_current_liability","liability","FALSE","l10n_us.account_chart_template_basic"
+"payable","2000","Payable","view","l10n_us.user_type_account_payable","current_liability","FALSE","l10n_us.account_chart_template_basic"
+"account_payable","20001","Account Payable","payable","l10n_us.user_type_account_payable","payable","TRUE","l10n_us.account_chart_template_basic"
+"other_current_liability","240","Other Current Liabilities","view","l10n_us.user_type_other_current_liability","liability","FALSE","l10n_us.account_chart_template_basic"
+"24000","24000","Payroll Liabilities","other","l10n_us.user_type_other_current_liability","other_current_liability","FALSE","l10n_us.account_chart_template_basic"
+"25500","25500","Sales Tax Payable","other","l10n_us.user_type_other_current_liability","other_current_liability","FALSE","l10n_us.account_chart_template_basic"
+"26500","26500","Use Tax Payable","other","l10n_us.user_type_other_current_liability","other_current_liability","FALSE","l10n_us.account_chart_template_basic"
+"equity","30","Equity","view","l10n_us.user_type_equity","liability_equity","FALSE","l10n_us.account_chart_template_basic"
+"30100","30100","Capital Stock","other","l10n_us.user_type_equity","equity","FALSE","l10n_us.account_chart_template_basic"
+"30200","30200","Dividends Paid","other","l10n_us.user_type_equity","equity","FALSE","l10n_us.account_chart_template_basic"
+"30000","30000","Opening Balance Equity","other","l10n_us.user_type_equity","equity","FALSE","l10n_us.account_chart_template_basic"
+"32000","32000","Retained Earnings","other","l10n_us.user_type_equity","equity","FALSE","l10n_us.account_chart_template_basic"
+"expense","60","Expenses","view","l10n_us.user_type_expense","coa_basic","FALSE","l10n_us.account_chart_template_basic"
+"60000","60000","Advertising and Promotion","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"60200","60200","Automobile Expense","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"60400","60400","Bank Service Charges","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"61000","61000","Business Licenses and Permits","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"62000_financial_services","62000","Continuing Education","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"61400","61400","Charitable Contributions","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"61700","61700","Computer and Internet Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"62400","62400","Depreciation Expense","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"62500","62500","Dues and Subscriptions","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"62600","62600","Equipment Rental","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"63500","63500","Janitorial Expense","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_advertising"
+"insurance","633","Insurance Expense","view","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"63310","63310","General Liability Insurance","other","l10n_us.user_type_expense","insurance","FALSE","l10n_us.account_chart_template_basic"
+"63320","63320","Health Insurance","other","l10n_us.user_type_expense","insurance","FALSE","l10n_us.account_chart_template_basic"
+"63330","63330","Life and Disability Insurance","other","l10n_us.user_type_expense","insurance","FALSE","l10n_us.account_chart_template_basic"
+"63350","63350","Professional Liability","other","l10n_us.user_type_expense","insurance","FALSE","l10n_us.account_chart_template_basic"
+"63360","63360","Worker's Compensation","other","l10n_us.user_type_expense","insurance","FALSE","l10n_us.account_chart_template_basic"
+"63400","63400","Interest Expense","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"64300","64300","Meals and Entertainment","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"64700","64700","Miscellaneous Expense","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"64900","64900","Office Supplies","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"66000","66000","Payroll Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"66500","66500","Postage and Delivery","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"66660_financial_services","66600","Printing and Reproduction","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"66700","66700","Professional Fees","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"67100","67100","Rent Expense","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"67200","67200","Repairs and Maintenance","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"68000","68000","Taxes - Property","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"68100","68100","Telephone Expense","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"68400","68400","Travel Expense","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"68600","68600","Utilities","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_basic"
+"income","40","Income","view","l10n_us.user_type_income","coa_basic","FALSE","l10n_us.account_chart_template_basic"
+"other_income","70","Other Income","view","l10n_us.user_type_other_income","coa_basic","FALSE","l10n_us.account_chart_template_basic"
+"70000_advertising","70000","Finance Charge Income","other","l10n_us.user_type_other_income","other_income","FALSE","l10n_us.account_chart_template_basic"
+"70200","70200","Interest Income","other","l10n_us.user_type_other_income","other_income","FALSE","l10n_us.account_chart_template_basic"
+"70500","70500","Proceeds from Sale of Assets","other","l10n_us.user_type_other_income","other_income","FALSE","l10n_us.account_chart_template_basic"
+"70100_advertising","70100","Insurance Proceeds Received","other","l10n_us.user_type_other_income","other_income","FALSE","l10n_us.account_chart_template_basic"
+"cost_of_goods_sold","50","Cost of Goods Sold","view","l10n_us.user_type_cogs","coa_basic","FALSE","l10n_us.account_chart_template_cogs"
+"53600_construction_trades","53600","Other Job Related Costs","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_cogs"
+"42400_advertising","42400","Commission income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_advertising"
+"48300_advertising","48300","Sales Discounts","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_advertising"
+"50300_advertising","50300","Commissions Paid","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_advertising"
+"51700_advertising","51700","Media Purchased for Clients","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_advertising"
+"51800_advertising","51800","Merchant Account Fees","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_advertising"
+"53500_advertising","53500","Subcontracted Services","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_advertising"
+"64200_advertising","64200","Marketing Expense","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_advertising"
+"41200_agriculture","41200","Agricultural Program Payments","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
+"42500_agriculture","42500","Commodity Credit Loans","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
+"42800_agriculture","42800","Cooperative Distributions","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
+"42900_agriculture","42900","Crop Insurance Proceeds","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
+"43000_agriculture","43000","Crop Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
+"43100_agriculture","43100","Custom Hire Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
+"43600_agriculture","43600","Farmers Market Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
+"44100_agriculture","44100","Fuel Tax Credits and Other Inc.","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
+"45500_agriculture","45500","Livestock Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
+"47400_agriculture","47400","Rental Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
+"61100_agriculture","61100","Car and Truck Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
+"61500_agriculture","61500","Chemicals Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
+"61900_agriculture","61900","Conservation Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
+"62300_agriculture","62300","Custom Hire and Contract Labor","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
+"62900_agriculture","62900","Feed Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
+"63000_agriculture","63000","Fertilizers and Lime","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
+"63100_agriculture","63100","Freight and Trucking","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
+"63200_agriculture","63200","Gasoline, Fuel and Oil","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
+"67500_agriculture","67500","Seeds and Plants Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
+"67800_agriculture","67800","Small Tools and Equipment","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
+"67900_agriculture","67900","Storage and Warehousing","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
+"68500_agriculture","68500","Uniforms","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
+"68800_agriculture","68800","Veterinary, Breeding, Medicine","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
+"24600_construction_trades","24600","Customer Deposits Received","other","l10n_us.user_type_other_current_liability","other_current_liability","FALSE","l10n_us.account_chart_template_construction"
+"45100_construction_trades","45100","Job Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_construction"
+"50800_construction_trades","50800","Commissions Paid","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_construction"
+"51400_construction_trades","51400","Equipment Rental for Jobs","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_construction"
+"51800_construction_trades","51800","Job Materials Purchased","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_construction"
+"52000_construction_trades","52000","Merchant Account Fees","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_construction"
+"53800_construction_trades","53800","Subcontractors Expense","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_construction"
+"54100_construction_trades","54100","Tools and Small Equipment","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_construction"
+"48000_financial_services","42800","Service Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_financial_service"
+"47900_general_service","47900","Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_general_service"
+"10900_legal_services",10900,"Client Trust Account","other","l10n_us.user_type_current_asset","current_asset","False","l10n_us.account_chart_template_legal_service"
+"other_current_asset_legal_services",123,"Other Current Assets","view","l10n_us.user_type_other_current_asset","asset","FALSE","l10n_us.account_chart_template_legal_service"
+"12300_legal_services",12300,"Advanced Client Costs","other","l10n_us.user_type_other_current_asset","other_current_asset_legal_services","False","l10n_us.account_chart_template_legal_service"
+"12310_legal_services",12310,"Court Costs","other","l10n_us.user_type_other_current_asset","other_current_asset_legal_services","False","l10n_us.account_chart_template_legal_service"
+"12320_legal_services",12320,"Expert Witness Fees","other","l10n_us.user_type_other_current_asset","other_current_asset_legal_services","False","l10n_us.account_chart_template_legal_service"
+"12330_legal_services",12330,"Filing Fees","other","l10n_us.user_type_other_current_asset","other_current_asset_legal_services","False","l10n_us.account_chart_template_legal_service"
+"other_asset_legal_services",187,"Other Assets","view","l10n_us.user_type_other_asset","asset","FALSE","l10n_us.account_chart_template_legal_service"
+"18700_legal_services",18700,"Security Deposits Asset","other","l10n_us.user_type_other_asset","other_asset_legal_services","False","l10n_us.account_chart_template_legal_service"
+"41100_legal_services",41100,"Administrative Fees","other","l10n_us.user_type_income","income","False","l10n_us.account_chart_template_legal_service"
+"45400_legal_services",45400,"Legal Fee Income","other","l10n_us.user_type_income","income","False","l10n_us.account_chart_template_legal_service"
+"48800_legal_services",48800,"Settlement Income","other","l10n_us.user_type_income","income","False","l10n_us.account_chart_template_legal_service"
+"47900_general_product",47910,"Sales","other","l10n_us.user_type_income","income","False","l10n_us.account_chart_template_general_product"
+"48300_general_product",48310,"Sales Discounts","other","l10n_us.user_type_income","income","False","l10n_us.account_chart_template_general_product"
+"48900_general_product",48900,"Shipping and Delivery Income","other","l10n_us.user_type_income","income","False","l10n_us.account_chart_template_general_product"
+"51100_general_product",51100,"Freight and Shipping Costs","other","l10n_us.user_type_cogs","cost_of_goods_sold","False","l10n_us.account_chart_template_general_product"
+"52500_general_product",52500,"Purchase Discounts","other","l10n_us.user_type_cogs","cost_of_goods_sold","False","l10n_us.account_chart_template_general_product"
+"52900_general_product",52900,"Purchases - Resale Items","other","l10n_us.user_type_cogs","cost_of_goods_sold","False","l10n_us.account_chart_template_general_product"
diff --git a/addons/l10n_us/account_chart_template.xml b/addons/l10n_us/account_chart_template.xml
new file mode 100644
index 00000000000..e0b8ed374b3
--- /dev/null
+++ b/addons/l10n_us/account_chart_template.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+  <data>
+
+        <record id="account_chart_template_basic" model="account.chart.template">
+            <field name="name">Basic Chart of Account</field>
+            <field name="visible" eval="False" />
+            <field name="complete_tax_set" eval="False" />
+        </record>
+
+        <record id="account_chart_template_cogs" model="account.chart.template">
+            <field name="name">Cost of Goods sold</field>
+            <field name="visible" eval="False" />
+            <field name="parent_id" ref="account_chart_template_basic"/>
+            <field name="complete_tax_set" eval="False" />
+        </record>
+        <record id="account_chart_template_advertising" model="account.chart.template">
+            <field name="name">Advertising</field>
+            <field name="complete_tax_set" eval="False" />
+            <field name="parent_id" ref="account_chart_template_cogs"/>
+        </record>
+        <record id="account_chart_template_agricultar" model="account.chart.template">
+            <field name="name">Agricultar</field>
+            <field name="complete_tax_set" eval="False" />
+            <field name="parent_id" ref="account_chart_template_basic"/>
+        </record>
+        <record id="account_chart_template_construction" model="account.chart.template">
+            <field name="name">Construction Trades (Plumber, Electrician, HVAC, etc.)</field>
+            <field name="complete_tax_set" eval="False" />
+            <field name="parent_id" ref="account_chart_template_cogs"/>
+        </record>
+
+        <record id="account_chart_template_financial_service" model="account.chart.template">
+            <field name="name">Financial Services other than Accounting or Bookkeeping</field>
+            <field name="complete_tax_set" eval="False" />
+            <field name="parent_id" ref="account_chart_template_cogs"/>
+        </record>
+
+        <record id="account_chart_template_general_service" model="account.chart.template">
+            <field name="name">General Service-Based Business</field>
+            <field name="complete_tax_set" eval="False" />
+            <field name="parent_id" ref="account_chart_template_cogs"/>
+        </record>
+
+        <record id="account_chart_template_legal_service" model="account.chart.template">
+            <field name="name">Legal Services</field>
+            <field name="complete_tax_set" eval="False" />
+            <field name="parent_id" ref="account_chart_template_basic"/>
+        </record>
+
+        <record id="account_chart_template_general_product" model="account.chart.template">
+            <field name="name">General Product-Based Business</field>
+            <field name="complete_tax_set" eval="False" />
+            <field name="parent_id" ref="account_chart_template_basic"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/l10n_us/account_chart_template_after.xml b/addons/l10n_us/account_chart_template_after.xml
new file mode 100644
index 00000000000..3c570126fcd
--- /dev/null
+++ b/addons/l10n_us/account_chart_template_after.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <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"/>
+        </record>
+
+        <record id="account_chart_template_agricultar" model="account.chart.template">
+            <field name="bank_account_view_id" ref="cash_expenditure"/>
+        </record>
+
+        <record id="account_chart_template_construction" model="account.chart.template">
+            <field name="bank_account_view_id" ref="cash_expenditure"/>
+        </record>
+
+        <record id="account_chart_template_financial_service" model="account.chart.template">
+            <field name="bank_account_view_id" ref="cash_expenditure"/>
+        </record>
+
+        <record id="account_chart_template_general_service" model="account.chart.template">
+            <field name="bank_account_view_id" ref="cash_expenditure"/>
+        </record>
+
+        <record id="account_chart_template_legal_service" model="account.chart.template">
+            <field name="bank_account_view_id" ref="cash_expenditure"/>
+        </record>
+
+        <record id="account_chart_template_general_product" model="account.chart.template">
+            <field name="bank_account_view_id" ref="cash_expenditure"/>
+        </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..bb15368878e
--- /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_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_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>
+
+        <!-- = = = = = = = = = = = = = = = -->
+        <!-- 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_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_tax_exempt_template"/>
+            <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
new file mode 100644
index 00000000000..1b64a4e6487
--- /dev/null
+++ b/addons/l10n_us/l10n_us_account_type.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- account.account.type -->
+        <record id="user_type_view" model="account.account.type">
+            <field name="name">View</field>
+            <field name="code">view</field>
+            <field name="close_method">none</field>
+        </record>
+
+        <!-- Asset -->
+
+        <record id="user_type_current_asset" model="account.account.type">
+            <field name="name">Current Asset</field>
+            <field name="code">current asset</field>
+            <field name="report_type">asset</field>
+            <field name="close_method">balance</field>
+        </record>
+        <record id="user_type_cash" model="account.account.type">
+            <field name="name">Cash</field>
+            <field name="code">cash</field>
+            <field name="report_type">asset</field>
+            <field name="close_method">balance</field>
+        </record>        
+        <record id="user_type_account_receivable" model="account.account.type">
+            <field name="name">Account Receivable</field>
+            <field name="code">account rec</field>
+            <field name="report_type">asset</field>
+            <field name="close_method">unreconciled</field>
+        </record>        
+        <record id="user_type_other_current_asset" model="account.account.type">
+            <field name="name">Other Current Asset</field>
+            <field name="code">other -current asset</field>
+            <field name="report_type">asset</field>
+            <field name="close_method">balance</field>
+        </record>
+        <record id="user_type_fixed_asset" model="account.account.type">
+            <field name="name">Fixed Asset</field>
+            <field name="code">fixed asset</field>
+            <field name="report_type">asset</field>
+            <field name="close_method">balance</field>
+        </record>
+        <record id="user_type_accumulated_depreciation" model="account.account.type">
+            <field name="name">Accumulated Depreciation</field>
+            <field name="code">Accumulated Depreciation</field>
+            <field name="report_type">asset</field>
+            <field name="close_method">balance</field>
+        </record>        
+        <record id="user_type_other_asset" model="account.account.type">
+            <field name="name">Other Asset</field>
+            <field name="code">other -asset</field>
+            <field name="report_type">asset</field>
+            <field name="close_method">balance</field>
+        </record>
+
+        <!-- liability -->
+        <record id="user_type_account_payable" model="account.account.type">
+            <field name="name">Account Payable</field>
+            <field name="code">account -pay</field>
+            <field name="report_type">liability</field>
+            <field name="close_method">unreconciled</field>
+        </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="close_method">balance</field>
+        </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="close_method">balance</field>
+        </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="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="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="close_method">balance</field>
+        </record>
+        <!-- Equity -->
+        <record id="user_type_equity" model="account.account.type">
+            <field name="name">Equity</field>
+            <field name="code">equity</field>
+            <field name="report_type">liability</field>
+            <field name="close_method">balance</field>
+        </record>
+
+        <!-- Income -->
+        <record id="user_type_income" model="account.account.type">
+            <field name="name">Income</field>
+            <field name="code">income</field>
+            <field name="report_type">income</field>
+            <field name="close_method">none</field>
+        </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>
+        </record>
+
+        <!-- Expense -->  
+        <record id="user_type_expense" model="account.account.type">
+            <field name="name">Expense</field>
+            <field name="code">expense</field>
+            <field name="report_type">expense</field>
+            <field name="close_method">none</field>
+        </record>
+        <record id="user_type_other_expense" model="account.account.type">
+            <field name="name">Other Expense</field>
+            <field name="code">other -expense</field>
+            <field name="report_type">expense</field>
+            <field name="close_method">none</field>
+        </record>
+        
+        <record id="user_type_cogs" model="account.account.type">
+            <field name="name">Cost of Goods Sold</field>
+            <field name="code">cogs</field>
+            <field name="report_type">expense</field>
+            <field name="close_method">none</field>
+        </record>
+
+        <!--record model="account.tax.code.template" id="tax_code">
+            <field name="name">Tax</field>
+        </record-->        
+    </data>
+</openerp>
diff --git a/addons/l10n_us/l10n_us_wizard.xml b/addons/l10n_us/l10n_us_wizard.xml
new file mode 100644
index 00000000000..5d485b490b1
--- /dev/null
+++ b/addons/l10n_us/l10n_us_wizard.xml
@@ -0,0 +1,14 @@
+<openerp>
+    <data>
+
+		<record id="config_call_account_template" model="ir.actions.todo">
+	        <field name="name">Generate Chart of Accounts from a Chart Template</field>
+	        <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
+	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
+	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
+	        <field name="category_id" ref="account.category_accounting_configuration"/>
+        	<field name="type">automatic</field>
+    	</record>
+
+    </data>
+</openerp>