Merge lp:~stefan-opener/ocb-addons/lp1168603-l10n_nl_tax_code_sequence into lp:ocb-addons
- lp1168603-l10n_nl_tax_code_sequence
- Merge into 7.0
Proposed by
Stefan Rijnhart (Opener)
Status: | Merged |
---|---|
Merged at revision: | 9214 |
Proposed branch: | lp:~stefan-opener/ocb-addons/lp1168603-l10n_nl_tax_code_sequence |
Merge into: | lp:ocb-addons |
Diff against target: |
242 lines (+37/-0) 1 file modified
l10n_nl/account_chart_netherlands.xml (+37/-0) |
To merge this branch: | bzr merge lp:~stefan-opener/ocb-addons/lp1168603-l10n_nl_tax_code_sequence |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Holger Brunn (Therp) | Needs Fixing | ||
Review via email: mp+160599@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) : | # |
review:
Approve
(markup review, no test)
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote : | # |
Thanks for mentioning this. Fixed this branch and the branch for upstream.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'l10n_nl/account_chart_netherlands.xml' |
2 | --- l10n_nl/account_chart_netherlands.xml 2013-05-15 16:26:56 +0000 |
3 | +++ l10n_nl/account_chart_netherlands.xml 2013-05-27 10:41:33 +0000 |
4 | @@ -3893,54 +3893,64 @@ |
5 | <record id="btw_code_chart_root" model="account.tax.code.template"> |
6 | <field name="name">Nederlands BTW Plan</field> |
7 | <field name="parent_id" eval="False"/> |
8 | + <field name="sequence" eval="1"/> |
9 | </record> |
10 | <!-- De gegevens voor de BTW (gegevens voor omzetbedragen staan verderop) --> |
11 | <record id="btw_totaal" model="account.tax.code.template"> |
12 | <field name="code">B</field> |
13 | <field name="name">Gegevens omzetbelasting (BTW)</field> |
14 | <field name="parent_id" ref="btw_code_chart_root"/> |
15 | + <field name="sequence" eval="5"/> |
16 | </record> |
17 | <!-- 1 Leveringen en/of diensten binnenland --> |
18 | <record id="btw_code_binnenland" model="account.tax.code.template"> |
19 | <field name="code">1</field> |
20 | <field name="name">Leveringen en/of diensten binnenland (BTW)</field> |
21 | <field name="parent_id" ref="btw_totaal"/> |
22 | + <field name="sequence" eval="10"/> |
23 | </record> |
24 | <record id="btw_code_1a" model="account.tax.code.template"> |
25 | <field name="code">1a</field> |
26 | <field name="parent_id" ref="btw_code_binnenland"/> |
27 | <field name="name">Leveringen/diensten belast met 21% (BTW)</field> |
28 | + <field name="sequence" eval="11"/> |
29 | </record> |
30 | <record id="btw_code_1b" model="account.tax.code.template"> |
31 | <field name="code">1b</field> |
32 | <field name="parent_id" ref="btw_code_binnenland"/> |
33 | <field name="name">Leveringen/diensten belast met 6% (BTW)</field> |
34 | + <field name="sequence" eval="12"/> |
35 | </record> |
36 | <record id="btw_code_1c" model="account.tax.code.template"> |
37 | <field name="code">1c</field> |
38 | <field name="parent_id" ref="btw_code_binnenland"/> |
39 | <field name="name">Leveringen/diensten belast met overige tarieven behalve 0% (BTW)</field> |
40 | + <field name="sequence" eval="13"/> |
41 | </record> |
42 | <record id="btw_code_1d" model="account.tax.code.template"> |
43 | <field name="code">1d</field> |
44 | <field name="parent_id" ref="btw_code_binnenland"/> |
45 | <field name="name">Prive-gebruik (BTW)</field> |
46 | + <field name="sequence" eval="14"/> |
47 | </record> |
48 | <record id="btw_code_1e" model="account.tax.code.template"> |
49 | <field name="code">1e</field> |
50 | <field name="parent_id" ref="btw_code_binnenland"/> |
51 | <field name="name">Leveringen/diensten belast met 0% of niet bij u belast (BTW)</field> |
52 | + <field name="sequence" eval="15"/> |
53 | </record> |
54 | <!-- 2. Verleggingsregeling --> |
55 | <record id="btw_code_verlegging" model="account.tax.code.template"> |
56 | <field name="code">2</field> |
57 | <field name="name">Verleggingsregelingen: BTW naar u verlegd (BTW)</field> |
58 | <field name="parent_id" ref="btw_totaal"/> |
59 | + <field name="sequence" eval="20"/> |
60 | </record> |
61 | <record id="btw_code_2a" model="account.tax.code.template"> |
62 | <field name="code">2a</field> |
63 | <field name="parent_id" ref="btw_code_verlegging"/> |
64 | <field name="name">Heffing van omzetbelasting is naar u verlegd (BTW)</field> |
65 | + <field name="sequence" eval="21"/> |
66 | </record> |
67 | <!-- Voor rubriek 3 hoeft geen omzetbelasting aangegeven te worden, wel het omzet bedrag, zie hiervoor verderop |
68 | 3. Leveringen naar het buitenland --> |
69 | @@ -3950,60 +3960,71 @@ |
70 | <field name="code">4</field> |
71 | <field name="name">Leveringen vanuit het buitenland (BTW)</field> |
72 | <field name="parent_id" ref="btw_totaal"/> |
73 | + <field name="sequence" eval="40"/> |
74 | </record> |
75 | <record id="btw_code_4a" model="account.tax.code.template"> |
76 | <field name="code">4a</field> |
77 | <field name="parent_id" ref="btw_code_vanuit_buitenland"/> |
78 | <field name="name">Leveringen uit landen buiten de EU (invoer) (BTW)</field> |
79 | <field name="sign" eval="-1" /> |
80 | + <field name="sequence" eval="41"/> |
81 | </record> |
82 | <record id="btw_code_4b" model="account.tax.code.template"> |
83 | <field name="code">4b</field> |
84 | <field name="parent_id" ref="btw_code_vanuit_buitenland"/> |
85 | <field name="name">Verwerving van goederen uit landen binnen de EU (BTW)</field> |
86 | <field name="sign" eval="-1" /> |
87 | + <field name="sequence" eval="42"/> |
88 | </record> |
89 | <!-- 5. Voorbelasting, kleineondernemersregeling, schatting en eindtotaal --> |
90 | <record id="btw_code_voorbelasting" model="account.tax.code.template"> |
91 | <field name="code">5</field> |
92 | <field name="name">Voorbelasting, kleineondernemersregeling, schatting en eindtotaal (BTW)</field> |
93 | <field name="parent_id" ref="btw_totaal"/> |
94 | + <field name="sequence" eval="50"/> |
95 | </record> |
96 | <record id="btw_code_5a" model="account.tax.code.template"> |
97 | <field name="code">5a</field> |
98 | <field name="parent_id" ref="btw_code_voorbelasting"/> |
99 | <field name="name">Verschuldigde omzetbelasting (rubrieken 1a t/m 4b) (BTW)</field> |
100 | + <field name="sequence" eval="51"/> |
101 | </record> |
102 | <record id="btw_code_5b" model="account.tax.code.template"> |
103 | <field name="code">5b</field> |
104 | <field eval="-1" name="sign"/> |
105 | <field name="parent_id" ref="btw_code_voorbelasting"/> |
106 | <field name="name">Voorbelasting (BTW)</field> |
107 | + <field name="sequence" eval="52"/> |
108 | </record> |
109 | <record id="btw_code_5c" model="account.tax.code.template"> |
110 | <field name="code">5c</field> |
111 | <field name="parent_id" ref="btw_code_voorbelasting"/> |
112 | <field name="name">Subtotaal (rubriek 5a min 5b) (BTW)</field> |
113 | + <field name="sequence" eval="53"/> |
114 | </record> |
115 | <record id="btw_code_5d" model="account.tax.code.template"> |
116 | <field name="code">5d</field> |
117 | <field name="parent_id" ref="btw_code_voorbelasting"/> |
118 | <field name="name">Vermindering volgens de kleineondernemersregeling (BTW)</field> |
119 | + <field name="sequence" eval="54"/> |
120 | </record> |
121 | <record id="btw_code_5e" model="account.tax.code.template"> |
122 | <field name="code">5e</field> |
123 | <field name="parent_id" ref="btw_code_voorbelasting"/> |
124 | <field name="name">Schatting vorige aangifte(n) (BTW)</field> |
125 | + <field name="sequence" eval="55"/> |
126 | </record> |
127 | <record id="btw_code_5f" model="account.tax.code.template"> |
128 | <field name="code">5f</field> |
129 | <field name="parent_id" ref="btw_code_voorbelasting"/> |
130 | <field name="name">Schatting deze aangifte (BTW)</field> |
131 | + <field name="sequence" eval="56"/> |
132 | </record> |
133 | <record id="btw_code_5g" model="account.tax.code.template"> |
134 | <field name="code">5g</field> |
135 | <field name="parent_id" ref="btw_code_voorbelasting"/> |
136 | <field name="name">Totaal te betalen/terug te vragen (BTW)</field> |
137 | + <field name="sequence" eval="57"/> |
138 | </record> |
139 | |
140 | <!-- De gegevens over de omzet --> |
141 | @@ -4011,85 +4032,101 @@ |
142 | <field name="code">A</field> |
143 | <field name="name">Gegevens omzetbedragen</field> |
144 | <field name="parent_id" ref="btw_code_chart_root"/> |
145 | + <field name="sequence" eval="1"/> |
146 | </record> |
147 | <!-- 1 Leveringen en/of diensten binnenland --> |
148 | <record id="omz_code_binnenland" model="account.tax.code.template"> |
149 | <field name="code">1</field> |
150 | <field name="name">Leveringen en/of diensten binnenland (omzet)</field> |
151 | <field name="parent_id" ref="omz_totaal"/> |
152 | + <field name="sequence" eval="10"/> |
153 | </record> |
154 | <record id="omz_code_1a" model="account.tax.code.template"> |
155 | <field name="code">1a</field> |
156 | <field name="parent_id" ref="omz_code_binnenland"/> |
157 | <field name="name">Leveringen/diensten belast met 21% (omzet)</field> |
158 | + <field name="sequence" eval="11"/> |
159 | </record> |
160 | <record id="omz_code_1b" model="account.tax.code.template"> |
161 | <field name="code">1b</field> |
162 | <field name="parent_id" ref="omz_code_binnenland"/> |
163 | <field name="name">Leveringen/diensten belast met 6% (omzet)</field> |
164 | + <field name="sequence" eval="12"/> |
165 | </record> |
166 | <record id="omz_code_1c" model="account.tax.code.template"> |
167 | <field name="code">1c</field> |
168 | <field name="parent_id" ref="omz_code_binnenland"/> |
169 | <field name="name">Leveringen/diensten belast met overige tarieven behalve 0% (omzet)</field> |
170 | + <field name="sequence" eval="13"/> |
171 | </record> |
172 | <record id="omz_code_1d" model="account.tax.code.template"> |
173 | <field name="code">1d</field> |
174 | <field name="parent_id" ref="omz_code_binnenland"/> |
175 | <field name="name">Prive-gebruik (omzet)</field> |
176 | + <field name="sequence" eval="14"/> |
177 | </record> |
178 | <record id="omz_code_1e" model="account.tax.code.template"> |
179 | <field name="code">1e</field> |
180 | <field name="parent_id" ref="omz_code_binnenland"/> |
181 | <field name="name">Leveringen/diensten belast met 0% of niet bij u belast (omzet)</field> |
182 | + <field name="sequence" eval="15"/> |
183 | </record> |
184 | <!-- 2. Verleggingsregeling --> |
185 | <record id="omz_code_verlegging" model="account.tax.code.template"> |
186 | <field name="code">2</field> |
187 | <field name="name">Verleggingsregelingen: BTW naar u verlegd (omzet)</field> |
188 | <field name="parent_id" ref="omz_totaal"/> |
189 | + <field name="sequence" eval="20"/> |
190 | </record> |
191 | <record id="omz_code_2a" model="account.tax.code.template"> |
192 | <field name="code">2a</field> |
193 | <field name="parent_id" ref="omz_code_verlegging"/> |
194 | <field name="name">Heffing van omzetbelasting is naar u verlegd (omzet)</field> |
195 | + <field name="sequence" eval="21"/> |
196 | </record> |
197 | <!-- 3. Leveringen naar het buitenland --> |
198 | <record id="omz_code_naar_buitenland" model="account.tax.code.template"> |
199 | <field name="code">3</field> |
200 | <field name="name">Leveringen naar het buitenland (omzet)</field> |
201 | <field name="parent_id" ref="omz_totaal"/> |
202 | + <field name="sequence" eval="30"/> |
203 | </record> |
204 | <record id="omz_code_3a" model="account.tax.code.template"> |
205 | <field name="code">3a</field> |
206 | <field name="parent_id" ref="omz_code_naar_buitenland"/> |
207 | <field name="name">Leveringen naar landen buiten de EU (uitvoer) (omzet)</field> |
208 | + <field name="sequence" eval="31"/> |
209 | </record> |
210 | <record id="omz_code_3b" model="account.tax.code.template"> |
211 | <field name="code">3b</field> |
212 | <field name="parent_id" ref="omz_code_naar_buitenland"/> |
213 | <field name="name">Leveringen naar landen binnen de EU (omzet)</field> |
214 | + <field name="sequence" eval="32"/> |
215 | </record> |
216 | <record id="omz_code_3c" model="account.tax.code.template"> |
217 | <field name="code">3c</field> |
218 | <field name="parent_id" ref="omz_code_naar_buitenland"/> |
219 | <field name="name">Installatie/afstandsverkopen binnen de EU (omzet)</field> |
220 | + <field name="sequence" eval="33"/> |
221 | </record> |
222 | <!-- 4. Leveringen vanuit het buitenland --> |
223 | <record id="omz_code_vanuit_buitenland" model="account.tax.code.template"> |
224 | <field name="code">4</field> |
225 | <field name="name">Leveringen vanuit het buitenland (omzet)</field> |
226 | <field name="parent_id" ref="omz_totaal"/> |
227 | + <field name="sequence" eval="40"/> |
228 | </record> |
229 | <record id="omz_code_4a" model="account.tax.code.template"> |
230 | <field name="code">4a</field> |
231 | <field name="parent_id" ref="omz_code_vanuit_buitenland"/> |
232 | <field name="name">Leveringen uit landen buiten de EU (invoer) (omzet)</field> |
233 | + <field name="sequence" eval="41"/> |
234 | </record> |
235 | <record id="omz_code_4b" model="account.tax.code.template"> |
236 | <field name="code">4b</field> |
237 | <field name="parent_id" ref="omz_code_vanuit_buitenland"/> |
238 | <field name="name">Verwerving van goederen uit landen binnen de EU (omzet)</field> |
239 | + <field name="sequence" eval="42"/> |
240 | </record> |
241 | |
242 | <!-- Chart template --> |
This one conflicts now at btw_code_2a and omz_code_2a. Could you look into that?