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
=== modified file 'account/report/account_balance_sheet.rml'
--- account/report/account_balance_sheet.rml 2011-09-21 23:46:12 +0000
+++ account/report/account_balance_sheet.rml 2011-09-22 09:01:29 +0000
@@ -236,12 +236,12 @@
236 </td>236 </td>
237 </tr>237 </tr>
238 <tr style="Table3">238 <tr style="Table3">
239 [[ repeatIn(get_lines_another('asset'),'a' ) ]] 239 [[ repeatIn(get_lines_another('asset'),'a' ) ]]
240 [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]240 [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]
241 <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>241 <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>
242 <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>242 <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>
243 <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>243 <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>
244 <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance'], currency = company.currency_id) ]]</u></para></td>244 <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>
245 </tr>245 </tr>
246 </blockTable>246 </blockTable>
247 <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">247 <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
@@ -250,7 +250,7 @@
250 <para style="terp_default_Bold_9">Balance:</para>250 <para style="terp_default_Bold_9">Balance:</para>
251 </td>251 </td>
252 <td>252 <td>
253 <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency = company.currency_id) ]]</u></para>253 <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency_obj = company.currency_id) ]]</u></para>
254 </td>254 </td>
255 </tr>255 </tr>
256 </blockTable>256 </blockTable>
@@ -278,12 +278,12 @@
278 </td>278 </td>
279 </tr>279 </tr>
280 <tr style="Table3">280 <tr style="Table3">
281 [[ repeatIn(get_lines_another('liability'),'a' ) ]] 281 [[ repeatIn(get_lines_another('liability'),'a' ) ]]
282 [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]282 [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]]
283 <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>283 <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>
284 <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>284 <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>
285 <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>285 <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>
286 <td>[[ a['level'] == 2 or removeParentNode('td') ]]<para style="terp_level_2_balance"><u>[[ formatLang(a['balance'], currency = company.currency_id) ]]</u></para></td>286 <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>
287 </tr>287 </tr>
288 </blockTable>288 </blockTable>
289 <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">289 <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
@@ -292,7 +292,7 @@
292 <para style="terp_default_Bold_9">Balance:</para>292 <para style="terp_default_Bold_9">Balance:</para>
293 </td>293 </td>
294 <td>294 <td>
295 <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency = company.currency_id) ]]</u></para>295 <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency_obj = company.currency_id) ]]</u></para>
296 </td>296 </td>
297 </tr>297 </tr>
298 </blockTable>298 </blockTable>
299299
=== modified file 'account/report/account_balance_sheet_horizontal.rml'
--- account/report/account_balance_sheet_horizontal.rml 2011-09-21 23:46:12 +0000
+++ account/report/account_balance_sheet_horizontal.rml 2011-09-22 09:01:29 +0000
@@ -235,13 +235,13 @@
235 <para style="terp_default_Bold_9">Balance:</para>235 <para style="terp_default_Bold_9">Balance:</para>
236 </td>236 </td>
237 <td>237 <td>
238 <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency_obj=company.currency_id) ) ]]</u></para>238 <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr(), currency_obj=company.currency_id) ]]</u></para>
239 </td>239 </td>
240 <td>240 <td>
241 <para style="terp_default_Bold_9">Balance:</para>241 <para style="terp_default_Bold_9">Balance:</para>
242 </td>242 </td>
243 <td>243 <td>
244 <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency_obj=company.currency_id) ) ]]</u></para>244 <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr(), currency_obj=company.currency_id) ]]</u></para>
245 </td>245 </td>
246 </tr>246 </tr>
247 </blockTable>247 </blockTable>
248248
=== modified file 'account/report/account_profit_loss.rml'
--- account/report/account_profit_loss.rml 2011-09-22 00:21:13 +0000
+++ account/report/account_profit_loss.rml 2011-09-22 09:01:29 +0000
@@ -224,11 +224,11 @@
224 </td>224 </td>
225 </tr>225 </tr>
226 <tr style="Table3">226 <tr style="Table3">
227 [[ repeatIn(get_lines_another('expense'),'a' ) ]] 227 [[ repeatIn(get_lines_another('expense'),'a' ) ]]
228 [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]228 [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]
229 <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>229 <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>
230 <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>230 <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>
231 <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>231 <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>
232 <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>232 <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>
233 </tr>233 </tr>
234 </blockTable>234 </blockTable>
@@ -273,7 +273,7 @@
273 </td>273 </td>
274 </tr>274 </tr>
275 <tr style="Table3">275 <tr style="Table3">
276 [[ repeatIn(get_lines_another('income'),'a' ) ]] 276 [[ repeatIn(get_lines_another('income'),'a' ) ]]
277 [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]277 [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]]
278 <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>278 <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>
279 <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>279 <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: