Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision into lp:openobject-addons

  1. l10n_ca_chart_of_taxes_decimal_precision
  2. Merge into trunk
Status: Merged
Merged at revision: 4118
Proposed branch: lp:~openerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision
Merge into: lp:openobject-addons
Diff against target: 259 lines (+100/-47)
5 files modified
l10n_ca/__init__.py (+4/-4)
l10n_ca/__openerp__.py (+1/-0)
l10n_ca/account_tax_fr.xml (+40/-25)
l10n_ca/decimal_precision.xml (+10/-0)
l10n_ca/fiscal_templates_fr.xml (+45/-18)
To merge this branch: bzr merge lp:~openerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision
Reviewer Review Type Date Requested Status
Nicolas Vanhoren (OpenERP) (community) Needs Fixing
OpenERP Core Team Pending
Review via email: mp+40590@code.launchpad.net

Description of the change

Improve chart of taxes
Change decimal_precision for account (TVQ is 7.5%)

To post a comment you must log in.
Revision history for this message
Nicolas Vanhoren (OpenERP) (niv-openerp) wrote :

You're not allowed the modify the data of another module in a localization module, please remove your decimal_precision.xml file.

The rest seems ok.

review: Needs Fixing
Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) wrote :

> You're not allowed the modify the data of another module in a localization
> module, please remove your decimal_precision.xml file.
>
> The rest seems ok.

OK, so what do you recommend to create the TVQ tax which is 7,5% (and will be 8,5% as of Jan the 1st, 2011) ?

Revision history for this message
Nicolas Vanhoren (OpenERP) (niv-openerp) wrote :

> > You're not allowed the modify the data of another module in a localization
> > module, please remove your decimal_precision.xml file.
> >
> > The rest seems ok.
>
> OK, so what do you recommend to create the TVQ tax which is 7,5% (and will be
> 8,5% as of Jan the 1st, 2011) ?
I asked qdp to take a look at that problem, he will test that and reply to you.

Revision history for this message
Fabien (Open ERP) (fp-tinyerp) wrote :

Hello,

Thank you for your contribution. I merged the branch with the following changes:
  - I fixed the TPS+TVQ tax which is correct now.
  - I put the TVQ to 8.5
  - I removed decimal to 3 digits, because you don't need to do that to support taxes of 8.5% (and it
    may generate impacts on others modules)

Revision history for this message
fblauer (fblauer) wrote :

Just wanted to mention that in Quebec the 8.5 % QST is on top of the federal
tax (GST). Is the system able to handle tax on tax? If not, more than 2
decimals is required to adjust the rate to compensate.

On Wed, Dec 29, 2010 at 2:39 PM, Fabien (Open ERP) <email address hidden> wrote:

> Hello,
>
> Thank you for your contribution. I merged the branch with the following
> changes:
> - I fixed the TPS+TVQ tax which is correct now.
> - I put the TVQ to 8.5
> - I removed decimal to 3 digits, because you don't need to do that to
> support taxes of 8.5% (and it
> may generate impacts on others modules)
> --
>
> https://code.launchpad.net/~openerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision/+merge/40590<https://code.launchpad.net/%7Eopenerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision/+merge/40590>
> Your team OpenERP Canada Team is subscribed to branch
> lp:~openerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision.
>
> _______________________________________________
> Mailing list: https://launchpad.net/~openerp-canada<https://launchpad.net/%7Eopenerp-canada>
> Post to : <email address hidden>
> Unsubscribe : https://launchpad.net/~openerp-canada<https://launchpad.net/%7Eopenerp-canada>
> More help : https://help.launchpad.net/ListHelp
>

--
Fred Blauer CA, CA.IT, CISA
http://openacct.ca
<email address hidden>
514-667-1555

Revision history for this message
Fabien (Open ERP) (fp-tinyerp) wrote :

Hello,

Yes, I configured l10n_ca so that is supports this for the Quebec. It's
a tax having two children. Commited in trunk.

fblauer wrote:
> Just wanted to mention that in Quebec the 8.5 % QST is on top of the federal
> tax (GST). Is the system able to handle tax on tax? If not, more than 2
> decimals is required to adjust the rate to compensate.
>
> On Wed, Dec 29, 2010 at 2:39 PM, Fabien (Open ERP) <email address hidden> wrote:
>
>> Hello,
>>
>> Thank you for your contribution. I merged the branch with the following
>> changes:
>> - I fixed the TPS+TVQ tax which is correct now.
>> - I put the TVQ to 8.5
>> - I removed decimal to 3 digits, because you don't need to do that to
>> support taxes of 8.5% (and it
>> may generate impacts on others modules)
>> --
>>
>> https://code.launchpad.net/~openerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision/+merge/40590<https://code.launchpad.net/%7Eopenerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision/+merge/40590>
>> Your team OpenERP Canada Team is subscribed to branch
>> lp:~openerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision.
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~openerp-canada<https://launchpad.net/%7Eopenerp-canada>
>> Post to : <email address hidden>
>> Unsubscribe : https://launchpad.net/~openerp-canada<https://launchpad.net/%7Eopenerp-canada>
>> More help : https://help.launchpad.net/ListHelp
>>
>
>
>

--
Fabien Pinckaers
CEO OpenERP
Chaussée de Namur 40
B-1367 Grand-Rosière
Belgium
Phone: +32.81.81.37.00
Fax: +32.81.73.35.01
Web: http://openerp.com

Revision history for this message
fblauer (fblauer) wrote :

Merci

On Fri, Dec 31, 2010 at 3:04 AM, Fabien (Open ERP) <email address hidden> wrote:

> Hello,
>
> Yes, I configured l10n_ca so that is supports this for the Quebec. It's
> a tax having two children. Commited in trunk.
>
> fblauer wrote:
> > Just wanted to mention that in Quebec the 8.5 % QST is on top of the
> federal
> > tax (GST). Is the system able to handle tax on tax? If not, more than 2
> > decimals is required to adjust the rate to compensate.
> >
> > On Wed, Dec 29, 2010 at 2:39 PM, Fabien (Open ERP) <email address hidden>
> wrote:
> >
> >> Hello,
> >>
> >> Thank you for your contribution. I merged the branch with the following
> >> changes:
> >> - I fixed the TPS+TVQ tax which is correct now.
> >> - I put the TVQ to 8.5
> >> - I removed decimal to 3 digits, because you don't need to do that to
> >> support taxes of 8.5% (and it
> >> may generate impacts on others modules)
> >> --
> >>
> >>
> https://code.launchpad.net/~openerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision/+merge/40590<https://code.launchpad.net/%7Eopenerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision/+merge/40590>
> <
> https://code.launchpad.net/%7Eopenerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision/+merge/40590
> >
> >> Your team OpenERP Canada Team is subscribed to branch
> >>
> lp:~openerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision.
> >>
> >> _______________________________________________
> >> Mailing list: https://launchpad.net/~openerp-canada<https://launchpad.net/%7Eopenerp-canada>
> <https://launchpad.net/%7Eopenerp-canada>
> >> Post to : <email address hidden>
> >> Unsubscribe : https://launchpad.net/~openerp-canada<https://launchpad.net/%7Eopenerp-canada>
> <https://launchpad.net/%7Eopenerp-canada>
> >> More help : https://help.launchpad.net/ListHelp
> >>
> >
> >
> >
>
>
> --
> Fabien Pinckaers
> CEO OpenERP
> Chaussée de Namur 40
> B-1367 Grand-Rosière
> Belgium
> Phone: +32.81.81.37.00
> Fax: +32.81.73.35.01
> Web: http://openerp.com
>
> https://code.launchpad.net/~openerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision/+merge/40590<https://code.launchpad.net/%7Eopenerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision/+merge/40590>
> Your team OpenERP Canada Team is subscribed to branch
> lp:~openerp-canada/openobject-addons/l10n_ca_chart_of_taxes_decimal_precision.
>
> _______________________________________________
> Mailing list: https://launchpad.net/~openerp-canada<https://launchpad.net/%7Eopenerp-canada>
> Post to : <email address hidden>
> Unsubscribe : https://launchpad.net/~openerp-canada<https://launchpad.net/%7Eopenerp-canada>
> More help : https://help.launchpad.net/ListHelp
>

