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

[MERGE] merged Maxime Chambreuil's branch about l10n_ca improvements

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20111027150439-1ez962jj0muf2r9p
This commit is contained in:
Quentin (OpenERP)
2011-10-27 17:04:39 +02:00
parent 8490a55722 d75616ea8e
commit 67c9eeeb62
5 changed files with 486 additions and 1409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_ca/account_chart_fr.xml
+390 -1314
View File
File diff suppressed because it is too large Load Diff
addons/l10n_ca/account_chart_template_fr.xml
+5 -5
View File
@@ -7,11 +7,11 @@
<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="chart111160_fr"/>
<field name="property_account_receivable" ref="chart112110_fr"/>
<field name="property_account_payable" ref="chart221110_fr"/>
<field name="property_account_income_categ" ref="chart411110_fr"/>
<field name="property_account_expense_categ" ref="chart511110_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>
</data>
addons/l10n_ca/account_tax_en.xml
+13 -13
View File
@@ -15,7 +15,7 @@
<record id="gstpst_mb_gst_en" model="account.tax.template">
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">GST (5%)</field>
<field name="name">GST - 5% (MB)</field>
<field name="description">GST</field>
<field name="amount">0.050000</field>
<field name="type">percent</field>
@@ -32,7 +32,7 @@
<record id="pst_mb_en" model="account.tax.template">
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">PST (7%)</field>
<field name="name">PST - 7%</field>
<field name="description">PST</field>
<field name="amount">0.070000</field>
<field name="type">percent</field>
@@ -59,7 +59,7 @@
<record id="gstpst_pe_gst_en" model="account.tax.template">
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">GST (5%)</field>
<field name="name">GST - 5% (PE)</field>
<field name="description">GST</field>
<field name="amount">0.050000</field>
<field name="type">percent</field>
@@ -76,7 +76,7 @@
<record id="pst_pe_en" model="account.tax.template">
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">PST (10%)</field>
<field name="name">PST - 10%</field>
<field name="description">PST</field>
<field name="amount">0.100000</field>
<field name="type">percent</field>
@@ -103,7 +103,7 @@
<record id="gstpst_qc_gst_en" model="account.tax.template">
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">GST (5%)</field>
<field name="name">GST - 5% (QC)</field>
<field name="description">GST</field>
<field name="amount">0.050000</field>
<field name="type">percent</field>
@@ -120,7 +120,7 @@
<record id="pst_qc_en" model="account.tax.template">
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">PST (8.5%)</field>
<field name="name">PST - 8.5%</field>
<field name="description">PST</field>
<field name="amount">0.085000</field>
<field name="type">percent</field>
@@ -147,7 +147,7 @@
<record id="gstpst_sk_gst_en" model="account.tax.template">
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">GST (5%)</field>
<field name="name">GST - 5% (SK)</field>
<field name="description">GST</field>
<field name="amount">0.050000</field>
<field name="type">percent</field>
@@ -164,7 +164,7 @@
<record id="pst_sk_en" model="account.tax.template">
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">PST (5%)</field>
<field name="name">PST - 5%</field>
<field name="description">PST</field>
<field name="amount">0.050000</field>
<field name="type">percent</field>
@@ -182,7 +182,7 @@
<record id="hst12_en" model="account.tax.template">
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">HST (12%)</field>
<field name="name">HST - 12%</field>
<field name="description">HST12</field>
<field name="amount">0.120000</field>
<field name="type">percent</field>
@@ -196,7 +196,7 @@
<record id="hst13_en" model="account.tax.template">
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">HST (13%)</field>
<field name="name">HST - 13%</field>
<field name="description">HST13</field>
<field name="amount">0.130000</field>
<field name="type">percent</field>
@@ -210,7 +210,7 @@
<record id="hst135_en" model="account.tax.template">
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">HST (13.5%)</field>
<field name="name">HST - 13.5%</field>
<field name="description">HST135</field>
<field name="amount">0.135000</field>
<field name="type">percent</field>
@@ -224,7 +224,7 @@
<record id="hst15_en" model="account.tax.template">
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">HST (15%)</field>
<field name="name">HST - 15%</field>
<field name="description">HST15</field>
<field name="amount">0.150000</field>
<field name="type">percent</field>
@@ -240,7 +240,7 @@
<record id="gst_en" model="account.tax.template">
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">GST (5%)</field>
<field name="name">GST - 5%</field>
<field name="description">GST</field>
<field name="amount">0.050000</field>
<field name="type">percent</field>
addons/l10n_ca/account_tax_fr.xml
+39 -39
View File
@@ -15,14 +15,14 @@
<record id="tpstvp_mb_tps_fr" model="account.tax.template">
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
<field name="name">TPS (5%)</field>
<field name="name">TPS - 5% (MB)</field>
<field name="description">TPS</field>
<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="chart241100_fr"/>
<field name="account_paid_id" ref="chart242100_fr"/>
<field name="account_collected_id" ref="chart1181_fr"/>
<field name="account_paid_id" ref="chart2131_fr"/>
<field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
<field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
@@ -32,13 +32,13 @@
<record id="tvp_mb_fr" model="account.tax.template">
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
<field name="name">TVP (7%)</field>
<field name="name">TVP - 7%</field>
<field name="description">TVP</field>
<field name="amount">0.700000</field>
<field name="type">percent</field>
<field name="sequence">1</field>
<field name="account_collected_id" ref="chart241200_fr"/>
<field name="account_paid_id" ref="chart242200_fr"/>
<field name="account_collected_id" ref="chart1182_fr"/>
<field name="account_paid_id" ref="chart2132_fr"/>
<field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
<field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
@@ -59,14 +59,14 @@
<record id="tpstvp_pe_tps_fr" model="account.tax.template">
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
<field name="name">TPS (5%)</field>
<field name="name">TPS - 5% (PE)</field>
<field name="description">TPS</field>
<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="chart241100_fr"/>
<field name="account_paid_id" ref="chart242100_fr"/>
<field name="account_collected_id" ref="chart1181_fr"/>
<field name="account_paid_id" ref="chart2131_fr"/>
<field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
<field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
@@ -76,13 +76,13 @@
<record id="tvp_pe_fr" model="account.tax.template">
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
<field name="name">TVP (10%)</field>
<field name="name">TVP - 10%</field>
<field name="description">TVP</field>
<field name="amount">0.100000</field>
<field name="type">percent</field>
<field name="sequence">1</field>
<field name="account_collected_id" ref="chart241200_fr"/>
<field name="account_paid_id" ref="chart242200_fr"/>
<field name="account_collected_id" ref="chart1182_fr"/>
<field name="account_paid_id" ref="chart2132_fr"/>
<field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
<field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
@@ -103,14 +103,14 @@
<record id="tpstvq_tps_fr" model="account.tax.template">
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
<field name="name">TPS (5%)</field>
<field name="name">TPS - 5% (QC)</field>
<field name="description">TPS</field>
<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="chart241100_fr"/>
<field name="account_paid_id" ref="chart242100_fr"/>
<field name="account_collected_id" ref="chart1181_fr"/>
<field name="account_paid_id" ref="chart2131_fr"/>
<field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
<field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
@@ -120,13 +120,13 @@
<record id="tvq_fr" model="account.tax.template">
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
<field name="name">TVQ (8.5%)</field>
<field name="name">TVQ - 8.5%</field>
<field name="description">TVQ</field>
<field name="amount">0.085000</field>
<field name="type">percent</field>
<field name="sequence">1</field>
<field name="account_collected_id" ref="chart241200_fr"/>
<field name="account_paid_id" ref="chart242200_fr"/>
<field name="account_collected_id" ref="chart1182_fr"/>
<field name="account_paid_id" ref="chart2132_fr"/>
<field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
<field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
@@ -147,14 +147,14 @@
<record id="tpstvp_sk_tps_fr" model="account.tax.template">
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
<field name="name">TPS (5%)</field>
<field name="name">TPS - 5% (SK)</field>
<field name="description">TPS</field>
<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="chart241100_fr"/>
<field name="account_paid_id" ref="chart242100_fr"/>
<field name="account_collected_id" ref="chart1181_fr"/>
<field name="account_paid_id" ref="chart2131_fr"/>
<field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
<field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
@@ -164,13 +164,13 @@
<record id="tvp_sk_fr" model="account.tax.template">
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
<field name="name">TVP (5%)</field>
<field name="name">TVP - 5% (SK)</field>
<field name="description">TVP</field>
<field name="amount">0.050000</field>
<field name="type">percent</field>
<field name="sequence">1</field>
<field name="account_collected_id" ref="chart241200_fr"/>
<field name="account_paid_id" ref="chart242200_fr"/>
<field name="account_collected_id" ref="chart1182_fr"/>
<field name="account_paid_id" ref="chart2132_fr"/>
<field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
<field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
@@ -182,12 +182,12 @@
<record id="tvh12_fr" model="account.tax.template">
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
<field name="name">TVH (12%)</field>
<field name="name">TVH - 12%</field>
<field name="description">TVH12</field>
<field name="amount">0.120000</field>
<field name="type">percent</field>
<field name="account_collected_id" ref="chart241300_fr"/>
<field name="account_paid_id" ref="chart242300_fr"/>
<field name="account_collected_id" ref="chart1183_fr"/>
<field name="account_paid_id" ref="chart2133_fr"/>
<field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
<field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
@@ -196,12 +196,12 @@
<record id="tvh13_fr" model="account.tax.template">
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
<field name="name">TVH (13%)</field>
<field name="name">TVH - 13%</field>
<field name="description">TVH13</field>
<field name="amount">0.130000</field>
<field name="type">percent</field>
<field name="account_collected_id" ref="chart241300_fr"/>
<field name="account_paid_id" ref="chart242300_fr"/>
<field name="account_collected_id" ref="chart1183_fr"/>
<field name="account_paid_id" ref="chart2133_fr"/>
<field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
<field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
@@ -210,12 +210,12 @@
<record id="tvh135_fr" model="account.tax.template">
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
<field name="name">TVH (13.5%)</field>
<field name="name">TVH - 13.5%</field>
<field name="description">TVH135</field>
<field name="amount">0.135000</field>
<field name="type">percent</field>
<field name="account_collected_id" ref="chart241300_fr"/>
<field name="account_paid_id" ref="chart242300_fr"/>
<field name="account_collected_id" ref="chart1183_fr"/>
<field name="account_paid_id" ref="chart2133_fr"/>
<field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
<field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
@@ -224,12 +224,12 @@
<record id="tvh15_fr" model="account.tax.template">
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
<field name="name">TVH (15%)</field>
<field name="name">TVH - 15%</field>
<field name="description">TVH15</field>
<field name="amount">0.150000</field>
<field name="type">percent</field>
<field name="account_collected_id" ref="chart241300_fr"/>
<field name="account_paid_id" ref="chart242300_fr"/>
<field name="account_collected_id" ref="chart1183_fr"/>
<field name="account_paid_id" ref="chart2133_fr"/>
<field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
<field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
@@ -240,12 +240,12 @@
<record id="tps_fr" model="account.tax.template">
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
<field name="name">TPS (5%)</field>
<field name="name">TPS - 5%</field>
<field name="description">TPS</field>
<field name="amount">0.050000</field>
<field name="type">percent</field>
<field name="account_collected_id" ref="chart241100_fr"/>
<field name="account_paid_id" ref="chart242100_fr"/>
<field name="account_collected_id" ref="chart1181_fr"/>
<field name="account_paid_id" ref="chart2131_fr"/>
<field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
<field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
addons/l10n_ca/fiscal_templates_fr.xml
+39 -38
View File
@@ -313,80 +313,81 @@
<field name="tax_dest_id" ref="notax_fr" />
</record>
<!-- Fiscal Position Account Templates - Goods -->
<!-- Fiscal Position Account Templates - Products -->
<record id="fiscal_position_account_template_21_fr" model="account.fiscal.position.account.template">
<record id="fiscal_position_product_template_21_fr" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_21_fr" />
<field name="account_src_id" ref="chart411110_fr" />
<field name="account_dest_id" ref="chart411120_fr" />
<field name="account_src_id" ref="chart411_fr" />
<field name="account_dest_id" ref="chart412_fr" />
</record>
<record id="fiscal_position_account_template_22_fr" model="account.fiscal.position.account.template">
<record id="fiscal_position_product_template_22_fr" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_22_fr" />
<field name="account_src_id" ref="chart411110_fr" />
<field name="account_dest_id" ref="chart411120_fr" />
<field name="account_src_id" ref="chart411_fr" />
<field name="account_dest_id" ref="chart412_fr" />
</record>
<record id="fiscal_position_account_template_23_fr" model="account.fiscal.position.account.template">
<record id="fiscal_position_product_template_23_fr" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_23_fr" />
<field name="account_src_id" ref="chart411110_fr" />
<field name="account_dest_id" ref="chart411120_fr" />
<field name="account_src_id" ref="chart411_fr" />
<field name="account_dest_id" ref="chart412_fr" />
</record>
<record id="fiscal_position_account_template_24_fr" model="account.fiscal.position.account.template">
<record id="fiscal_position_product_template_24_fr" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_24_fr" />
<field name="account_src_id" ref="chart411110_fr" />
<field name="account_dest_id" ref="chart411120_fr" />
<field name="account_src_id" ref="chart411_fr" />
<field name="account_dest_id" ref="chart412_fr" />
</record>
<record id="fiscal_position_account_template_3_fr" model="account.fiscal.position.account.template">
<record id="fiscal_position_product_template_3_fr" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_3_fr" />
<field name="account_src_id" ref="chart411110_fr" />
<field name="account_dest_id" ref="chart411130_fr" />
<field name="account_src_id" ref="chart411_fr" />
<field name="account_dest_id" ref="chart413_fr" />
</record>
<record id="fiscal_position_account_template_4_fr" model="account.fiscal.position.account.template">
<record id="fiscal_position_product_template_4_fr" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_4_fr" />
<field name="account_src_id" ref="chart411110_fr" />
<field name="account_dest_id" ref="chart411140_fr" />
<field name="account_src_id" ref="chart411_fr" />
<field name="account_dest_id" ref="chart414_fr" />
</record>
<!-- Fiscal Position Account Templates - Services -->
<!-- Fiscal Position Account Templates - Charges -->
<record id="fiscal_position_account_template_21_fr" model="account.fiscal.position.account.template">
<record id="fiscal_position_charge_template_21_fr" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_21_fr" />
<field name="account_src_id" ref="chart411210_fr" />
<field name="account_dest_id" ref="chart411220_fr" />
<field name="account_src_id" ref="chart5111_fr" />
<field name="account_dest_id" ref="chart5112_fr" />
</record>
<record id="fiscal_position_account_template_22_fr" model="account.fiscal.position.account.template">
<record id="fiscal_position_charge_template_22_fr" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_22_fr" />
<field name="account_src_id" ref="chart411210_fr" />
<field name="account_dest_id" ref="chart411220_fr" />
<field name="account_src_id" ref="chart5111_fr" />
<field name="account_dest_id" ref="chart5112_fr" />
</record>
<record id="fiscal_position_account_template_23_fr" model="account.fiscal.position.account.template">
<record id="fiscal_position_charge_template_23_fr" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_23_fr" />
<field name="account_src_id" ref="chart411210_fr" />
<field name="account_dest_id" ref="chart411220_fr" />
<field name="account_src_id" ref="chart5111_fr" />
<field name="account_dest_id" ref="chart5112_fr" />
</record>
<record id="fiscal_position_account_template_24_fr" model="account.fiscal.position.account.template">
<record id="fiscal_position_charge_template_24_fr" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_24_fr" />
<field name="account_src_id" ref="chart411210_fr" />
<field name="account_dest_id" ref="chart411220_fr" />
<field name="account_src_id" ref="chart5111_fr" />
<field name="account_dest_id" ref="chart5112_fr" />
</record>
<record id="fiscal_position_account_template_3_fr" model="account.fiscal.position.account.template">
<record id="fiscal_position_charge_template_3_fr" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_3_fr" />
<field name="account_src_id" ref="chart411210_fr" />
<field name="account_dest_id" ref="chart411230_fr" />
<field name="account_src_id" ref="chart5111_fr" />
<field name="account_dest_id" ref="chart5113_fr" />
</record>
<record id="fiscal_position_account_template_4_fr" model="account.fiscal.position.account.template">
<record id="fiscal_position_charge_template_4_fr" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_4_fr" />
<field name="account_src_id" ref="chart411210_fr" />
<field name="account_dest_id" ref="chart411240_fr" />
<field name="account_src_id" ref="chart5111_fr" />
<field name="account_dest_id" ref="chart5114_fr" />
</record>
</data>
</openerp>