[IMP] l10n_*: start adapting to accounting v9 - not finished, so all l10n modules are uninstallable for now

8 files changed, 13 insertions, 164 deletions

diff --git a/addons/l10n_us/__init__.py b/addons/l10n_us/__init__.py
index 45de899ed49..e4a662c616d 100644
--- a/addons/l10n_us/__init__.py
+++ b/addons/l10n_us/__init__.py
@@ -17,4 +17,4 @@
 #    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/>.
 #
-##############################################################################
+##############################################################################
\ No newline at end of file
diff --git a/addons/l10n_us/__openerp__.py b/addons/l10n_us/__openerp__.py
index 515bc58ea45..f9cc7cdec47 100644
--- a/addons/l10n_us/__openerp__.py
+++ b/addons/l10n_us/__openerp__.py
@@ -28,15 +28,15 @@ United States - Chart of accounts.
 ==================================
     """,
     'website': 'http://www.openerp.com',
-    'depends': ['account_chart', 'account_anglo_saxon'],
+    'depends': ['l10n_generic_coa'],
     'data': [
-        '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'
+        #'l10n_us_account_type.xml',
+        #'account_chart_template.xml',
+        #'account.account.template.csv',
+        #'account_tax_template.xml',
+        #'account_chart_template_after.xml',
+        #'l10n_us_wizard.xml',
+        #'account_chart_template.yml',
     ],
     'demo': [],
     'test': [],
diff --git a/addons/l10n_us/account_chart_template.xml b/addons/l10n_us/account_chart_template.xml
index 0adeddc5856..52670f885d3 100644
--- a/addons/l10n_us/account_chart_template.xml
+++ b/addons/l10n_us/account_chart_template.xml
@@ -6,6 +6,7 @@
             <field name="name">Basic Chart of Account</field>
             <field name="visible" eval="False" />
             <field name="complete_tax_set" eval="False" />
+            <field name="use_anglo_saxon" eval="True" />
         </record>
 
         <record id="account_chart_template_cogs" model="account.chart.template">
diff --git a/addons/l10n_us/account_chart_template.yml b/addons/l10n_us/account_chart_template.yml
new file mode 100644
index 00000000000..219dac7d239
--- /dev/null
+++ b/addons/l10n_us/account_chart_template.yml
@@ -0,0 +1,3 @@
+-
+  !python {model: account.chart.template, id: account.configurable_chart_template}: |
+    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_us/account_chart_template_after.xml b/addons/l10n_us/account_chart_template_after.xml
index 8db22dd262a..5a1198f48ab 100644
--- a/addons/l10n_us/account_chart_template_after.xml
+++ b/addons/l10n_us/account_chart_template_after.xml
@@ -5,7 +5,6 @@
         <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"/>
             <field name="property_account_receivable" ref="account_receivable"/>
             <field name="property_account_payable" ref="account_payable"/>
             <field name="currency_id" ref="base.USD"/>
diff --git a/addons/l10n_us/account_tax_code_template.xml b/addons/l10n_us/account_tax_code_template.xml
deleted file mode 100644
index e6265b206fe..00000000000
--- a/addons/l10n_us/account_tax_code_template.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<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
index bb15368878e..c6e96ff76c0 100644
--- a/addons/l10n_us/account_tax_template.xml
+++ b/addons/l10n_us/account_tax_template.xml
@@ -7,10 +7,6 @@
             <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>
 
@@ -20,10 +16,6 @@
             <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>
 
@@ -35,10 +27,6 @@
             <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>
 
@@ -48,10 +36,6 @@
             <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>
 
diff --git a/addons/l10n_us/l10n_us_account_type.xml b/addons/l10n_us/l10n_us_account_type.xml
index 1b64a4e6487..83126e21656 100644
--- a/addons/l10n_us/l10n_us_account_type.xml
+++ b/addons/l10n_us/l10n_us_account_type.xml
@@ -5,137 +5,94 @@
         <!-- 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>