From df765fab238930d09ed7358f7241a3ef5a498151 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>
Date: Wed, 24 Oct 2012 22:22:42 -0400
Subject: [PATCH] [FIX] Account chart templates [ADD] Dependency, accounts,
 default settings for real time inventory

bzr revid: maxime.chambreuil@savoirfairelinux.com-20121025022242-exictblb8myshq9t
---
 addons/l10n_ca/__openerp__.py                |  9 +++-
 addons/l10n_ca/account_chart_en.xml          | 40 ++++++++++++----
 addons/l10n_ca/account_chart_fr.xml          | 48 +++++++++++++-------
 addons/l10n_ca/account_chart_template_en.xml | 19 +++++++-
 addons/l10n_ca/account_chart_template_fr.xml | 20 +++++++-
 5 files changed, 108 insertions(+), 28 deletions(-)

diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index 9c3cfea2fb1..05279b6ef8e 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -30,7 +30,14 @@ This is the module to manage the English and French - Canadian accounting chart
 
 Canadian accounting charts and localizations.
     """,
-    'depends': ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
+    'depends': [
+        'base',
+        'account',
+        'base_iban',
+        'base_vat',
+        'account_chart',
+        'account_anglo_saxon'
+    ],
     'data': [
         'account_chart_en.xml',
         'account_tax_code_en.xml',
diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml
index acb4fa4802b..27f06985fbd 100644
--- a/addons/l10n_ca/account_chart_en.xml
+++ b/addons/l10n_ca/account_chart_en.xml
@@ -36,14 +36,6 @@
         <field name="name">CASH</field>
     </record>
 
-    <record id="chart1111_en" model="account.account.template">
-        <field name="code">1111</field>
-        <field name="parent_id" ref="chart111_en"/>
-        <field name="type">liquidity</field>
-        <field name="user_type" ref="account.data_account_type_bank"/>
-        <field name="name">Checking Account</field>
-    </record>
-
     <record id="chart112_en" model="account.account.template">
         <field name="code">112</field>
         <field name="parent_id" ref="chart11_en"/>
@@ -68,6 +60,22 @@
         <field name="name">STOCKS</field>
     </record>
 
+    <record id="chart1141_en" model="account.account.template">
+        <field name="code">1141</field>
+        <field name="parent_id" ref="chart114_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_asset"/>
+        <field name="name">Stock In Hand</field>
+    </record>
+
+    <record id="chart1145_en" model="account.account.template">
+        <field name="code">1145</field>
+        <field name="parent_id" ref="chart114_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_asset"/>
+        <field name="name">Stock Delivered But Not Billed</field>
+    </record>
+
     <record id="chart115_en" model="account.account.template">
         <field name="code">115</field>
         <field name="parent_id" ref="chart11_en"/>
@@ -270,6 +278,22 @@
         <field name="name">CURRENT FINANCIAL DEBTS</field>
     </record>
 
+    <record id="chart214_en" model="account.account.template">
+        <field name="code">214</field>
+        <field name="parent_id" ref="chart21_en"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">STOCK LIABILITIES</field>
+    </record>
+
+    <record id="chart2141_en" model="account.account.template">
+        <field name="code">2141</field>
+        <field name="parent_id" ref="chart214_en"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_liability"/>
+        <field name="name">Stock Received But Not Billed</field>
+    </record>
+
     <record id="chart25_en" model="account.account.template">
         <field name="code">25</field>
         <field name="parent_id" ref="chart2_en"/>
diff --git a/addons/l10n_ca/account_chart_fr.xml b/addons/l10n_ca/account_chart_fr.xml
index dbf4f9aad7c..8adfbb5eab6 100644
--- a/addons/l10n_ca/account_chart_fr.xml
+++ b/addons/l10n_ca/account_chart_fr.xml
@@ -36,22 +36,6 @@
         <field name="name">ENCAISSE</field>
     </record>
 
-    <record id="chart1111_fr" model="account.account.template">
-        <field name="code">1111</field>
-        <field name="parent_id" ref="chart111_fr"/>
-        <field name="type">liquidity</field>
-        <field name="user_type" ref="account.data_account_type_bank"/>
-        <field name="name">Compte chèque</field>
-    </record>
-
-    <record id="chart1112_fr" model="account.account.template">
-        <field name="code">1112</field>
-        <field name="parent_id" ref="chart111_fr"/>
-        <field name="type">liquidity</field>
-        <field name="user_type" ref="account.data_account_type_cash"/>
-        <field name="name">Petite caisse</field>
-    </record>
-
     <record id="chart112_fr" model="account.account.template">
         <field name="code">112</field>
         <field name="parent_id" ref="chart11_fr"/>
@@ -76,6 +60,22 @@
         <field name="name">STOCKS</field>
     </record>
 
+    <record id="chart1141_fr" model="account.account.template">
+        <field name="code">1141</field>
+        <field name="parent_id" ref="chart114_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_asset"/>
+        <field name="name">Stock</field>
+    </record>
+
+    <record id="chart1145_fr" model="account.account.template">
+        <field name="code">1145</field>
+        <field name="parent_id" ref="chart114_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_asset"/>
+        <field name="name">Stock expédié non-facturé</field>
+    </record>
+
     <record id="chart115_fr" model="account.account.template">
         <field name="code">115</field>
         <field name="parent_id" ref="chart11_fr"/>
@@ -294,6 +294,22 @@
         <field name="name">PASSIFS LIÉS AUX ACTIFS DÉTENUS EN VUE DE LEUR CESSION</field>
     </record>
 
+    <record id="chart216_fr" model="account.account.template">
+        <field name="code">216</field>
+        <field name="parent_id" ref="chart21_fr"/>
+        <field name="type">view</field>
+        <field name="user_type" ref="account.data_account_type_view"/>
+        <field name="name">PASSIFS DE STOCK</field>
+    </record>
+
+    <record id="chart2161_fr" model="account.account.template">
+        <field name="code">2161</field>
+        <field name="parent_id" ref="chart216_fr"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account.data_account_type_liability"/>
+        <field name="name">Stock reçu non facturé</field>
+    </record>
+
     <record id="chart25_fr" model="account.account.template">
         <field name="code">25</field>
         <field name="parent_id" ref="chart2_fr"/>
diff --git a/addons/l10n_ca/account_chart_template_en.xml b/addons/l10n_ca/account_chart_template_en.xml
index 6ddfa567d98..ad566c5add8 100644
--- a/addons/l10n_ca/account_chart_template_en.xml
+++ b/addons/l10n_ca/account_chart_template_en.xml
@@ -8,11 +8,26 @@
         <field name="name">Canada - Chart of Accounts for english-speaking provinces</field>
         <field name="account_root_id" ref="chart0_en"/>
         <field name="tax_code_root_id" ref="vat_code_tax_en"/>
-        <field name="bank_account_view_id" ref="chart1111_en"/>
+        <field name="bank_account_view_id" ref="chart111_en"/>
         <field name="property_account_receivable" ref="chart1151_en"/>
         <field name="property_account_payable" ref="chart2111_en"/>
         <field name="property_account_income_categ" ref="chart411_en"/>
-        <field name="property_account_expense_categ" ref="chart511_en"/>
+        <field name="property_account_expense_categ" ref="chart5111_en"/>
+    </record>
+
+    <record id="stock.property_stock_account_input_categ" model="ir.property">
+        <field eval="'account.account,'+str(ref('chart2141_en'))" model="account.account" name="value"/>
+    </record>
+
+    <record id="stock.property_stock_account_output_categ" model="ir.property">
+        <field eval="'account.account,'+str(ref('chart1145_en'))" model="account.account" name="value"/>
+    </record>
+
+    <record id="property_stock_valuation_account_id_en" model="ir.property">
+        <field name="name">property_stock_valuation_account_id</field>
+        <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_valuation_account_id')]"/>
+        <field name="company_id" ref="base.main_company"/>
+        <field eval="'account.account,'+str(ref('chart1141_en'))" model="account.account" name="value"/>
     </record>
 
     </data>
diff --git a/addons/l10n_ca/account_chart_template_fr.xml b/addons/l10n_ca/account_chart_template_fr.xml
index 02f4deee714..b680ddad7ae 100644
--- a/addons/l10n_ca/account_chart_template_fr.xml
+++ b/addons/l10n_ca/account_chart_template_fr.xml
@@ -7,12 +7,30 @@
         <field name="name">Canada - Plan comptable pour les provinces francophones</field>
         <field name="account_root_id" ref="chart0_fr"/>
         <field name="tax_code_root_id" ref="vat_code_tax_fr"/>
-        <field name="bank_account_view_id" ref="chart1111_fr"/>
+        <field name="bank_account_view_id" ref="chart111_fr"/>
         <field name="property_account_receivable" ref="chart1151_fr"/>
         <field name="property_account_payable" ref="chart2111_fr"/>
         <field name="property_account_income_categ" ref="chart411_fr"/>
         <field name="property_account_expense_categ" ref="chart5111_fr"/>
     </record>
 
+    <record id="stock.property_stock_account_input_categ" model="ir.property">
+        <field eval="'account.account,'+str(ref('chart2161_fr'))" model="account.account" name="value"/>
+        <field eval="'product.category,'+str(ref('product.cat0'))" model="product.category" name="res_id"/>
+    </record>
+
+    <record id="stock.property_stock_account_output_categ" model="ir.property">
+        <field eval="'account.account,'+str(ref('chart1145_fr'))" model="account.account" name="value"/>
+        <field eval="'product.category,'+str(ref('product.cat0'))" model="product.category" name="res_id"/>
+    </record>
+
+    <record id="property_stock_valuation_account_id" model="ir.property">
+        <field name="name">property_stock_valuation_account_id</field>
+        <field name="fields_id" search="[('model','=','product.category'),('name','=','property_stock_valuation_account_id')]"/>
+        <field name="company_id" ref="base.main_company"/>
+        <field eval="'account.account,'+str(ref('chart1141_fr'))" model="account.account" name="value"/>
+        <field eval="'product.category,'+str(ref('product.cat0'))" model="product.category" name="res_id"/>
+    </record>
+
     </data>
 </openerp>