--
Fred Blauer CA, CA.IT, CISA
http://openacct.ca
<email address hidden>
514-667-1555

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ca/__init__.py'
2--- l10n_ca/__init__.py 2010-10-25 13:23:05 +0000
3+++ l10n_ca/__init__.py 2010-11-12 22:50:35 +0000
4@@ -2,19 +2,19 @@
5 ##############################################################################
6 #
7 # OpenERP, Open Source Management Solution
8-# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
9+# Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
10 #
11 # This program is free software: you can redistribute it and/or modify
12-# it under the terms of the GNU Affero General Public License as
13+# it under the terms of the GNU General Public License as
14 # published by the Free Software Foundation, either version 3 of the
15 # License, or (at your option) any later version.
16 #
17 # This program is distributed in the hope that it will be useful,
18 # but WITHOUT ANY WARRANTY; without even the implied warranty of
19 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20-# GNU Affero General Public License for more details.
21+# GNU General Public License for more details.
22 #
23-# You should have received a copy of the GNU Affero General Public License
24+# You should have received a copy of the GNU General Public License
25 # along with this program. If not, see <http://www.gnu.org/licenses/>.
26 #
27 ##############################################################################
28
29=== modified file 'l10n_ca/__openerp__.py'
30--- l10n_ca/__openerp__.py 2010-10-27 09:55:33 +0000
31+++ l10n_ca/__openerp__.py 2010-11-12 22:50:35 +0000
32@@ -28,6 +28,7 @@
33 "depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
34 "init_xml" : [],
35 "update_xml" : [
36+ 'decimal_precision.xml',
37 'account_types_en.xml',
38 'account_chart_en.xml',
39 'account_tax_code_en.xml',
40
41=== modified file 'l10n_ca/account_tax_fr.xml'
42--- l10n_ca/account_tax_fr.xml 2010-10-25 13:23:05 +0000
43+++ l10n_ca/account_tax_fr.xml 2010-11-12 22:50:35 +0000
44@@ -2,18 +2,25 @@
45 <openerp>
46 <data noupdate="1">
47
48- <record id="notax_fr" model="account.tax.template">
49- <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
50- <field name="name">Pas de taxes</field>
51- <field name="description">Pas de taxes</field>
52- <field name="amount">0.00</field>
53- <field name="type">percent</field>
54- </record>
55+ <record id="tpstvq_fr" model="account.tax.template">
56+ <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
57+ <field name="name">TPS (5%)</field>
58+ <field name="description">TPSTVQ</field>
59+ <field name="amount">0.050000</field>
60+ <field name="type">percent</field>
61+ <field name="include_base_amount">TRUE</field>
62+ <field name="account_collected_id" ref="chart241100_fr"/>
63+ <field name="account_paid_id" ref="chart242100_fr"/>
64+ <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
65+ <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
66+ <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
67+ <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
68+ </record>
69
70 <record id="tvq_fr" model="account.tax.template">
71 <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
72 <field name="name">TVQ (7.5%)</field>
73- <field name="code">TVQ</field>
74+ <field name="description">TVQ</field>
75 <field name="amount">0.075000</field>
76 <field name="type">percent</field>
77 <field name="account_collected_id" ref="chart241200_fr"/>
78@@ -22,27 +29,13 @@
79 <field name="tax_code_id" ref="vat_code_receivable_tvq_fr"/>
80 <field name="ref_base_code_id" ref="vat_code_base_payable_tvq_fr"/>
81 <field name="ref_tax_code_id" ref="vat_code_payable_tvq_fr"/>
82- </record>
83-
84- <record id="tps_fr" model="account.tax.template">
85- <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
86- <field name="name">TPS (5.0%)</field>
87- <field name="code">TPS</field>
88- <field name="amount">0.050000</field>
89- <field name="type">percent</field>
90- <field name="account_collected_id" ref="chart241100_fr"/>
91- <field name="account_paid_id" ref="chart242100_fr"/>
92- <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
93- <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
94- <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
95- <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
96- <field name="parent_id" ref="tvq_fr"/>
97+ <field name="parent_id" ref="tpstvq_fr"/>
98 </record>
99
100 <record id="tvh_fr" model="account.tax.template">
101 <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
102 <field name="name">TVH (13%)</field>
103- <field name="code">TVH</field>
104+ <field name="description">TVH</field>
105 <field name="amount">0.130000</field>
106 <field name="type">percent</field>
107 <field name="account_collected_id" ref="chart241300_fr"/>
108@@ -53,5 +46,27 @@
109 <field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
110 </record>
111
112-</data>
113+ <record id="tps_fr" model="account.tax.template">
114+ <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
115+ <field name="name">TPS (5%)</field>
116+ <field name="description">TPS</field>
117+ <field name="amount">0.050000</field>
118+ <field name="type">percent</field>
119+ <field name="account_collected_id" ref="chart241100_fr"/>
120+ <field name="account_paid_id" ref="chart242100_fr"/>
121+ <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
122+ <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
123+ <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
124+ <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
125+ </record>
126+
127+ <record id="notax_fr" model="account.tax.template">
128+ <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
129+ <field name="name">Pas de taxes</field>
130+ <field name="description">Pas de taxes</field>
131+ <field name="amount">0.00</field>
132+ <field name="type">percent</field>
133+ </record>
134+
135+ </data>
136 </openerp>
137
138=== added file 'l10n_ca/decimal_precision.xml'
139--- l10n_ca/decimal_precision.xml 1970-01-01 00:00:00 +0000
140+++ l10n_ca/decimal_precision.xml 2010-11-12 22:50:35 +0000
141@@ -0,0 +1,10 @@
142+<?xml version="1.0" encoding="utf-8"?>
143+<openerp>
144+ <data>
145+
146+ <record id="product.decimal_account" model="decimal.precision">
147+ <field name="digits">3</field>
148+ </record>
149+
150+ </data>
151+</openerp>
152
153=== modified file 'l10n_ca/fiscal_templates_fr.xml'
154--- l10n_ca/fiscal_templates_fr.xml 2010-10-25 13:23:05 +0000
155+++ l10n_ca/fiscal_templates_fr.xml 2010-11-12 22:50:35 +0000
156@@ -1,6 +1,6 @@
157 <?xml version="1.0" encoding="utf-8"?>
158 <openerp>
159-<data>
160+ <data>
161
162 <!-- Fiscal Position Templates -->
163
164@@ -29,51 +29,78 @@
165
166 <record id="fiscal_position_tax_template_1_fr" model="account.fiscal.position.tax.template">
167 <field name="position_id" ref="fiscal_position_template_1_fr" />
168- <field name="tax_src_id" ref="tvq_fr" />
169- <field name="tax_dest_id" ref="notax_fr" />
170+ <field name="tax_src_id" ref="tpstvq_fr" />
171+ <field name="tax_dest_id" ref="tpstvq_fr" />
172 </record>
173
174 <record id="fiscal_position_tax_template_2_fr" model="account.fiscal.position.tax.template">
175 <field name="position_id" ref="fiscal_position_template_2_fr" />
176- <field name="tax_src_id" ref="tvh_fr" />
177- <field name="tax_dest_id" ref="notax_fr" />
178+ <field name="tax_src_id" ref="tpstvq_fr" />
179+ <field name="tax_dest_id" ref="tvh_fr" />
180 </record>
181+
182 <record id="fiscal_position_tax_template_3_fr" model="account.fiscal.position.tax.template">
183 <field name="position_id" ref="fiscal_position_template_3_fr" />
184- <field name="tax_src_id" ref="tps_fr" />
185- <field name="tax_dest_id" ref="notax_fr" />
186+ <field name="tax_src_id" ref="tpstvq_fr" />
187+ <field name="tax_dest_id" ref="tps_fr" />
188 </record>
189+
190 <record id="fiscal_position_tax_template_4_fr" model="account.fiscal.position.tax.template">
191 <field name="position_id" ref="fiscal_position_template_4_fr" />
192- <field name="tax_src_id" ref="notax_fr" />
193+ <field name="tax_src_id" ref="tpstvq_fr" />
194 <field name="tax_dest_id" ref="notax_fr" />
195 </record>
196
197- <!-- Fiscal Position Account Templates -->
198-
199- <record id="fiscal_position_account_template_1_fr" model="account.fiscal.position.account.template">
200- <field name="position_id" ref="fiscal_position_template_1_fr" />
201- <field name="account_src_id" ref="chart411110_fr" />
202+ <!-- Fiscal Position Account Templates - Goods -->
203+
204+ <record id="fiscal_position_account_template_1_fr" model="account.fiscal.position.account.template">
205+ <field name="position_id" ref="fiscal_position_template_1_fr" />
206+ <field name="account_src_id" ref="chart411110_fr" />
207+ <field name="account_dest_id" ref="chart411110_fr" />
208+ </record>
209+
210+ <record id="fiscal_position_account_template_2_fr" model="account.fiscal.position.account.template">
211+ <field name="position_id" ref="fiscal_position_template_2_fr" />
212+ <field name="account_src_id" ref="chart411110_fr" />
213+ <field name="account_dest_id" ref="chart411120_fr" />
214+ </record>
215+
216+ <record id="fiscal_position_account_template_3_fr" model="account.fiscal.position.account.template">
217+ <field name="position_id" ref="fiscal_position_template_3_fr" />
218+ <field name="account_src_id" ref="chart411110_fr" />
219+ <field name="account_dest_id" ref="chart411130_fr" />
220+ </record>
221+
222+ <record id="fiscal_position_account_template_4_fr" model="account.fiscal.position.account.template">
223+ <field name="position_id" ref="fiscal_position_template_4_fr" />
224+ <field name="account_src_id" ref="chart411110_fr" />
225+ <field name="account_dest_id" ref="chart411140_fr" />
226+ </record>
227+
228+ <!-- Fiscal Position Account Templates - Services -->
229+
230+ <record id="fiscal_position_account_template_1_fr" model="account.fiscal.position.account.template">
231+ <field name="position_id" ref="fiscal_position_template_1_fr" />
232+ <field name="account_src_id" ref="chart411210_fr" />
233 <field name="account_dest_id" ref="chart411210_fr" />
234 </record>
235
236 <record id="fiscal_position_account_template_2_fr" model="account.fiscal.position.account.template">
237 <field name="position_id" ref="fiscal_position_template_2_fr" />
238- <field name="account_src_id" ref="chart411120_fr" />
239+ <field name="account_src_id" ref="chart411210_fr" />
240 <field name="account_dest_id" ref="chart411220_fr" />
241 </record>
242
243 <record id="fiscal_position_account_template_3_fr" model="account.fiscal.position.account.template">
244 <field name="position_id" ref="fiscal_position_template_3_fr" />
245- <field name="account_src_id" ref="chart411130_fr" />
246+ <field name="account_src_id" ref="chart411210_fr" />
247 <field name="account_dest_id" ref="chart411230_fr" />
248 </record>
249
250 <record id="fiscal_position_account_template_4_fr" model="account.fiscal.position.account.template">
251 <field name="position_id" ref="fiscal_position_template_4_fr" />
252- <field name="account_src_id" ref="chart411140_fr" />
253+ <field name="account_src_id" ref="chart411210_fr" />
254 <field name="account_dest_id" ref="chart411240_fr" />
255 </record>
256-
257-</data>
258+ </data>
259 </openerp>

Subscribers

People subscribed via source and target branches

to all changes: