openerp-community team mailing list archive
-
openerp-community team
-
Mailing list archive
-
Message #02783
[Merge] lp:~openerp-community/openobject-addons/7.0-fix-1189050 into lp:~openerp-canada/openobject-addons/7.0-fix-1192629
Maxime Chambreuil (http://www.savoirfairelinux.com) has proposed merging lp:~openerp-community/openobject-addons/7.0-fix-1189050 into lp:~openerp-canada/openobject-addons/7.0-fix-1192629.
Requested reviews:
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)
Related bugs:
Bug #1189050 in OpenERP Addons: "[7.0] Tax on children not set in l10n_ca"
https://bugs.launchpad.net/openobject-addons/+bug/1189050
For more details, see:
https://code.launchpad.net/~openerp-community/openobject-addons/7.0-fix-1189050/+merge/170714
--
https://code.launchpad.net/~openerp-community/openobject-addons/7.0-fix-1189050/+merge/170714
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openobject-addons/7.0-fix-1189050.
=== modified file 'l10n_ca/__openerp__.py'
--- l10n_ca/__openerp__.py 2013-06-20 19:40:30 +0000
+++ l10n_ca/__openerp__.py 2013-06-20 22:40:33 +0000
@@ -20,7 +20,11 @@
##############################################################################
{
'name': 'Canada - Accounting',
+<<<<<<< TREE
'version': '1.3',
+=======
+ 'version': '1.2',
+>>>>>>> MERGE-SOURCE
'author': 'Savoir-faire Linux',
'website': 'http://www.savoirfairelinux.com',
'category': 'Localization/Account Charts',
=== modified file 'l10n_ca/account_tax_en.xml'
--- l10n_ca/account_tax_en.xml 2013-06-20 22:32:45 +0000
+++ l10n_ca/account_tax_en.xml 2013-06-20 22:40:33 +0000
@@ -60,7 +60,11 @@
<field name="type_tax_use">sale</field>
<field name="amount">1</field>
<field name="type">percent</field>
+<<<<<<< TREE
<field name="child_depend">1</field>
+=======
+ <field name="child_depend" eval="True"/>
+>>>>>>> MERGE-SOURCE
</record>
<record id="gstpst_sale_mb_gst_en" model="account.tax.template">
@@ -106,11 +110,66 @@
<field name="description">GSTQST_SALE</field>
<field name="type_tax_use">sale</field>
<field name="amount">1</field>
+<<<<<<< TREE
<field name="type">percent</field>
<field name="child_depend">1</field>
</record>
<record id="gstqst_sale_gst_en" model="account.tax.template">
+=======
+ <field name="type">percent</field>
+ <field name="child_depend" eval="True"/>
+ </record>
+
+ <record id="gstpst_sale_pe_gst_en" model="account.tax.template">
+ <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+ <field name="name">GST for sales - 5% (PE)</field>
+ <field name="description">GST</field>
+ <field name="type_tax_use">sale</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="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"/>
+ <field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
+ <field name="parent_id" ref="gstpst_pe_sale_en"/>
+ </record>
+
+ <record id="pst_pe_sale_en" model="account.tax.template">
+ <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+ <field name="name">PST for sale - 10%</field>
+ <field name="description">PST</field>
+ <field name="type_tax_use">sale</field>
+ <field name="amount">0.100000</field>
+ <field name="type">percent</field>
+ <field name="sequence">2</field>
+ <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"/>
+ <field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
+ <field name="parent_id" ref="gstpst_pe_sale_en"/>
+ </record>
+
+ <!-- Quebec PST -->
+
+ <record id="gsttvq_sale_en" model="account.tax.template">
+ <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+ <field name="name">GST + TVQ for sales</field>
+ <field name="description">GSTTVQ_SALE</field>
+ <field name="type_tax_use">sale</field>
+ <field name="amount">1</field>
+ <field name="type">percent</field>
+ <field name="child_depend" eval="True"/>
+ </record>
+
+ <record id="gsttvq_sale_gst_en" model="account.tax.template">
+>>>>>>> MERGE-SOURCE
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">GST for sales - 5% (QC)</field>
<field name="description">GST</field>
@@ -153,7 +212,11 @@
<field name="type_tax_use">sale</field>
<field name="amount">1</field>
<field name="type">percent</field>
+<<<<<<< TREE
<field name="child_depend">1</field>
+=======
+ <field name="child_depend" eval="True"/>
+>>>>>>> MERGE-SOURCE
</record>
<record id="gstpst_sale_sk_gst_en" model="account.tax.template">
@@ -314,7 +377,11 @@
<field name="type_tax_use">purchase</field>
<field name="amount">1</field>
<field name="type">percent</field>
+<<<<<<< TREE
<field name="child_depend">1</field>
+=======
+ <field name="child_depend" eval="True"/>
+>>>>>>> MERGE-SOURCE
</record>
<record id="gstpst_purc_mb_gst_en" model="account.tax.template">
@@ -360,11 +427,66 @@
<field name="description">GSTQST_PURC</field>
<field name="type_tax_use">purchase</field>
<field name="amount">1</field>
+<<<<<<< TREE
<field name="type">percent</field>
<field name="child_depend">1</field>
</record>
<record id="gstqst_purc_gst_en" model="account.tax.template">
+=======
+ <field name="type">percent</field>
+ <field name="child_depend" eval="True"/>
+ </record>
+
+ <record id="gstpst_purc_pe_gst_en" model="account.tax.template">
+ <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+ <field name="name">GST for purchases - 5% (PE)</field>
+ <field name="description">GST</field>
+ <field name="type_tax_use">purchase</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="chart1181_en"/>
+ <field name="account_paid_id" ref="chart1181_en"/>
+ <field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
+ <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
+ <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+ <field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
+ <field name="parent_id" ref="gstpst_pe_purc_en"/>
+ </record>
+
+ <record id="pst_pe_purc_en" model="account.tax.template">
+ <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+ <field name="name">PST for purchases - 10%</field>
+ <field name="description">PST</field>
+ <field name="type_tax_use">purchase</field>
+ <field name="amount">0.100000</field>
+ <field name="type">percent</field>
+ <field name="sequence">2</field>
+ <field name="account_collected_id" ref="chart1182_en"/>
+ <field name="account_paid_id" ref="chart1182_en"/>
+ <field name="base_code_id" ref="vat_code_base_payable_pst_en"/>
+ <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
+ <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+ <field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
+ <field name="parent_id" ref="gstpst_pe_purc_en"/>
+ </record>
+
+ <!-- Quebec PST -->
+
+ <record id="gsttvq_purc_en" model="account.tax.template">
+ <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+ <field name="name">GST + TVQ for purchases</field>
+ <field name="description">GSTTVQ_PURC</field>
+ <field name="type_tax_use">purchase</field>
+ <field name="amount">1</field>
+ <field name="type">percent</field>
+ <field name="child_depend" eval="True"/>
+ </record>
+
+ <record id="gsttvq_purc_gst_en" model="account.tax.template">
+>>>>>>> MERGE-SOURCE
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
<field name="name">GST for purchases - 5% (QC)</field>
<field name="description">GST</field>
@@ -407,7 +529,11 @@
<field name="type_tax_use">purchase</field>
<field name="amount">1</field>
<field name="type">percent</field>
+<<<<<<< TREE
<field name="child_depend">1</field>
+=======
+ <field name="child_depend" eval="True"/>
+>>>>>>> MERGE-SOURCE
</record>
<record id="gstpst_purc_sk_gst_en" model="account.tax.template">
=== modified file 'l10n_ca/account_tax_fr.xml'
--- l10n_ca/account_tax_fr.xml 2013-06-20 22:32:45 +0000
+++ l10n_ca/account_tax_fr.xml 2013-06-20 22:40:33 +0000
@@ -60,7 +60,11 @@
<field name="type_tax_use">sale</field>
<field name="amount">1</field>
<field name="type">percent</field>
+<<<<<<< TREE
<field name="child_depend">1</field>
+=======
+ <field name="child_depend" eval="True"/>
+>>>>>>> MERGE-SOURCE
</record>
<record id="gstpst_sale_mb_gst_fr" model="account.tax.template">
@@ -91,11 +95,66 @@
<field name="sequence">2</field>
<field name="account_collected_id" ref="chart2132_fr"/>
<field name="account_paid_id" ref="chart2132_fr"/>
+<<<<<<< TREE
<field name="base_code_id" ref="vat_code_base_receivable_pst_fr"/>
<field name="tax_code_id" ref="vat_code_payable_pst_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_pst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_payable_pst_fr"/>
<field name="parent_id" ref="gstpst_mb_sale_fr"/>
+=======
+ <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
+ <field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
+ <field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
+ <field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
+ <field name="parent_id" ref="tpstvp_mb_sale_fr"/>
+ </record>
+
+ <!-- Prince Edward Island PST -->
+
+ <record id="tpstvp_pe_sale_fr" model="account.tax.template">
+ <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+ <field name="name">TPS + TVP sur les ventes (PE)</field>
+ <field name="description">TPSTVP_PE_SALE</field>
+ <field name="type_tax_use">sale</field>
+ <field name="amount">1</field>
+ <field name="type">percent</field>
+ <field name="child_depend" eval="True"/>
+ </record>
+
+ <record id="tpstvp_sale_pe_tps_fr" model="account.tax.template">
+ <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+ <field name="name">TPS sur les ventes - 5% (PE)</field>
+ <field name="description">TPS</field>
+ <field name="type_tax_use">sale</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="chart2131_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_payable_tps_fr"/>
+ <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
+ <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
+ <field name="parent_id" ref="tpstvp_pe_sale_fr"/>
+ </record>
+
+ <record id="tvp_pe_sale_fr" model="account.tax.template">
+ <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+ <field name="name">TVP for sale - 10%</field>
+ <field name="description">TVP</field>
+ <field name="type_tax_use">sale</field>
+ <field name="amount">0.100000</field>
+ <field name="type">percent</field>
+ <field name="sequence">2</field>
+ <field name="account_collected_id" ref="chart2132_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_payable_tvp_fr"/>
+ <field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
+ <field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
+ <field name="parent_id" ref="tpstvp_pe_sale_fr"/>
+>>>>>>> MERGE-SOURCE
</record>
<!-- Quebec PST -->
@@ -107,7 +166,11 @@
<field name="type_tax_use">sale</field>
<field name="amount">1</field>
<field name="type">percent</field>
+<<<<<<< TREE
<field name="child_depend">1</field>
+=======
+ <field name="child_depend" eval="True"/>
+>>>>>>> MERGE-SOURCE
</record>
<record id="gstqst_sale_gst_fr" model="account.tax.template">
@@ -153,7 +216,11 @@
<field name="type_tax_use">sale</field>
<field name="amount">1</field>
<field name="type">percent</field>
+<<<<<<< TREE
<field name="child_depend">1</field>
+=======
+ <field name="child_depend" eval="True"/>
+>>>>>>> MERGE-SOURCE
</record>
<record id="gstpst_sale_sk_gst_fr" model="account.tax.template">
@@ -314,7 +381,11 @@
<field name="type_tax_use">purchase</field>
<field name="amount">1</field>
<field name="type">percent</field>
+<<<<<<< TREE
<field name="child_depend">1</field>
+=======
+ <field name="child_depend" eval="True"/>
+>>>>>>> MERGE-SOURCE
</record>
<record id="gstpst_purc_mb_gst_fr" model="account.tax.template">
@@ -345,11 +416,66 @@
<field name="sequence">2</field>
<field name="account_collected_id" ref="chart1182_fr"/>
<field name="account_paid_id" ref="chart1182_fr"/>
+<<<<<<< TREE
<field name="base_code_id" ref="vat_code_base_payable_pst_fr"/>
<field name="tax_code_id" ref="vat_code_receivable_pst_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_pst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_pst_fr"/>
<field name="parent_id" ref="gstpst_mb_purc_fr"/>
+=======
+ <field name="base_code_id" ref="vat_code_base_payable_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"/>
+ <field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+ <field name="parent_id" ref="tpstvp_mb_purc_fr"/>
+ </record>
+
+ <!-- Prince Edward Island PST -->
+
+ <record id="tpstvp_pe_purc_fr" model="account.tax.template">
+ <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+ <field name="name">TPS + TVP sur les achats (PE)</field>
+ <field name="description">TPSTVP_PE_PURC</field>
+ <field name="type_tax_use">purchase</field>
+ <field name="amount">1</field>
+ <field name="type">percent</field>
+ <field name="child_depend" eval="True"/>
+ </record>
+
+ <record id="tpstvp_purc_pe_tps_fr" model="account.tax.template">
+ <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+ <field name="name">TPS sur les achats - 5% (PE)</field>
+ <field name="description">TPS</field>
+ <field name="type_tax_use">purchase</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="chart1181_fr"/>
+ <field name="account_paid_id" ref="chart1181_fr"/>
+ <field name="base_code_id" ref="vat_code_base_payable_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"/>
+ <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
+ <field name="parent_id" ref="tpstvp_pe_purc_fr"/>
+ </record>
+
+ <record id="tvp_pe_purc_fr" model="account.tax.template">
+ <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+ <field name="name">TVP sur les achats - 10%</field>
+ <field name="description">TVP</field>
+ <field name="type_tax_use">purchase</field>
+ <field name="amount">0.100000</field>
+ <field name="type">percent</field>
+ <field name="sequence">2</field>
+ <field name="account_collected_id" ref="chart1182_fr"/>
+ <field name="account_paid_id" ref="chart1182_fr"/>
+ <field name="base_code_id" ref="vat_code_base_payable_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"/>
+ <field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
+ <field name="parent_id" ref="tpstvp_pe_purc_fr"/>
+>>>>>>> MERGE-SOURCE
</record>
<!-- Quebec PST -->
@@ -361,7 +487,11 @@
<field name="type_tax_use">purchase</field>
<field name="amount">1</field>
<field name="type">percent</field>
+<<<<<<< TREE
<field name="child_depend">1</field>
+=======
+ <field name="child_depend" eval="True"/>
+>>>>>>> MERGE-SOURCE
</record>
<record id="gstqst_purc_gst_fr" model="account.tax.template">
@@ -407,7 +537,11 @@
<field name="type_tax_use">purchase</field>
<field name="amount">1</field>
<field name="type">percent</field>
+<<<<<<< TREE
<field name="child_depend">1</field>
+=======
+ <field name="child_depend" eval="True"/>
+>>>>>>> MERGE-SOURCE
</record>
<record id="gstpst_purc_sk_gst_fr" model="account.tax.template">
Follow ups
