pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] with l10n_ca improvement. Courtesy of 'Savoir Faire Linux'

Browse Source 
bzr revid: api@openerp.com-20121220123235-frm0bifeb3wh2sab
This commit is contained in:
Arnaud Pineux
2012-12-20 13:32:35 +01:00
parent 58f22ff9ed 1442e61738
commit 0103b3d5b9
8 changed files with 1584 additions and 1185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_ca/__openerp__.py
+8 -1
View File
@@ -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',
addons/l10n_ca/account_chart_en.xml
+718 -526
View File
File diff suppressed because it is too large Load Diff
addons/l10n_ca/account_chart_fr.xml
+769 -601
View File
File diff suppressed because it is too large Load Diff
addons/l10n_ca/account_chart_template_en.xml
+20 -2
View File
@@ -8,11 +8,29 @@
<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"/>
<field eval="'product.category,'+str(ref('product.product_category_all'))" 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_en'))" model="account.account" name="value"/>
<field eval="'product.category,'+str(ref('product.product_category_all'))" model="product.category" name="res_id"/>
</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"/>
<field eval="'product.category,'+str(ref('product.product_category_all'))" model="product.category" name="res_id"/>
</record>
</data>
addons/l10n_ca/account_chart_template_fr.xml
+31 -13
View File
@@ -1,18 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<data>
<!-- Chart template -->
<record id="ca_fr_chart_template_fr" model="account.chart.template">
<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="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>
<!-- Chart template -->
<record id="ca_fr_chart_template_fr" model="account.chart.template">
<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="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>
</data>
<record id="stock.property_stock_account_input_categ" model="ir.property">
<field eval="'account.account,'+str(ref('chart2171_fr'))" model="account.account" name="value"/>
<field eval="'product.category,'+str(ref('product.product_category_all'))" 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.product_category_all'))" 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.product_category_all'))" model="product.category" name="res_id"/>
</record>
</data>
</openerp>
addons/l10n_ca/account_tax_en.xml
+30 -32
View File
@@ -25,8 +25,8 @@
<field name="type">percent</field>
<field name="sequence">1</field>
<field name="include_base_amount" eval="True"/>
<field name="account_collected_id" ref="chart2121_en"/>
<field name="account_paid_id" ref="chart2121_en"/>
<field name="account_collected_id" ref="chart2131_en"/>
<field name="account_paid_id" ref="chart2131_en"/>
<field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
<field name="tax_code_id" ref="vat_code_payable_gst_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
@@ -42,8 +42,8 @@
<field name="amount">0.700000</field>
<field name="type">percent</field>
<field name="sequence">2</field>
<field name="account_collected_id" ref="chart2122_en"/>
<field name="account_paid_id" ref="chart2122_en"/>
<field name="account_collected_id" ref="chart2132_en"/>
<field name="account_paid_id" ref="chart2132_en"/>
<field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
<field name="tax_code_id" ref="vat_code_payable_pst_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
@@ -72,8 +72,8 @@
<field name="type">percent</field>
<field name="sequence">1</field>
<field name="include_base_amount" eval="True"/>
<field name="account_collected_id" ref="chart2121_en"/>
<field name="account_paid_id" ref="chart2121_en"/>
<field name="account_collected_id" ref="chart2131_en"/>
<field name="account_paid_id" ref="chart2131_en"/>
<field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
<field name="tax_code_id" ref="vat_code_payable_gst_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
@@ -89,8 +89,8 @@
<field name="amount">0.100000</field>
<field name="type">percent</field>
<field name="sequence">2</field>
<field name="account_collected_id" ref="chart2122_en"/>
<field name="account_paid_id" ref="chart2122_en"/>
<field name="account_collected_id" ref="chart2132_en"/>
<field name="account_paid_id" ref="chart2132_en"/>
<field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
<field name="tax_code_id" ref="vat_code_payable_pst_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
@@ -118,9 +118,8 @@
<field name="amount">0.050000</field>
<field name="type">percent</field>
<field name="sequence">1</field>
<field name="include_base_amount" eval="True"/>
<field name="account_collected_id" ref="chart2121_en"/>
<field name="account_paid_id" ref="chart2121_en"/>
<field name="account_collected_id" ref="chart2131_en"/>
<field name="account_paid_id" ref="chart2131_en"/>
<field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
<field name="tax_code_id" ref="vat_code_payable_gst_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
@@ -130,14 +129,14 @@
<record id="tvq_sale_en" model="account.tax.template">
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">TVQ for sales - 9.5%</field>
<field name="name">TVQ for sales - 9.975%</field>
<field name="description">TVQ</field>
<field name="type_tax_use">sale</field>
<field name="amount">0.095000</field>
<field name="amount">0.099750</field>
<field name="type">percent</field>
<field name="sequence">2</field>
<field name="account_collected_id" ref="chart2122_en"/>
<field name="account_paid_id" ref="chart2122_en"/>
<field name="account_collected_id" ref="chart2132_en"/>
<field name="account_paid_id" ref="chart2132_en"/>
<field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
<field name="tax_code_id" ref="vat_code_payable_pst_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
@@ -166,8 +165,8 @@
<field name="type">percent</field>
<field name="sequence">1</field>
<field name="include_base_amount" eval="True"/>
<field name="account_collected_id" ref="chart2121_en"/>
<field name="account_paid_id" ref="chart2121_en"/>
<field name="account_collected_id" ref="chart2131_en"/>
<field name="account_paid_id" ref="chart2131_en"/>
<field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
<field name="tax_code_id" ref="vat_code_payable_gst_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
@@ -183,8 +182,8 @@
<field name="amount">0.050000</field>
<field name="type">percent</field>
<field name="sequence">2</field>
<field name="account_collected_id" ref="chart2122_en"/>
<field name="account_paid_id" ref="chart2122_en"/>
<field name="account_collected_id" ref="chart2132_en"/>
<field name="account_paid_id" ref="chart2132_en"/>
<field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
<field name="tax_code_id" ref="vat_code_payable_pst_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
@@ -201,8 +200,8 @@
<field name="type_tax_use">sale</field>
<field name="amount">0.120000</field>
<field name="type">percent</field>
<field name="account_collected_id" ref="chart2123_en"/>
<field name="account_paid_id" ref="chart2123_en"/>
<field name="account_collected_id" ref="chart2133_en"/>
<field name="account_paid_id" ref="chart2133_en"/>
<field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
<field name="tax_code_id" ref="vat_code_payable_hst_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
@@ -216,8 +215,8 @@
<field name="type_tax_use">sale</field>
<field name="amount">0.130000</field>
<field name="type">percent</field>
<field name="account_collected_id" ref="chart2123_en"/>
<field name="account_paid_id" ref="chart2123_en"/>
<field name="account_collected_id" ref="chart2133_en"/>
<field name="account_paid_id" ref="chart2133_en"/>
<field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
<field name="tax_code_id" ref="vat_code_payable_hst_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
@@ -231,8 +230,8 @@
<field name="type_tax_use">sale</field>
<field name="amount">0.135000</field>
<field name="type">percent</field>
<field name="account_collected_id" ref="chart2123_en"/>
<field name="account_paid_id" ref="chart2123_en"/>
<field name="account_collected_id" ref="chart2133_en"/>
<field name="account_paid_id" ref="chart2133_en"/>
<field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
<field name="tax_code_id" ref="vat_code_payable_hst_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
@@ -246,8 +245,8 @@
<field name="type_tax_use">sale</field>
<field name="amount">0.150000</field>
<field name="type">percent</field>
<field name="account_collected_id" ref="chart2123_en"/>
<field name="account_paid_id" ref="chart2123_en"/>
<field name="account_collected_id" ref="chart2133_en"/>
<field name="account_paid_id" ref="chart2133_en"/>
<field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
<field name="tax_code_id" ref="vat_code_payable_hst_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
@@ -263,8 +262,8 @@
<field name="type_tax_use">sale</field>
<field name="amount">0.050000</field>
<field name="type">percent</field>
<field name="account_collected_id" ref="chart2121_en"/>
<field name="account_paid_id" ref="chart2121_en"/>
<field name="account_collected_id" ref="chart2131_en"/>
<field name="account_paid_id" ref="chart2131_en"/>
<field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
<field name="tax_code_id" ref="vat_code_payable_gst_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
@@ -388,7 +387,6 @@
<field name="amount">0.050000</field>
<field name="type">percent</field>
<field name="sequence">1</field>
<field name="include_base_amount" eval="True"/>
<field name="account_collected_id" ref="chart1181_en"/>
<field name="account_paid_id" ref="chart1181_en"/>
<field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
@@ -400,10 +398,10 @@
<record id="tvq_purc_en" model="account.tax.template">
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">TVQ for purchases - 9.5%</field>
<field name="name">TVQ for purchases - 9.975%</field>
<field name="description">TVQ</field>
<field name="type_tax_use">purchase</field>
<field name="amount">0.095000</field>
<field name="amount">0.099750</field>
<field name="type">percent</field>
<field name="sequence">2</field>
<field name="account_collected_id" ref="chart1182_en"/>
addons/l10n_ca/account_tax_fr.xml
+4 -6
View File
@@ -118,7 +118,6 @@
<field name="amount">0.050000</field>
<field name="type">percent</field>
<field name="sequence">1</field>
<field name="include_base_amount" eval="True"/>
<field name="account_collected_id" ref="chart2131_fr"/>
<field name="account_paid_id" ref="chart2131_fr"/>
<field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
@@ -130,10 +129,10 @@
<record id="tvq_sale_fr" model="account.tax.template">
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
<field name="name">TVQ sur les ventes - 9.5%</field>
<field name="name">TVQ sur les ventes - 9.975%</field>
<field name="description">TVQ</field>
<field name="type_tax_use">sale</field>
<field name="amount">0.095000</field>
<field name="amount">0.099750</field>
<field name="type">percent</field>
<field name="sequence">2</field>
<field name="account_collected_id" ref="chart2132_fr"/>
@@ -388,7 +387,6 @@
<field name="amount">0.050000</field>
<field name="type">percent</field>
<field name="sequence">1</field>
<field name="include_base_amount" eval="True"/>
<field name="account_collected_id" ref="chart1181_fr"/>
<field name="account_paid_id" ref="chart1181_fr"/>
<field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
@@ -400,10 +398,10 @@
<record id="tvq_purc_fr" model="account.tax.template">
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
<field name="name">TVQ sur les achats - 9.5%</field>
<field name="name">TVQ sur les achats - 9.975%</field>
<field name="description">TVQ</field>
<field name="type_tax_use">purchase</field>
<field name="amount">0.095000</field>
<field name="amount">0.099750</field>
<field name="type">percent</field>
<field name="sequence">2</field>
<field name="account_collected_id" ref="chart1182_fr"/>
addons/l10n_ca/fiscal_templates_fr.xml
+4 -4
View File
@@ -10,22 +10,22 @@
</record>
<record id="fiscal_position_template_21_fr" model="account.fiscal.position.template">
<field name="name">Régime Provinces Harmonisées (12%)</field>
<field name="name">Régime Provinces Harmonisées à 12% (BC)</field>
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
</record>
<record id="fiscal_position_template_22_fr" model="account.fiscal.position.template">
<field name="name">Régime Provinces Harmonisées (13%)</field>
<field name="name">Régime Provinces Harmonisées à 13% (NB, ON, NL)</field>
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
</record>
<record id="fiscal_position_template_23_fr" model="account.fiscal.position.template">
<field name="name">Régime Provinces Harmonisées (13.5%)</field>
<field name="name">Régime Provinces Harmonisées à 13.5% ()</field>
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
</record>
<record id="fiscal_position_template_24_fr" model="account.fiscal.position.template">
<field name="name">Régime Provinces Harmonisées (15%)</field>
<field name="name">Régime Provinces Harmonisées à 15% (NS)</field>
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
</record>