openerp-dev-web team mailing list archive

["pso \(Open ERP\)" <pso@xxxxxxxxxxx>]

pso (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-722832-pso into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #722832 in OpenERP Addons: "Balance Sheet Report - Overall balance calculation error"
  https://bugs.launchpad.net/openobject-addons/+bug/722832

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-722832-pso/+merge/56115

Fixed bug: 722832 (https://bugs.launchpad.net/openobject-addons/+bug/722832/)
Improved overall balance calculation and Liabilities side view type accounts font formation.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-722832-pso/+merge/56115
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-722832-pso.

=== modified file 'account/report/account_balance_sheet.py'
--- account/report/account_balance_sheet.py	2011-03-15 11:26:45 +0000
+++ account/report/account_balance_sheet.py	2011-04-04 09:34:27 +0000
@@ -74,7 +74,7 @@
 
     def sum_cr(self):
         if self.res_bl['type'] == _('Net Loss'):
-            self.result_sum_cr += self.res_bl['balance']
+            self.result_sum_dr += self.res_bl['balance']
         return self.result_sum_cr
 
     def get_pl_balance(self):
@@ -151,7 +151,7 @@
                             accounts_temp.append(account_dict)
                     else:
                         accounts_temp.append(account_dict)
-                    if account.id == data['form']['reserve_account_id']:
+                    if account.id == data['form']['reserve_account_id'][0]:
                         pl_dict['level'] = account['level'] + 1
                         accounts_temp.append(pl_dict)
 

=== modified file 'account/report/account_balance_sheet.rml'
--- account/report/account_balance_sheet.rml	2011-01-14 00:11:01 +0000
+++ account/report/account_balance_sheet.rml	2011-04-04 09:34:27 +0000
@@ -253,13 +253,13 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
-        </td>
-        <td>
-          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font></para>
+          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ (a['level']&lt;4 or a['name']=='Net Profit' or a['name']=='Net Loss') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font></para>
+        </td>
+        <td>
+          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ (a['level']&lt;4 or a['name']=='Net Profit' or a['name']=='Net Loss') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9"><font>[[ (a['level']&lt;4 or a['name']=='Net Profit' or a['name']=='Net Loss') and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
         </td>
       </tr>
     </blockTable>

=== modified file 'account/report/account_balance_sheet_horizontal.rml'
--- account/report/account_balance_sheet_horizontal.rml	2011-01-14 00:11:01 +0000
+++ account/report/account_balance_sheet_horizontal.rml	2011-04-04 09:34:27 +0000
@@ -196,7 +196,7 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code1'] ]]</font></para>
+          <para style="terp_default_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code1'] ]]</font></para>
         </td>
         <td>
           <para style="terp_default_9"><font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name1'] ]]</font></para>
@@ -205,14 +205,13 @@
           <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
-        </td>
-        <td>
-          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font>
-<font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font>
+          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ (a['level']&lt;4 or a['name']=='Net Profit' or a['name']=='Net Loss') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code'] ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ (a['level']&lt;4 or a['name']=='Net Profit' or a['name']=='Net Loss') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font></para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9"><font>[[ (a['level']&lt;4 or a['name']=='Net Profit' or a['name']=='Net Loss') and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font>
 <font> [[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
         </td>
      </tr>