Odoo Addons (MOVED TO GITHUB)

Merge lp:~savoirfairelinux-openerp/openobject-addons/7.0-bug-1095382 into lp:openobject-addons/7.0

  1. 7.0-bug-1095382
  2. Merge into 7.0
Proposed by Virgil Dupras
Status: Merged
Merged at revision: 9260
Proposed branch: lp:~savoirfairelinux-openerp/openobject-addons/7.0-bug-1095382
Merge into: lp:openobject-addons/7.0
Diff against target: 148 lines (+25/-25)
2 files modified
l10n_ca/__openerp__.py (+1/-1)
l10n_ca/account_tax_en.xml (+24/-24)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openobject-addons/7.0-bug-1095382
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+145440@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'l10n_ca/__openerp__.py'
--- l10n_ca/__openerp__.py 2012-12-06 21:54:24 +0000
+++ l10n_ca/__openerp__.py 2013-01-29 17:04:40 +0000
@@ -20,7 +20,7 @@
20##############################################################################20##############################################################################
21{21{
22 'name': 'Canada - Accounting',22 'name': 'Canada - Accounting',
23 'version': '1.0',23 'version': '1.1',
24 'author': 'Savoir-faire Linux',24 'author': 'Savoir-faire Linux',
25 'website': 'http://www.savoirfairelinux.com',25 'website': 'http://www.savoirfairelinux.com',
26 'category': 'Localization/Account Charts',26 'category': 'Localization/Account Charts',
2727
=== modified file 'l10n_ca/account_tax_en.xml'
--- l10n_ca/account_tax_en.xml 2012-12-06 21:54:24 +0000
+++ l10n_ca/account_tax_en.xml 2013-01-29 17:04:40 +0000
@@ -102,8 +102,8 @@
102102
103 <record id="gsttvq_sale_en" model="account.tax.template">103 <record id="gsttvq_sale_en" model="account.tax.template">
104 <field name="chart_template_id" ref="ca_en_chart_template_en"/>104 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
105 <field name="name">GST + TVQ for sales</field>105 <field name="name">GST + QST for sales</field>
106 <field name="description">GSTTVQ_SALE</field>106 <field name="description">GSTQST_SALE</field>
107 <field name="type_tax_use">sale</field>107 <field name="type_tax_use">sale</field>
108 <field name="amount">1</field>108 <field name="amount">1</field>
109 <field name="child_depend">1</field>109 <field name="child_depend">1</field>
@@ -129,8 +129,8 @@
129129
130 <record id="tvq_sale_en" model="account.tax.template">130 <record id="tvq_sale_en" model="account.tax.template">
131 <field name="chart_template_id" ref="ca_en_chart_template_en"/>131 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
132 <field name="name">TVQ for sales - 9.975%</field>132 <field name="name">QST for sales - 9.975%</field>
133 <field name="description">TVQ</field>133 <field name="description">QST</field>
134 <field name="type_tax_use">sale</field>134 <field name="type_tax_use">sale</field>
135 <field name="amount">0.099750</field>135 <field name="amount">0.099750</field>
136 <field name="type">percent</field>136 <field name="type">percent</field>
@@ -195,8 +195,8 @@
195195
196 <record id="hst12_sale_en" model="account.tax.template">196 <record id="hst12_sale_en" model="account.tax.template">
197 <field name="chart_template_id" ref="ca_en_chart_template_en"/>197 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
198 <field name="name">TVH for sales - 12%</field>198 <field name="name">HST for sales - 12%</field>
199 <field name="description">TVH12_SALE</field>199 <field name="description">HST12_SALE</field>
200 <field name="type_tax_use">sale</field>200 <field name="type_tax_use">sale</field>
201 <field name="amount">0.120000</field>201 <field name="amount">0.120000</field>
202 <field name="type">percent</field>202 <field name="type">percent</field>
@@ -210,8 +210,8 @@
210210
211 <record id="hst13_sale_en" model="account.tax.template">211 <record id="hst13_sale_en" model="account.tax.template">
212 <field name="chart_template_id" ref="ca_en_chart_template_en"/>212 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
213 <field name="name">TVH for sales - 13%</field>213 <field name="name">HST for sales - 13%</field>
214 <field name="description">TVH13_SALE</field>214 <field name="description">HST13_SALE</field>
215 <field name="type_tax_use">sale</field>215 <field name="type_tax_use">sale</field>
216 <field name="amount">0.130000</field>216 <field name="amount">0.130000</field>
217 <field name="type">percent</field>217 <field name="type">percent</field>
@@ -225,8 +225,8 @@
225225
226 <record id="hst135_sale_en" model="account.tax.template">226 <record id="hst135_sale_en" model="account.tax.template">
227 <field name="chart_template_id" ref="ca_en_chart_template_en"/>227 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
228 <field name="name">TVH for sales - 13.5%</field>228 <field name="name">HST for sales - 13.5%</field>
229 <field name="description">TVH135_SALE</field>229 <field name="description">HST135_SALE</field>
230 <field name="type_tax_use">sale</field>230 <field name="type_tax_use">sale</field>
231 <field name="amount">0.135000</field>231 <field name="amount">0.135000</field>
232 <field name="type">percent</field>232 <field name="type">percent</field>
@@ -240,8 +240,8 @@
240240
241 <record id="hst15_sale_en" model="account.tax.template">241 <record id="hst15_sale_en" model="account.tax.template">
242 <field name="chart_template_id" ref="ca_en_chart_template_en"/>242 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
243 <field name="name">TVH for sales - 15%</field>243 <field name="name">HST for sales - 15%</field>
244 <field name="description">TVH15_SALE</field>244 <field name="description">HST15_SALE</field>
245 <field name="type_tax_use">sale</field>245 <field name="type_tax_use">sale</field>
246 <field name="amount">0.150000</field>246 <field name="amount">0.150000</field>
247 <field name="type">percent</field>247 <field name="type">percent</field>
@@ -371,8 +371,8 @@
371371
372 <record id="gsttvq_purc_en" model="account.tax.template">372 <record id="gsttvq_purc_en" model="account.tax.template">
373 <field name="chart_template_id" ref="ca_en_chart_template_en"/>373 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
374 <field name="name">GST + TVQ for purchases</field>374 <field name="name">GST + QST for purchases</field>
375 <field name="description">GSTTVQ_PURC</field>375 <field name="description">GSTQST_PURC</field>
376 <field name="type_tax_use">purchase</field>376 <field name="type_tax_use">purchase</field>
377 <field name="amount">1</field>377 <field name="amount">1</field>
378 <field name="child_depend">1</field>378 <field name="child_depend">1</field>
@@ -398,8 +398,8 @@
398398
399 <record id="tvq_purc_en" model="account.tax.template">399 <record id="tvq_purc_en" model="account.tax.template">
400 <field name="chart_template_id" ref="ca_en_chart_template_en"/>400 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
401 <field name="name">TVQ for purchases - 9.975%</field>401 <field name="name">QST for purchases - 9.975%</field>
402 <field name="description">TVQ</field>402 <field name="description">QST</field>
403 <field name="type_tax_use">purchase</field>403 <field name="type_tax_use">purchase</field>
404 <field name="amount">0.099750</field>404 <field name="amount">0.099750</field>
405 <field name="type">percent</field>405 <field name="type">percent</field>
@@ -464,8 +464,8 @@
464464
465 <record id="hst12_purc_en" model="account.tax.template">465 <record id="hst12_purc_en" model="account.tax.template">
466 <field name="chart_template_id" ref="ca_en_chart_template_en"/>466 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
467 <field name="name">TVH for purchases - 12%</field>467 <field name="name">HST for purchases - 12%</field>
468 <field name="description">TVH12_PURC</field>468 <field name="description">HST12_PURC</field>
469 <field name="type_tax_use">purchase</field>469 <field name="type_tax_use">purchase</field>
470 <field name="amount">0.120000</field>470 <field name="amount">0.120000</field>
471 <field name="type">percent</field>471 <field name="type">percent</field>
@@ -479,8 +479,8 @@
479479
480 <record id="hst13_purc_en" model="account.tax.template">480 <record id="hst13_purc_en" model="account.tax.template">
481 <field name="chart_template_id" ref="ca_en_chart_template_en"/>481 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
482 <field name="name">TVH for purchases - 13%</field>482 <field name="name">HST for purchases - 13%</field>
483 <field name="description">TVH13_PURC</field>483 <field name="description">HST13_PURC</field>
484 <field name="type_tax_use">purchase</field>484 <field name="type_tax_use">purchase</field>
485 <field name="amount">0.130000</field>485 <field name="amount">0.130000</field>
486 <field name="type">percent</field>486 <field name="type">percent</field>
@@ -494,8 +494,8 @@
494494
495 <record id="hst135_purc_en" model="account.tax.template">495 <record id="hst135_purc_en" model="account.tax.template">
496 <field name="chart_template_id" ref="ca_en_chart_template_en"/>496 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
497 <field name="name">TVH for purchases - 13.5%</field>497 <field name="name">HST for purchases - 13.5%</field>
498 <field name="description">TVH135_PURC</field>498 <field name="description">HST135_PURC</field>
499 <field name="type_tax_use">purchase</field>499 <field name="type_tax_use">purchase</field>
500 <field name="amount">0.135000</field>500 <field name="amount">0.135000</field>
501 <field name="type">percent</field>501 <field name="type">percent</field>
@@ -509,8 +509,8 @@
509509
510 <record id="hst15_purc_en" model="account.tax.template">510 <record id="hst15_purc_en" model="account.tax.template">
511 <field name="chart_template_id" ref="ca_en_chart_template_en"/>511 <field name="chart_template_id" ref="ca_en_chart_template_en"/>
512 <field name="name">TVH for purchases - 15%</field>512 <field name="name">HST for purchases - 15%</field>
513 <field name="description">TVH15_PURC</field>513 <field name="description">HST15_PURC</field>
514 <field name="type_tax_use">purchase</field>514 <field name="type_tax_use">purchase</field>
515 <field name="amount">0.150000</field>515 <field name="amount">0.150000</field>
516 <field name="type">percent</field>516 <field name="type">percent</field>