openerp-community team mailing list archive
-
openerp-community team
-
Mailing list archive
-
Message #02714
[Merge] lp:~openerp-community/openobject-addons/7.0-fix-1189050 into lp:openobject-addons/7.0
Maxime Chambreuil (http://www.savoirfairelinux.com) has proposed merging lp:~openerp-community/openobject-addons/7.0-fix-1189050 into lp:openobject-addons/7.0.
Requested reviews:
OpenERP Core Team (openerp)
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/168268
[FIX] child_depend=true on top level taxes in l10n_ca
--
https://code.launchpad.net/~openerp-community/openobject-addons/7.0-fix-1189050/+merge/168268
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openobject-addons/7.0-fix-1189050.
=== modified file 'l10n_ca/account_tax_en.xml'
--- l10n_ca/account_tax_en.xml 2013-02-27 16:36:41 +0000
+++ l10n_ca/account_tax_en.xml 2013-06-08 23:38:26 +0000
@@ -13,6 +13,7 @@
<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="gstpst_sale_mb_gst_en" model="account.tax.template">
@@ -60,6 +61,7 @@
<field name="amount">1</field>
<field name="child_depend">1</field>
<field name="type">percent</field>
+ <field name="child_depend" eval="True"/>
</record>
<record id="gstpst_sale_pe_gst_en" model="account.tax.template">
@@ -106,6 +108,7 @@
<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">
@@ -151,6 +154,7 @@
<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="gstpst_sale_sk_gst_en" model="account.tax.template">
@@ -279,6 +283,7 @@
<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="gstpst_purc_mb_gst_en" model="account.tax.template">
@@ -326,6 +331,7 @@
<field name="amount">1</field>
<field name="child_depend">1</field>
<field name="type">percent</field>
+ <field name="child_depend" eval="True"/>
</record>
<record id="gstpst_purc_pe_gst_en" model="account.tax.template">
@@ -372,6 +378,7 @@
<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">
@@ -417,6 +424,7 @@
<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="gstpst_purc_sk_gst_en" model="account.tax.template">
=== modified file 'l10n_ca/account_tax_fr.xml'
--- l10n_ca/account_tax_fr.xml 2013-02-27 16:36:41 +0000
+++ l10n_ca/account_tax_fr.xml 2013-06-08 23:38:26 +0000
@@ -13,6 +13,7 @@
<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_mb_tps_fr" model="account.tax.template">
@@ -58,8 +59,8 @@
<field name="description">TPSTVP_PE_SALE</field>
<field name="type_tax_use">sale</field>
<field name="amount">1</field>
- <field name="child_depend">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">
@@ -106,6 +107,7 @@
<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="tpstvq_sale_tps_fr" model="account.tax.template">
@@ -151,6 +153,7 @@
<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_sk_tps_fr" model="account.tax.template">
@@ -279,6 +282,7 @@
<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_mb_tps_fr" model="account.tax.template">
@@ -324,8 +328,8 @@
<field name="description">TPSTVP_PE_PURC</field>
<field name="type_tax_use">purchase</field>
<field name="amount">1</field>
- <field name="child_depend">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">
@@ -372,6 +376,7 @@
<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="tpstvq_purc_tps_fr" model="account.tax.template">
@@ -417,6 +422,7 @@
<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_sk_tps_fr" model="account.tax.template">