Merge lp:~openerp-dev/openobject-addons/7.0-bug-594205-dhs into lp:openobject-addons/7.0

Proposed by Dhruti Shastri(OpenERP) on 2013-08-22
Status: Approved
Approved by: Naresh(OpenERP) on 2013-08-23
Approved revision: 9376
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-bug-594205-dhs
Merge into: lp:openobject-addons/7.0
Diff against target: 32 lines (+5/-4)
2 files modified
account/report/account_aged_partner_balance.rml (+2/-1)
account/report/account_balance.rml (+3/-3)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-bug-594205-dhs
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) 2013-08-22 Approve on 2013-08-23
Review via email: mp+181530@code.launchpad.net
To post a comment you must log in.
review: Approve

Unmerged revisions

9376. By Dhruti Shastri(OpenERP) on 2013-08-22

[FIX][Account] : Translation missing for Account Reports

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/report/account_aged_partner_balance.rml'
2--- account/report/account_aged_partner_balance.rml 2013-06-14 21:36:02 +0000
3+++ account/report/account_aged_partner_balance.rml 2013-08-22 11:16:36 +0000
4@@ -152,7 +152,8 @@
5 <para style="terp_default_Centre_8">Receivable and Payable Accounts[[ data['form']['result_selection'] == 'customer_supplier' or removeParentNode('para') ]]</para>
6 </td>
7 <td>
8- <para style="terp_default_Centre_8">[[ data['form']['direction_selection'] ]]</para>
9+ <para style="terp_default_Centre_8">Past[[ data['form']['direction_selection']== 'past' and ' ' or removeParentNode('para') ]]</para>
10+ <para style="terp_default_Centre_8">Future[[ data['form']['direction_selection']== 'future' and ' ' or removeParentNode('para') ]]</para>
11 </td>
12 <td>
13 <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
14
15=== modified file 'account/report/account_aged_partner_balance.sxw'
16Binary files account/report/account_aged_partner_balance.sxw 2013-06-14 21:36:02 +0000 and account/report/account_aged_partner_balance.sxw 2013-08-22 11:16:36 +0000 differ
17=== modified file 'account/report/account_balance.rml'
18--- account/report/account_balance.rml 2013-06-14 21:36:02 +0000
19+++ account/report/account_balance.rml 2013-08-22 11:16:36 +0000
20@@ -236,9 +236,9 @@
21 <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
22 </td>
23 <td>
24- <para style="terp_default_Centre_7">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para>
25- <para style="terp_default_Centre_7">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para>
26- <para style="terp_default_Centre_7">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para>
27+ <para style="terp_default_Centre_8">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para>
28+ <para style="terp_default_Centre_8">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para>
29+ <para style="terp_default_Centre_8">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para>
30 </td>
31 <td> <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
32 <blockTable colWidths="60.0,60.0" style="Table5">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]