Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-856128-psi into lp:openobject-addons

  1. trunk-bug-856128-psi
  2. Merge into trunk
Proposed by Purnendu Singh (OpenERP)
Status: Merged
Merged at revision: 5140
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-856128-psi
Merge into: lp:openobject-addons
Diff against target: 100 lines (+13/-13)
3 files modified
account/report/account_balance_sheet.rml (+8/-8)
account/report/account_balance_sheet_horizontal.rml (+2/-2)
account/report/account_profit_loss.rml (+3/-3)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-856128-psi
Reviewer Review Type Date Requested Status
Mustufa Rangwala (Open ERP) (community) Approve
qdp (OpenERP) Pending
Review via email: mp+76526@code.launchpad.net

Description of the change

Hello,

Fixes:
      https://bugs.launchpad.net/openobject-addons/+bug/856128
            -- Profit and Loss and Balance Sheet Report Problem

Thanks,
Purnendu Singh

To post a comment you must log in.
Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) :
review: Approve
Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) wrote :

Thanks for quick fix,
Mustufa

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/report/account_balance_sheet.rml'
2--- account/report/account_balance_sheet.rml 2011-09-21 23:46:12 +0000
3+++ account/report/account_balance_sheet.rml 2011-09-22 09:01:29 +0000
4@@ -236,12 +236,12 @@
5 </td>
6 </tr>
7 <tr style="Table3">
8- [[ repeatIn(get_lines_another('asset'),'a' ) ]]
9+ [[ repeatIn(get_lines_another('asset'),'a' ) ]]
10 [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]
11 <td><para style="terp_level_3_code">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_code'}) ]]<i>[[ a['code'] ]]</i></para></td>
12 <td><para style="terp_level_3_name">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a['level']))+'_name'}) ]][[ a['name'] ]]</para></td>
13- <td>[[ (a['level'] &lt;&gt;2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance'], currency = company.currency_id) ]]</para></td>
14- <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance'], currency = company.currency_id) ]]</u></para></td>
15+ <td>[[ (a['level'] &lt;&gt;2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</para></td>
16+ <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</u></para></td>
17 </tr>
18 </blockTable>
19 <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
20@@ -250,7 +250,7 @@
21 <para style="terp_default_Bold_9">Balance:</para>
22 </td>
23 <td>
24- <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency = company.currency_id) ]]</u></para>
25+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency_obj = company.currency_id) ]]</u></para>
26 </td>
27 </tr>
28 </blockTable>
29@@ -278,12 +278,12 @@
30 </td>
31 </tr>
32 <tr style="Table3">
33- [[ repeatIn(get_lines_another('liability'),'a' ) ]]
34+ [[ repeatIn(get_lines_another('liability'),'a' ) ]]
35 [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]
36 <td><para style="terp_level_3_code">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_code'}) ]]<i>[[ a['code'] ]]</i></para></td>
37 <td><para style="terp_level_3_name">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a['level']))+'_name'}) ]][[ a['name'] ]]</para></td>
38- <td>[[ (a['level'] &lt;&gt;2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance'], currency = company.currency_id) ]]</para></td>
39- <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance'], currency = company.currency_id) ]]</u></para></td>
40+ <td>[[ (a['level'] &lt;&gt;2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a['type'] =='view' and a['level'] &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</para></td>
41+ <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance'], currency_obj = company.currency_id) ]]</u></para></td>
42 </tr>
43 </blockTable>
44 <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
45@@ -292,7 +292,7 @@
46 <para style="terp_default_Bold_9">Balance:</para>
47 </td>
48 <td>
49- <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency = company.currency_id) ]]</u></para>
50+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency_obj = company.currency_id) ]]</u></para>
51 </td>
52 </tr>
53 </blockTable>
54
55=== modified file 'account/report/account_balance_sheet_horizontal.rml'
56--- account/report/account_balance_sheet_horizontal.rml 2011-09-21 23:46:12 +0000
57+++ account/report/account_balance_sheet_horizontal.rml 2011-09-22 09:01:29 +0000
58@@ -235,13 +235,13 @@
59 <para style="terp_default_Bold_9">Balance:</para>
60 </td>
61 <td>
62- <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency_obj=company.currency_id) ) ]]</u></para>
63+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency_obj=company.currency_id) ]]</u></para>
64 </td>
65 <td>
66 <para style="terp_default_Bold_9">Balance:</para>
67 </td>
68 <td>
69- <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency_obj=company.currency_id) ) ]]</u></para>
70+ <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency_obj=company.currency_id) ]]</u></para>
71 </td>
72 </tr>
73 </blockTable>
74
75=== modified file 'account/report/account_profit_loss.rml'
76--- account/report/account_profit_loss.rml 2011-09-22 00:21:13 +0000
77+++ account/report/account_profit_loss.rml 2011-09-22 09:01:29 +0000
78@@ -224,11 +224,11 @@
79 </td>
80 </tr>
81 <tr style="Table3">
82- [[ repeatIn(get_lines_another('expense'),'a' ) ]]
83+ [[ repeatIn(get_lines_another('expense'),'a' ) ]]
84 [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]
85 <td><para style="terp_level_3_code">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]]<i>[[ a.code ]]</i></para></td>
86 <td><para style="terp_level_3_name">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]]</para></td>
87- <td>[[ (a.level &lt;&gt;2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id.symbol)</para></td>
88+ <td>[[ (a.level &lt;&gt;2) or removeParentNode('td') ]]<para style="terp_level_3_balance">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]]</para></td>
89 <td>[[ a.level == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a.balance * a.user_type.sign, currency_obj=company.currency_id) ]]</u></para></td>
90 </tr>
91 </blockTable>
92@@ -273,7 +273,7 @@
93 </td>
94 </tr>
95 <tr style="Table3">
96- [[ repeatIn(get_lines_another('income'),'a' ) ]]
97+ [[ repeatIn(get_lines_another('income'),'a' ) ]]
98 [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]
99 <td><para style="terp_level_3_code">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]]<i>[[ a.code ]]</i></para></td>
100 <td><para style="terp_level_3_name">[[ (a.type =='view' and a.level &gt;= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]]</para></td>

Subscribers

People subscribed via source and target branches

to all changes: