From 932748d97b142a05eb504481123ee275c3b0d54b Mon Sep 17 00:00:00 2001
From: pvy <pvy@odoo.com>
Date: Mon, 28 Sep 2015 17:01:42 +0200
Subject: [PATCH] [FIX] l10n_sa is back, compliant with the new accounting

---
 addons/l10n_sa/__openerp__.py                 |  10 +-
 addons/l10n_sa/account.account.template.csv   | 145 ++++++++----------
 addons/l10n_sa/account.chart.template.xml     |  43 ++++--
 addons/l10n_sa/account_chart_template.yml     |   3 +
 .../l10n_sa/account_chart_template_after.xml  |  14 ++
 addons/l10n_sa/account_type.xml               | 138 -----------------
 addons/l10n_sa/wizard.xml                     |   9 --
 7 files changed, 114 insertions(+), 248 deletions(-)
 create mode 100644 addons/l10n_sa/account_chart_template.yml
 create mode 100644 addons/l10n_sa/account_chart_template_after.xml
 delete mode 100644 addons/l10n_sa/account_type.xml
 delete mode 100644 addons/l10n_sa/wizard.xml

diff --git a/addons/l10n_sa/__openerp__.py b/addons/l10n_sa/__openerp__.py
index fc7857d8715..aa293fdc63b 100644
--- a/addons/l10n_sa/__openerp__.py
+++ b/addons/l10n_sa/__openerp__.py
@@ -13,15 +13,15 @@ This initially includes chart of accounts of USA translated to Arabic.
 In future this module will include some payroll rules for ME .
 """,
     'website': 'http://www.dvit.me',
-    'depends': ['account_chart', 'l10n_multilang'],
+    'depends': ['account'],  # TODO: should also depend on multilang
     'data': [
-        'account_type.xml',
-        'account.account.template.csv',
         'account.chart.template.xml',
-        'wizard.xml',
+        'account.account.template.csv',
+        'account_chart_template_after.xml',
+        'account_chart_template.yml',
     ],
     'demo': [],
     'test': [],
-    'installable': False,   # need to be adaped
+    'installable': True,
     'auto_install': False,
 }
diff --git a/addons/l10n_sa/account.account.template.csv b/addons/l10n_sa/account.account.template.csv
index 7acfa229d1a..3fabfcfc694 100644
--- a/addons/l10n_sa/account.account.template.csv
+++ b/addons/l10n_sa/account.account.template.csv
@@ -1,81 +1,64 @@
-id,code,name,type,user_type:id,parent_id:id,reconcile
-coa_basic,0,Basic,view,user_type_view,,False
-asset,1,Assets,view,user_type_current_asset,coa_basic,False
-current_asset,100,Current Assets,view,user_type_current_asset,asset,False
-cash_expenditure,1000,Cash and Bank,view,user_type_cash,current_asset,False
-receivables,1200,Receivable,view,user_type_current_asset,current_asset,False
-account_receivable,12001,Account Receivable,receivable,user_type_account_receivable,receivables,True
-fixed_asset,150,Fixed Assets,view,user_type_fixed_asset,asset,False
-15000_furniture_equipments,15000,Furniture and Equipment,other,user_type_fixed_asset,fixed_asset,False
-17000_accu_deprec,17000,Accumulated Depreciation,other,user_type_accumulated_depreciation,fixed_asset,False
-liability_equity,2,Liabilities and Equity,view,user_type_liability,coa_basic,False
-liability,20,Liabilities,view,user_type_liability,liability_equity,False
-current_liability,200,Current Liabilities,view,user_type_current_liability,liability,False
-payable,2000,Payable,view,user_type_account_payable,current_liability,False
-account_payable,20001,Account Payable,payable,user_type_account_payable,payable,True
-other_current_liability,240,Other Current Liabilities,view,user_type_other_current_liability,liability,False
-24000_payroll_exp,24000,Payroll Liabilities,other,user_type_other_current_liability,other_current_liability,False
-25500_sales_tax_pay,25500,Sales Tax Payable,other,user_type_other_current_liability,other_current_liability,False
-26500_use_tax_pay,26500,Use Tax Payable,other,user_type_other_current_liability,other_current_liability,False
-equity,30,Equity,view,user_type_equity,liability_equity,False
-30100_capital_stock,30100,Capital Stock,other,user_type_equity,equity,False
-30200_divid_paid,30200,Dividends Paid,other,user_type_equity,equity,False
-30000_open_balance,30000,Opening Balance Equity,other,user_type_equity,equity,False
-32000_retain_earn,32000,Retained Earnings,other,user_type_equity,equity,False
-expense,60,Expenses,view,user_type_expense,coa_basic,False
-60000_advert_promo,60000,Advertising and Promotion,other,user_type_expense,expense,False
-60200_auto_exp,60200,Automobile Expense,other,user_type_expense,expense,False
-60400_bank_charge,60400,Bank Service Charges,other,user_type_expense,expense,False
-61000_license_permit,61000,Business Licenses and Permits,other,user_type_expense,expense,False
-62000_financial_services,62000,Continuing Education,other,user_type_expense,expense,False
-61400_charit_contrib,61400,Charitable Contributions,other,user_type_expense,expense,False
-61700_computer_internet,61700,Computer and Internet Expenses,other,user_type_expense,expense,False
-62400_depreciation_exp,62400,Depreciation Expense,other,user_type_expense,expense,False
-62500_dues_subscrip,62500,Dues and Subscriptions,other,user_type_expense,expense,False
-62600_equip_rent,62600,Equipment Rental,other,user_type_expense,expense,False
-63400_interest_exp,63400,Interest Expense,other,user_type_expense,expense,False
-64300_meals_entertain,64300,Meals and Entertainment,other,user_type_expense,expense,False
-64900_office_supp,64900,Office Supplies,other,user_type_expense,expense,False
-66000_payroll_exp,66000,Payroll Expenses,other,user_type_expense,expense,False
-66500_postage_deliver,66500,Postage and Delivery,other,user_type_expense,expense,False
-66660_printing_reporduction,66600,Printing and Reproduction,other,user_type_expense,expense,False
-66700_prof_fees,66700,Professional Fees,other,user_type_expense,expense,False
-67100_rent_exp,67100,Rent Expense,other,user_type_expense,expense,False
-67200_repair_mainten,67200,Repairs and Maintenance,other,user_type_expense,expense,False
-68000_tax_property,68000,Taxes - Property,other,user_type_expense,expense,False
-68100_telephone_exp,68100,Telephone Expense,other,user_type_expense,expense,False
-68400_transport_travel,68400,Travel Expense,other,user_type_expense,expense,False
-68600_utilities,68600,Utilities,other,user_type_expense,expense,False
-64200_marketing_exp,64200,Marketing Expense,other,user_type_expense,expense,False
-63200_gas_oil_exp,63200,"Gasoline, Fuel and Oil",other,user_type_expense,expense,False
-base_miscexpense,69000,Miscellaneous Expense,other,user_type_expense,expense,False
-insurance,693,Insurance Expense,view,user_type_expense,expense,False
-69310_general_liab_insurance,69310,General Liability Insurance,other,user_type_expense,insurance,False
-69320_health_insurance,69320,Health Insurance,other,user_type_expense,insurance,False
-69330_life_insurance,69330,Life and Disability Insurance,other,user_type_expense,insurance,False
-69350_prof_insurance,69350,Professional Liability,other,user_type_expense,insurance,False
-69360_worker_compons,69360,Worker's Compensation,other,user_type_expense,insurance,False
-income,40,Income,view,user_type_income,coa_basic,False
-42400_commission_income,42400,Commission income,other,user_type_income,income,False
-47400_rent_income,47400,Rent Income,other,user_type_income,income,False
-47900_general_service_sales,47900,Service Sales,other,user_type_income,income,False
-47910_general_product_sales,47910,Product Sales,other,user_type_income,income,False
-48310_product_sales_discount,48310,Sales Discounts,other,user_type_income,income,False
-48900_product_shipping_income,48900,Shipping and Delivery Income,other,user_type_income,income,False
-base_miscincome,49000,Miscellaneous Income,other,user_type_income,income,False
-other_income,70,Other Income,view,user_type_other_income,coa_basic,False
-70000_finance_income,70000,Finance Charge Income,other,user_type_other_income,other_income,False
-70200_interest_income,70200,Interest Income,other,user_type_other_income,other_income,False
-70500_assets_sold,70500,Proceeds from Sale of Assets,other,user_type_other_income,other_income,False
-70100_insurance_income,70100,Insurance Proceeds Received,other,user_type_other_income,other_income,False
-cost_of_goods_sold,50,Cost of Goods Sold,view,user_type_cogs,coa_basic,False
-53600_other_related_costs,53600,Other Job Related Costs,other,user_type_cogs,cost_of_goods_sold,False
-51100_product_shipping_cost,51100,Freight and Shipping Costs,other,user_type_cogs,cost_of_goods_sold,False
-52500_product_purchase_discount,52500,Purchase Discounts,other,user_type_cogs,cost_of_goods_sold,False
-52900_general_product_cost,52900,Purchases - Resale Items,other,user_type_cogs,cost_of_goods_sold,False
-50300_commissions_paid,50300,Commissions Paid,other,user_type_cogs,cost_of_goods_sold,False
-53500_subcontracted_services,53500,Subcontractors Expense,other,user_type_cogs,cost_of_goods_sold,False
-52000_merchant_fees,52000,Merchant Account Fees,other,user_type_cogs,cost_of_goods_sold,False
-53800_subcontract_exp,53800,Subcontractors Expense,other,user_type_cogs,cost_of_goods_sold,False
-54100_tools_equip,54100,Tools and Small Equipment,other,user_type_cogs,cost_of_goods_sold,False
-24600_customer_deposit,24600,Customer Deposits Received,other,user_type_other_current_liability,other_current_liability,False
+id,code,name,user_type_id:id,chart_template_id:id,reconcile
+account_receivable,12001,Account Receivable,account.data_account_type_receivable,account_arabic_coa_general,True
+15000_furniture_equipments,15000,Furniture and Equipment,account.data_account_type_fixed_assets,account_arabic_coa_general,False
+17000_accu_deprec,17000,Accumulated Depreciation,account.data_account_type_fixed_assets,account_arabic_coa_general,False
+account_payable,20001,Account Payable,account.data_account_type_payable,account_arabic_coa_general,True
+24000_payroll_exp,24000,Payroll Liabilities,account.data_account_type_current_liabilities,account_arabic_coa_general,False
+25500_sales_tax_pay,25500,Sales Tax Payable,account.data_account_type_current_liabilities,account_arabic_coa_general,False
+26500_use_tax_pay,26500,Use Tax Payable,account.data_account_type_current_liabilities,account_arabic_coa_general,False
+30100_capital_stock,30100,Capital Stock,account.data_account_type_equity,account_arabic_coa_general,False
+30200_divid_paid,30200,Dividends Paid,account.data_account_type_equity,account_arabic_coa_general,False
+30000_open_balance,30000,Opening Balance Equity,account.data_account_type_equity,account_arabic_coa_general,False
+32000_retain_earn,32000,Retained Earnings,account.data_account_type_equity,account_arabic_coa_general,False
+60000_advert_promo,60000,Advertising and Promotion,account.data_account_type_expenses,account_arabic_coa_general,False
+60200_auto_exp,60200,Automobile Expense,account.data_account_type_expenses,account_arabic_coa_general,False
+60400_bank_charge,60400,Bank Service Charges,account.data_account_type_expenses,account_arabic_coa_general,False
+61000_license_permit,61000,Business Licenses and Permits,account.data_account_type_expenses,account_arabic_coa_general,False
+62000_financial_services,62000,Continuing Education,account.data_account_type_expenses,account_arabic_coa_general,False
+61400_charit_contrib,61400,Charitable Contributions,account.data_account_type_expenses,account_arabic_coa_general,False
+61700_computer_internet,61700,Computer and Internet Expenses,account.data_account_type_expenses,account_arabic_coa_general,False
+62400_depreciation_exp,62400,Depreciation Expense,account.data_account_type_expenses,account_arabic_coa_general,False
+62500_dues_subscrip,62500,Dues and Subscriptions,account.data_account_type_expenses,account_arabic_coa_general,False
+62600_equip_rent,62600,Equipment Rental,account.data_account_type_expenses,account_arabic_coa_general,False
+63400_interest_exp,63400,Interest Expense,account.data_account_type_expenses,account_arabic_coa_general,False
+64300_meals_entertain,64300,Meals and Entertainment,account.data_account_type_expenses,account_arabic_coa_general,False
+64900_office_supp,64900,Office Supplies,account.data_account_type_expenses,account_arabic_coa_general,False
+66000_payroll_exp,66000,Payroll Expenses,account.data_account_type_expenses,account_arabic_coa_general,False
+66500_postage_deliver,66500,Postage and Delivery,account.data_account_type_expenses,account_arabic_coa_general,False
+66660_printing_reporduction,66600,Printing and Reproduction,account.data_account_type_expenses,account_arabic_coa_general,False
+66700_prof_fees,66700,Professional Fees,account.data_account_type_expenses,account_arabic_coa_general,False
+67100_rent_exp,67100,Rent Expense,account.data_account_type_expenses,account_arabic_coa_general,False
+67200_repair_mainten,67200,Repairs and Maintenance,account.data_account_type_expenses,account_arabic_coa_general,False
+68000_tax_property,68000,Taxes - Property,account.data_account_type_expenses,account_arabic_coa_general,False
+68100_telephone_exp,68100,Telephone Expense,account.data_account_type_expenses,account_arabic_coa_general,False
+68400_transport_travel,68400,Travel Expense,account.data_account_type_expenses,account_arabic_coa_general,False
+68600_utilities,68600,Utilities,account.data_account_type_expenses,account_arabic_coa_general,False
+64200_marketing_exp,64200,Marketing Expense,account.data_account_type_expenses,account_arabic_coa_general,False
+63200_gas_oil_exp,63200,"Gasoline, Fuel and Oil",account.data_account_type_expenses,account_arabic_coa_general,False
+base_miscexpense,69000,Miscellaneous Expense,account.data_account_type_expenses,account_arabic_coa_general,False
+69310_general_liab_insurance,69310,General Liability Insurance,account.data_account_type_expenses,account_arabic_coa_general,False
+69320_health_insurance,69320,Health Insurance,account.data_account_type_expenses,account_arabic_coa_general,False
+69330_life_insurance,69330,Life and Disability Insurance,account.data_account_type_expenses,account_arabic_coa_general,False
+69350_prof_insurance,69350,Professional Liability,account.data_account_type_expenses,account_arabic_coa_general,False
+69360_worker_compons,69360,Worker's Compensation,account.data_account_type_expenses,account_arabic_coa_general,False
+42400_commission_income,42400,Commission income,account.data_account_type_revenue,account_arabic_coa_general,False
+47400_rent_income,47400,Rent Income,account.data_account_type_revenue,account_arabic_coa_general,False
+47900_general_service_sales,47900,Service Sales,account.data_account_type_revenue,account_arabic_coa_general,False
+47910_general_product_sales,47910,Product Sales,account.data_account_type_revenue,account_arabic_coa_general,False
+48310_product_sales_discount,48310,Sales Discounts,account.data_account_type_revenue,account_arabic_coa_general,False
+48900_product_shipping_income,48900,Shipping and Delivery Income,account.data_account_type_revenue,account_arabic_coa_general,False
+base_miscincome,49000,Miscellaneous Income,account.data_account_type_revenue,account_arabic_coa_general,False
+70000_finance_income,70000,Finance Charge Income,account.data_account_type_other_income,account_arabic_coa_general,False
+70200_interest_income,70200,Interest Income,account.data_account_type_other_income,account_arabic_coa_general,False
+70500_assets_sold,70500,Proceeds from Sale of Assets,account.data_account_type_other_income,account_arabic_coa_general,False
+70100_insurance_income,70100,Insurance Proceeds Received,account.data_account_type_other_income,account_arabic_coa_general,False
+53600_other_related_costs,53600,Other Job Related Costs,account.data_account_type_direct_costs,account_arabic_coa_general,False
+51100_product_shipping_cost,51100,Freight and Shipping Costs,account.data_account_type_direct_costs,account_arabic_coa_general,False
+52500_product_purchase_discount,52500,Purchase Discounts,account.data_account_type_direct_costs,account_arabic_coa_general,False
+52900_general_product_cost,52900,Purchases - Resale Items,account.data_account_type_direct_costs,account_arabic_coa_general,False
+50300_commissions_paid,50300,Commissions Paid,account.data_account_type_direct_costs,account_arabic_coa_general,False
+53500_subcontracted_services,53500,Subcontractors Expense,account.data_account_type_direct_costs,account_arabic_coa_general,False
+52000_merchant_fees,52000,Merchant Account Fees,account.data_account_type_direct_costs,account_arabic_coa_general,False
+53800_subcontract_exp,53800,Subcontractors Expense,account.data_account_type_direct_costs,account_arabic_coa_general,False
+54100_tools_equip,54100,Tools and Small Equipment,account.data_account_type_direct_costs,account_arabic_coa_general,False
+24600_customer_deposit,24600,Customer Deposits Received,account.data_account_type_current_liabilities,account_arabic_coa_general,False
diff --git a/addons/l10n_sa/account.chart.template.xml b/addons/l10n_sa/account.chart.template.xml
index f65ec3dfc57..c5e0e13d574 100644
--- a/addons/l10n_sa/account.chart.template.xml
+++ b/addons/l10n_sa/account.chart.template.xml
@@ -1,24 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
+    <data noupdate="1">
+        <record id="action_client_l10n_sa_menu" model="ir.actions.client">
+            <field name="name">Open Account Dashboard Menu</field>
+            <field name="tag">reload</field>
+            <field name="params" eval="{'menu_id': ref('account.menu_board_journal_1')}"/>
+        </record>
+        <record id="base.open_menu" model="ir.actions.todo">
+            <field name="action_id" ref="action_client_l10n_sa_menu"/>
+            <field name="state">open</field>
+        </record>
+    </data>
+
     <data>
+        <record id="transfer_account" model="account.account.template">
+            <field name="name">Transfer Account</field>
+            <field name="code">18</field>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="reconcile" eval="True"/>
+        </record>
 
         <record id="account_arabic_coa_general" model="account.chart.template">
-            <field name="name">Arabic General CoA</field>
+            <field name="name">Saudi Arabia - Chart of Accounts</field>
+            <field name="bank_account_code_prefix">1</field>
+            <field name="cash_account_code_prefix">1</field>
+            <field name="code_digits">6</field>
+            <field name="currency_id" ref="base.EGP"/>
+            <field name="transfer_account_id" ref="transfer_account"/>
             <field name="spoken_languages" eval="'en_US;ar_EG;ar_SY'"/>
-            <field name="account_root_id" ref="coa_basic"/>
-            <field name="complete_tax_set" eval="False" />
-            <field name="tax_code_root_id" ref="account.tax_code_chart_root"/>  
-            <field name="bank_account_view_id" ref="cash_expenditure"/>   
-            <field name="property_account_receivable" ref="account_receivable"/>
-            <field name="property_account_payable" ref="account_payable"/>
-            <field name="property_account_expense_categ" ref="cost_of_goods_sold"/>
-            <field name="property_account_income_categ" ref="income"/>
-            <field name="property_account_expense" ref="52900_general_product_cost"/>
-            <field name="property_account_income" ref="47910_general_product_sales"/>
-            <field name="property_account_income_opening" ref="account.conf_o_income"/>
-            <field name="property_account_expense_opening" ref="account.conf_o_expense"/>
-            <field name="currency_id" ref="base.EGP"/>            
         </record>
- 
+
+        <record id="transfer_account" model="account.account.template">
+            <field name="chart_template_id" ref="account_arabic_coa_general"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/l10n_sa/account_chart_template.yml b/addons/l10n_sa/account_chart_template.yml
new file mode 100644
index 00000000000..d52f71fc946
--- /dev/null
+++ b/addons/l10n_sa/account_chart_template.yml
@@ -0,0 +1,3 @@
+-
+  !python {model: account.chart.template, id: account_arabic_coa_general}: |
+    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_sa/account_chart_template_after.xml b/addons/l10n_sa/account_chart_template_after.xml
new file mode 100644
index 00000000000..25b924cdb30
--- /dev/null
+++ b/addons/l10n_sa/account_chart_template_after.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- Chart Template -->
+    <record id="account_arabic_coa_general" model="account.chart.template">
+        <field name="property_account_receivable_id" ref="account_receivable"/>
+        <field name="property_account_payable_id" ref="account_payable"/>
+        <field name="property_account_expense_id" ref="52900_general_product_cost"/>
+        <field name="property_account_income_id" ref="47910_general_product_sales"/>
+        <field name="property_account_expense_categ_id" ref="52900_general_product_cost"/>
+        <field name="property_account_income_categ_id" ref="47910_general_product_sales"/>
+        <field name="income_currency_exchange_account_id" ref="47910_general_product_sales"/>
+        <field name="expense_currency_exchange_account_id" ref="52900_general_product_cost"/>
+    </record>
+</odoo>
diff --git a/addons/l10n_sa/account_type.xml b/addons/l10n_sa/account_type.xml
deleted file mode 100644
index e98d23283bd..00000000000
--- a/addons/l10n_sa/account_type.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?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>
- 
-    </data>
-</openerp>
diff --git a/addons/l10n_sa/wizard.xml b/addons/l10n_sa/wizard.xml
deleted file mode 100644
index 19d27fb47c7..00000000000
--- a/addons/l10n_sa/wizard.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<openerp>
-    <data noupdate="1">
-
-        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
-            <field name="state">open</field>
-        </record>
-
-    </data>
-</openerp>