Merge lp:~openerp-dev/openobject-addons/trunk-bug-844354-bde into lp:openobject-addons
- trunk-bug-844354-bde
- Merge into trunk
Proposed by
Bharat Devnani (Open ERP)
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Mustufa Rangwala (Open ERP) | ||||
Proposed branch: | lp:~openerp-dev/openobject-addons/trunk-bug-844354-bde | ||||
Merge into: | lp:openobject-addons | ||||
Diff against target: |
511 lines (+89/-3) 1 file modified
account/data/account_data.xml (+89/-3) |
||||
To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-844354-bde | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email: mp+77876@code.launchpad.net |
Commit message
Description of the change
Hello Sir,
I have added Amount Currency field in Journal Items Tree view through account/
Thanks & Regards,
Devnani Bharat R.
To post a comment you must log in.
Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) wrote : | # |
Unmerged revisions
- 5290. By Bharat Devnani (Open ERP)
-
account : Secondary currency not displaying
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'account/data/account_data.xml' |
2 | --- account/data/account_data.xml 2011-10-01 09:40:46 +0000 |
3 | +++ account/data/account_data.xml 2011-10-03 09:10:30 +0000 |
4 | @@ -62,9 +62,11 @@ |
5 | <!-- |
6 | Account Journal View |
7 | --> |
8 | + |
9 | <record id="account_journal_bank_view" model="account.journal.view"> |
10 | <field name="name">Bank/Cash Journal View</field> |
11 | </record> |
12 | + |
13 | <record id="bank_col1" model="account.journal.column"> |
14 | <field name="view_id" ref="account_journal_bank_view"/> |
15 | <field name="name">Date</field> |
16 | @@ -72,6 +74,7 @@ |
17 | <field eval="True" name="required"/> |
18 | <field eval="3" name="sequence"/> |
19 | </record> |
20 | + |
21 | <record id="bank_col2" model="account.journal.column"> |
22 | <field name="view_id" ref="account_journal_bank_view"/> |
23 | <field name="name">Journal Entry</field> |
24 | @@ -79,6 +82,7 @@ |
25 | <field eval="False" name="required"/> |
26 | <field eval="1" name="sequence"/> |
27 | </record> |
28 | + |
29 | <record id="bank_col7" model="account.journal.column"> |
30 | <field name="view_id" ref="account_journal_bank_view"/> |
31 | <field name="name">Name</field> |
32 | @@ -86,18 +90,21 @@ |
33 | <field eval="7" name="sequence"/> |
34 | <field eval="True" name="required"/> |
35 | </record> |
36 | + |
37 | <record id="bank_col4" model="account.journal.column"> |
38 | <field name="view_id" ref="account_journal_bank_view"/> |
39 | <field name="name">Statement</field> |
40 | <field name="field">statement_id</field> |
41 | <field eval="4" name="sequence"/> |
42 | </record> |
43 | + |
44 | <record id="bank_col6" model="account.journal.column"> |
45 | <field name="view_id" ref="account_journal_bank_view"/> |
46 | <field name="name">Partner</field> |
47 | <field name="field">partner_id</field> |
48 | <field eval="5" name="sequence"/> |
49 | </record> |
50 | + |
51 | <record id="bank_col5" model="account.journal.column"> |
52 | <field name="view_id" ref="account_journal_bank_view"/> |
53 | <field name="name">Account</field> |
54 | @@ -105,30 +112,35 @@ |
55 | <field eval="True" name="required"/> |
56 | <field eval="6" name="sequence"/> |
57 | </record> |
58 | + |
59 | <record id="bank_col9" model="account.journal.column"> |
60 | <field name="view_id" ref="account_journal_bank_view"/> |
61 | <field name="name">Debit</field> |
62 | <field name="field">debit</field> |
63 | <field eval="11" name="sequence"/> |
64 | </record> |
65 | + |
66 | <record id="bank_col10" model="account.journal.column"> |
67 | <field name="view_id" ref="account_journal_bank_view"/> |
68 | <field name="name">Credit</field> |
69 | <field name="field">credit</field> |
70 | <field eval="12" name="sequence"/> |
71 | </record> |
72 | + |
73 | <record id="bank_col3" model="account.journal.column"> |
74 | <field name="view_id" ref="account_journal_bank_view"/> |
75 | <field name="name">Ref</field> |
76 | <field name="field">ref</field> |
77 | <field eval="2" name="sequence"/> |
78 | </record> |
79 | + |
80 | <record id="bank_col23" model="account.journal.column"> |
81 | <field name="view_id" ref="account_journal_bank_view"/> |
82 | <field name="name">State</field> |
83 | <field name="field">state</field> |
84 | <field eval="19" name="sequence"/> |
85 | </record> |
86 | + |
87 | <record id="bank_col20" model="account.journal.column"> |
88 | <field name="view_id" ref="account_journal_bank_view"/> |
89 | <field name="name">Reconcile</field> |
90 | @@ -136,10 +148,17 @@ |
91 | <field eval="20" name="sequence"/> |
92 | </record> |
93 | |
94 | + <record id="bank_col_21" model="account.journal.column"> |
95 | + <field name="view_id" ref="account_journal_bank_view"/> |
96 | + <field name="name">Currency Amt.</field> |
97 | + <field name="field">amount_currency</field> |
98 | + <field eval="9" name="sequence"/> |
99 | + </record> |
100 | |
101 | <record id="account_journal_bank_view_multi" model="account.journal.view"> |
102 | <field name="name">Bank/Cash Journal (Multi-Currency) View</field> |
103 | </record> |
104 | + |
105 | <record id="bank_col1_multi" model="account.journal.column"> |
106 | <field name="view_id" ref="account_journal_bank_view_multi"/> |
107 | <field name="name">Date</field> |
108 | @@ -147,6 +166,7 @@ |
109 | <field eval="True" name="required"/> |
110 | <field eval="3" name="sequence"/> |
111 | </record> |
112 | + |
113 | <record id="bank_col2_multi" model="account.journal.column"> |
114 | <field name="view_id" ref="account_journal_bank_view_multi"/> |
115 | <field name="name">Journal Entry</field> |
116 | @@ -154,6 +174,7 @@ |
117 | <field eval="False" name="required"/> |
118 | <field eval="1" name="sequence"/> |
119 | </record> |
120 | + |
121 | <record id="bank_col7_multi" model="account.journal.column"> |
122 | <field name="view_id" ref="account_journal_bank_view_multi"/> |
123 | <field name="name">Name</field> |
124 | @@ -161,18 +182,21 @@ |
125 | <field eval="7" name="sequence"/> |
126 | <field eval="True" name="required"/> |
127 | </record> |
128 | + |
129 | <record id="bank_col4_multi" model="account.journal.column"> |
130 | <field name="view_id" ref="account_journal_bank_view_multi"/> |
131 | <field name="name">Statement</field> |
132 | <field name="field">statement_id</field> |
133 | <field eval="4" name="sequence"/> |
134 | </record> |
135 | + |
136 | <record id="bank_col6_multi" model="account.journal.column"> |
137 | <field name="view_id" ref="account_journal_bank_view_multi"/> |
138 | <field name="name">Partner</field> |
139 | <field name="field">partner_id</field> |
140 | <field eval="5" name="sequence"/> |
141 | </record> |
142 | + |
143 | <record id="bank_col5_multi" model="account.journal.column"> |
144 | <field name="view_id" ref="account_journal_bank_view_multi"/> |
145 | <field name="name">Account</field> |
146 | @@ -180,42 +204,49 @@ |
147 | <field eval="True" name="required"/> |
148 | <field eval="6" name="sequence"/> |
149 | </record> |
150 | + |
151 | <record id="bank_col17_multi" model="account.journal.column"> |
152 | <field name="view_id" ref="account_journal_bank_view_multi"/> |
153 | <field name="name">Currency Amt.</field> |
154 | <field name="field">amount_currency</field> |
155 | <field eval="9" name="sequence"/> |
156 | </record> |
157 | + |
158 | <record id="bank_col18_multi" model="account.journal.column"> |
159 | <field name="view_id" ref="account_journal_bank_view_multi"/> |
160 | <field name="name">Currency</field> |
161 | <field name="field">currency_id</field> |
162 | <field eval="10" name="sequence"/> |
163 | </record> |
164 | + |
165 | <record id="bank_col9_multi" model="account.journal.column"> |
166 | <field name="view_id" ref="account_journal_bank_view_multi"/> |
167 | <field name="name">Debit</field> |
168 | <field name="field">debit</field> |
169 | <field eval="11" name="sequence"/> |
170 | </record> |
171 | + |
172 | <record id="bank_col10_multi" model="account.journal.column"> |
173 | <field name="view_id" ref="account_journal_bank_view_multi"/> |
174 | <field name="name">Credit</field> |
175 | <field name="field">credit</field> |
176 | <field eval="12" name="sequence"/> |
177 | </record> |
178 | + |
179 | <record id="bank_col3_multi" model="account.journal.column"> |
180 | <field name="view_id" ref="account_journal_bank_view_multi"/> |
181 | <field name="name">Ref</field> |
182 | <field name="field">ref</field> |
183 | <field eval="2" name="sequence"/> |
184 | </record> |
185 | + |
186 | <record id="bank_col23_multi" model="account.journal.column"> |
187 | <field name="view_id" ref="account_journal_bank_view_multi"/> |
188 | <field name="name">State</field> |
189 | <field name="field">state</field> |
190 | <field eval="19" name="sequence"/> |
191 | </record> |
192 | + |
193 | <record id="bank_col20_multi" model="account.journal.column"> |
194 | <field name="view_id" ref="account_journal_bank_view_multi"/> |
195 | <field name="name">Reconcile</field> |
196 | @@ -223,10 +254,10 @@ |
197 | <field eval="20" name="sequence"/> |
198 | </record> |
199 | |
200 | - |
201 | <record id="account_journal_view" model="account.journal.view"> |
202 | <field name="name">Journal View</field> |
203 | </record> |
204 | + |
205 | <record id="journal_col1" model="account.journal.column"> |
206 | <field name="view_id" ref="account_journal_view"/> |
207 | <field name="name">Date</field> |
208 | @@ -234,6 +265,7 @@ |
209 | <field eval="True" name="required"/> |
210 | <field eval="3" name="sequence"/> |
211 | </record> |
212 | + |
213 | <record id="journal_col2" model="account.journal.column"> |
214 | <field name="view_id" ref="account_journal_view"/> |
215 | <field name="name">Journal Entry</field> |
216 | @@ -241,18 +273,21 @@ |
217 | <field eval="False" name="required"/> |
218 | <field eval="1" name="sequence"/> |
219 | </record> |
220 | + |
221 | <record id="journal_col3" model="account.journal.column"> |
222 | <field name="view_id" ref="account_journal_view"/> |
223 | <field name="name">Ref</field> |
224 | <field name="field">ref</field> |
225 | <field eval="2" name="sequence"/> |
226 | </record> |
227 | + |
228 | <record id="journal_col5" model="account.journal.column"> |
229 | <field name="view_id" ref="account_journal_view"/> |
230 | <field name="name">Partner</field> |
231 | <field name="field">partner_id</field> |
232 | <field eval="5" name="sequence"/> |
233 | </record> |
234 | + |
235 | <record id="journal_col4" model="account.journal.column"> |
236 | <field name="view_id" ref="account_journal_view"/> |
237 | <field name="name">Account</field> |
238 | @@ -260,6 +295,7 @@ |
239 | <field eval="True" name="required"/> |
240 | <field eval="6" name="sequence"/> |
241 | </record> |
242 | + |
243 | <record id="journal_col6" model="account.journal.column"> |
244 | <field name="view_id" ref="account_journal_view"/> |
245 | <field name="name">Name</field> |
246 | @@ -267,24 +303,28 @@ |
247 | <field eval="7" name="sequence"/> |
248 | <field eval="True" name="required"/> |
249 | </record> |
250 | + |
251 | <record id="journal_col8" model="account.journal.column"> |
252 | <field name="view_id" ref="account_journal_view"/> |
253 | <field name="name">Debit</field> |
254 | <field name="field">debit</field> |
255 | <field eval="11" name="sequence"/> |
256 | </record> |
257 | + |
258 | <record id="journal_col9" model="account.journal.column"> |
259 | <field name="view_id" ref="account_journal_view"/> |
260 | <field name="name">Credit</field> |
261 | <field name="field">credit</field> |
262 | <field eval="12" name="sequence"/> |
263 | </record> |
264 | + |
265 | <record id="journal_col11" model="account.journal.column"> |
266 | <field name="view_id" ref="account_journal_view"/> |
267 | <field name="name">Analytic Account</field> |
268 | <field name="field">analytic_account_id</field> |
269 | <field eval="14" name="sequence"/> |
270 | </record> |
271 | + |
272 | <record id="journal_col24" model="account.journal.column"> |
273 | <field name="view_id" ref="account_journal_view"/> |
274 | <field name="name">State</field> |
275 | @@ -292,10 +332,17 @@ |
276 | <field eval="19" name="sequence"/> |
277 | </record> |
278 | |
279 | + <record id="journal_col21" model="account.journal.column"> |
280 | + <field name="view_id" ref="account_journal_view"/> |
281 | + <field name="name">Currency Amt.</field> |
282 | + <field name="field">amount_currency</field> |
283 | + <field eval="9" name="sequence"/> |
284 | + </record> |
285 | |
286 | <record id="account_sp_journal_view" model="account.journal.view"> |
287 | <field name="name">Sale/Purchase Journal View</field> |
288 | </record> |
289 | + |
290 | <record id="sp_journal_col1" model="account.journal.column"> |
291 | <field name="view_id" ref="account_sp_journal_view"/> |
292 | <field name="name">Date</field> |
293 | @@ -303,6 +350,7 @@ |
294 | <field eval="True" name="required"/> |
295 | <field eval="3" name="sequence"/> |
296 | </record> |
297 | + |
298 | <record id="sp_journal_col2" model="account.journal.column"> |
299 | <field name="view_id" ref="account_sp_journal_view"/> |
300 | <field name="name">Journal Entry</field> |
301 | @@ -310,12 +358,14 @@ |
302 | <field eval="False" name="required"/> |
303 | <field eval="1" name="sequence"/> |
304 | </record> |
305 | + |
306 | <record id="sp_journal_col3" model="account.journal.column"> |
307 | <field name="view_id" ref="account_sp_journal_view"/> |
308 | <field name="name">Ref</field> |
309 | <field name="field">ref</field> |
310 | <field eval="2" name="sequence"/> |
311 | </record> |
312 | + |
313 | <record id="sp_journal_col4" model="account.journal.column"> |
314 | <field name="view_id" ref="account_sp_journal_view"/> |
315 | <field name="name">Account</field> |
316 | @@ -323,12 +373,14 @@ |
317 | <field eval="True" name="required"/> |
318 | <field eval="6" name="sequence"/> |
319 | </record> |
320 | + |
321 | <record id="sp_journal_col5" model="account.journal.column"> |
322 | <field name="view_id" ref="account_sp_journal_view"/> |
323 | <field name="name">Partner</field> |
324 | <field name="field">partner_id</field> |
325 | <field eval="5" name="sequence"/> |
326 | </record> |
327 | + |
328 | <record id="sp_journal_col6" model="account.journal.column"> |
329 | <field name="view_id" ref="account_sp_journal_view"/> |
330 | <field name="name">Name</field> |
331 | @@ -336,42 +388,49 @@ |
332 | <field eval="7" name="sequence"/> |
333 | <field eval="True" name="required"/> |
334 | </record> |
335 | + |
336 | <record id="sp_journal_col7" model="account.journal.column"> |
337 | <field name="view_id" ref="account_sp_journal_view"/> |
338 | <field name="name">Due Date</field> |
339 | <field name="field">date_maturity</field> |
340 | <field eval="8" name="sequence"/> |
341 | </record> |
342 | + |
343 | <record id="sp_journal_col8" model="account.journal.column"> |
344 | <field name="view_id" ref="account_sp_journal_view"/> |
345 | <field name="name">Debit</field> |
346 | <field name="field">debit</field> |
347 | <field eval="11" name="sequence"/> |
348 | </record> |
349 | + |
350 | <record id="sp_journal_col9" model="account.journal.column"> |
351 | <field name="view_id" ref="account_sp_journal_view"/> |
352 | <field name="name">Credit</field> |
353 | <field name="field">credit</field> |
354 | <field eval="12" name="sequence"/> |
355 | </record> |
356 | + |
357 | <record id="sp_journal_col10" model="account.journal.column"> |
358 | <field name="view_id" ref="account_sp_journal_view"/> |
359 | <field name="name">Tax</field> |
360 | <field name="field">account_tax_id</field> |
361 | <field eval="13" name="sequence"/> |
362 | </record> |
363 | + |
364 | <record id="sp_journal_col11" model="account.journal.column"> |
365 | <field name="view_id" ref="account_sp_journal_view"/> |
366 | <field name="name">Analytic Account</field> |
367 | <field name="field">analytic_account_id</field> |
368 | <field eval="14" name="sequence"/> |
369 | </record> |
370 | + |
371 | <record id="sp_journal_col24" model="account.journal.column"> |
372 | <field name="view_id" ref="account_sp_journal_view"/> |
373 | <field name="name">State</field> |
374 | <field name="field">state</field> |
375 | <field eval="19" name="sequence"/> |
376 | </record> |
377 | + |
378 | <record id="sp_journal_col20" model="account.journal.column"> |
379 | <field name="view_id" ref="account_sp_journal_view"/> |
380 | <field name="name">Reconcile</field> |
381 | @@ -379,9 +438,17 @@ |
382 | <field eval="20" name="sequence"/> |
383 | </record> |
384 | |
385 | + <record id="sp_journal_col21" model="account.journal.column"> |
386 | + <field name="view_id" ref="account_sp_journal_view"/> |
387 | + <field name="name">Currency Amt.</field> |
388 | + <field name="field">amount_currency</field> |
389 | + <field eval="9" name="sequence"/> |
390 | + </record> |
391 | + |
392 | <record id="account_sp_refund_journal_view" model="account.journal.view"> |
393 | <field name="name">Sale/Purchase Refund Journal View</field> |
394 | </record> |
395 | + |
396 | <record id="sp_refund_journal_col1" model="account.journal.column"> |
397 | <field name="view_id" ref="account_sp_refund_journal_view"/> |
398 | <field name="name">Date</field> |
399 | @@ -389,6 +456,7 @@ |
400 | <field eval="True" name="required"/> |
401 | <field eval="3" name="sequence"/> |
402 | </record> |
403 | + |
404 | <record id="sp_refund_journal_col2" model="account.journal.column"> |
405 | <field name="view_id" ref="account_sp_refund_journal_view"/> |
406 | <field name="name">Journal Entry</field> |
407 | @@ -396,12 +464,14 @@ |
408 | <field eval="False" name="required"/> |
409 | <field eval="1" name="sequence"/> |
410 | </record> |
411 | + |
412 | <record id="sp_refund_journal_col3" model="account.journal.column"> |
413 | <field name="view_id" ref="account_sp_refund_journal_view"/> |
414 | <field name="name">Ref</field> |
415 | <field name="field">ref</field> |
416 | <field eval="2" name="sequence"/> |
417 | </record> |
418 | + |
419 | <record id="sp_refund_journal_col4" model="account.journal.column"> |
420 | <field name="view_id" ref="account_sp_refund_journal_view"/> |
421 | <field name="name">Account</field> |
422 | @@ -409,12 +479,14 @@ |
423 | <field eval="True" name="required"/> |
424 | <field eval="6" name="sequence"/> |
425 | </record> |
426 | + |
427 | <record id="sp_refund_journal_col5" model="account.journal.column"> |
428 | <field name="view_id" ref="account_sp_refund_journal_view"/> |
429 | <field name="name">Partner</field> |
430 | <field name="field">partner_id</field> |
431 | <field eval="5" name="sequence"/> |
432 | </record> |
433 | + |
434 | <record id="sp_refund_journal_col6" model="account.journal.column"> |
435 | <field name="view_id" ref="account_sp_refund_journal_view"/> |
436 | <field name="name">Name</field> |
437 | @@ -422,42 +494,49 @@ |
438 | <field eval="7" name="sequence"/> |
439 | <field eval="True" name="required"/> |
440 | </record> |
441 | + |
442 | <record id="sp_refund_journal_col7" model="account.journal.column"> |
443 | <field name="view_id" ref="account_sp_refund_journal_view"/> |
444 | <field name="name">Due Date</field> |
445 | <field name="field">date_maturity</field> |
446 | <field eval="8" name="sequence"/> |
447 | </record> |
448 | + |
449 | <record id="sp_refund_journal_col8" model="account.journal.column"> |
450 | <field name="view_id" ref="account_sp_refund_journal_view"/> |
451 | <field name="name">Debit</field> |
452 | <field name="field">debit</field> |
453 | <field eval="11" name="sequence"/> |
454 | </record> |
455 | + |
456 | <record id="sp_refund_journal_col9" model="account.journal.column"> |
457 | <field name="view_id" ref="account_sp_refund_journal_view"/> |
458 | <field name="name">Credit</field> |
459 | <field name="field">credit</field> |
460 | <field eval="12" name="sequence"/> |
461 | </record> |
462 | + |
463 | <record id="sp_refund_journal_col10" model="account.journal.column"> |
464 | <field name="view_id" ref="account_sp_refund_journal_view"/> |
465 | <field name="name">Tax</field> |
466 | <field name="field">account_tax_id</field> |
467 | <field eval="13" name="sequence"/> |
468 | </record> |
469 | + |
470 | <record id="sp_refund_journal_col11" model="account.journal.column"> |
471 | <field name="view_id" ref="account_sp_refund_journal_view"/> |
472 | <field name="name">Analytic Account</field> |
473 | <field name="field">analytic_account_id</field> |
474 | <field eval="14" name="sequence"/> |
475 | </record> |
476 | + |
477 | <record id="sp_refund_journal_col24" model="account.journal.column"> |
478 | <field name="view_id" ref="account_sp_refund_journal_view"/> |
479 | <field name="name">State</field> |
480 | <field name="field">state</field> |
481 | <field eval="19" name="sequence"/> |
482 | </record> |
483 | + |
484 | <record id="sp_refund_journal_col20" model="account.journal.column"> |
485 | <field name="view_id" ref="account_sp_refund_journal_view"/> |
486 | <field name="name">Reconcile</field> |
487 | @@ -465,6 +544,13 @@ |
488 | <field eval="20" name="sequence"/> |
489 | </record> |
490 | |
491 | + <record id="sp_refund_journal_col21" model="account.journal.column"> |
492 | + <field name="view_id" ref="account_sp_refund_journal_view"/> |
493 | + <field name="name">Currency Amt.</field> |
494 | + <field name="field">amount_currency</field> |
495 | + <field eval="9" name="sequence"/> |
496 | + </record> |
497 | + |
498 | <!-- |
499 | Account Journal Sequences |
500 | --> |
501 | @@ -555,8 +641,8 @@ |
502 | <field eval="1" name="number_increment"/> |
503 | </record> |
504 | |
505 | - <!-- |
506 | - Sequence for analytic account |
507 | + <!-- |
508 | + Sequence for analytic account |
509 | --> |
510 | <record id="seq_type_analytic_account" model="ir.sequence.type"> |
511 | <field name="name">Analytic account</field> |
I have replied on bug, we consider bug as wishlist for now.
Thanks for your work,
Mustufa