From 822dec4fca99281a2d2075b842943c17def47fd2 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Sat, 8 Jun 2013 19:25:46 -0400 Subject: [PATCH 1/3] [FIX] child_depend = True on top level taxes lp bug: https://launchpad.net/bugs/1189050 fixed bzr revid: maxime.chambreuil@savoirfairelinux.com-20130608232546-jki0xjwsr6madyyk --- addons/l10n_ca/account_tax_en.xml | 8 ++++++++ addons/l10n_ca/account_tax_fr.xml | 10 ++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml index afe505f27f5..4984b5eb6e0 100644 --- a/addons/l10n_ca/account_tax_en.xml +++ b/addons/l10n_ca/account_tax_en.xml @@ -13,6 +13,7 @@ sale 1 percent + @@ -60,6 +61,7 @@ 1 1 percent + @@ -106,6 +108,7 @@ sale 1 percent + @@ -151,6 +154,7 @@ sale 1 percent + @@ -279,6 +283,7 @@ purchase 1 percent + @@ -326,6 +331,7 @@ 1 1 percent + @@ -372,6 +378,7 @@ purchase 1 percent + @@ -417,6 +424,7 @@ purchase 1 percent + diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml index c34f329be3a..607e71cbd13 100644 --- a/addons/l10n_ca/account_tax_fr.xml +++ b/addons/l10n_ca/account_tax_fr.xml @@ -13,6 +13,7 @@ sale 1 percent + @@ -58,8 +59,8 @@ TPSTVP_PE_SALE sale 1 - 1 percent + @@ -106,6 +107,7 @@ sale 1 percent + @@ -151,6 +153,7 @@ sale 1 percent + @@ -279,6 +282,7 @@ purchase 1 percent + @@ -324,8 +328,8 @@ TPSTVP_PE_PURC purchase 1 - 1 percent + @@ -372,6 +376,7 @@ purchase 1 percent + @@ -417,6 +422,7 @@ purchase 1 percent + From d00985c2e57eb1badc10058bcdffae4c791b1d08 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Sat, 8 Jun 2013 20:00:53 -0400 Subject: [PATCH 2/3] [FIX] child_depend set twice on some taxes bzr revid: maxime.chambreuil@savoirfairelinux.com-20130609000053-g4n2jz6g34moulu5 --- addons/l10n_ca/account_tax_en.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml index 4984b5eb6e0..8c1d2b6c292 100644 --- a/addons/l10n_ca/account_tax_en.xml +++ b/addons/l10n_ca/account_tax_en.xml @@ -59,7 +59,6 @@ GSTPST_PE_SALE sale 1 - 1 percent @@ -329,7 +328,6 @@ GSTPST_PE_PURC purchase 1 - 1 percent From f80fcbbc6a4e7d0b9cb1ac55748bb12da2c408b6 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Sat, 8 Jun 2013 20:10:52 -0400 Subject: [PATCH 3/3] [IMP] Bump version bzr revid: maxime.chambreuil@savoirfairelinux.com-20130609001052-zixi0xotq2h2rwk1 --- addons/l10n_ca/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py index 945327a06bc..fc1486ec59a 100644 --- a/addons/l10n_ca/__openerp__.py +++ b/addons/l10n_ca/__openerp__.py @@ -20,7 +20,7 @@ ############################################################################## { 'name': 'Canada - Accounting', - 'version': '1.1', + 'version': '1.2', 'author': 'Savoir-faire Linux', 'website': 'http://www.savoirfairelinux.com', 'category': 'Localization/Account Charts',