openobject-italia-core-devs team mailing list archive

[michele <michelemilidoni@xxxxxxxxx>]

michele has proposed merging lp:~michelemilidoni/openobject-italia/openobject-italia into lp:openobject-italia/7.0.

Requested reviews:
  OpenERP Italia core devs (openobject-italia-core-devs)

For more details, see:
https://code.launchpad.net/~michelemilidoni/openobject-italia/openobject-italia/+merge/200224

Ho fixato un bug nel report. Il saldo (balance) corrente non veniva incrementato del saldo precedente.
-- 
https://code.launchpad.net/~michelemilidoni/openobject-italia/openobject-italia/+merge/200224
Your team OpenERP Italia core devs is requested to review the proposed merge of lp:~michelemilidoni/openobject-italia/openobject-italia into lp:openobject-italia/7.0.

=== modified file 'l10n_it_prima_nota_cassa/report/prima_nota_cassa.mako'
--- l10n_it_prima_nota_cassa/report/prima_nota_cassa.mako	2013-02-12 14:30:53 +0000
+++ l10n_it_prima_nota_cassa/report/prima_nota_cassa.mako	2013-12-31 12:47:11 +0000
@@ -16,7 +16,7 @@
                 <td>${ _("Target Moves") }</td>
             </tr>
             <tr>
-                
+
                 <td>${ get_account(data) or '' }</td>
                 <td>${ get_fiscalyear(data) or '' }</td>
                 <td>${ ', '.join([ lt or '' for lt in get_journal(data)]) }</td>
@@ -42,17 +42,19 @@
                         <th> ${ _('Balance') }</th>
                     </tr>
 
-               
+                    <% amount = 0 %>
+
                     %for line in lines(a) :
+                        <% amount += line['debit'] - line['credit'] %>
                         <tr style="page-break-inside: avoid; vertical-align:text-top;">
                             <td>${ formatLang(line['ldate'], date=True) or ''|entity }</td>
                             <td>${ line['jname']  or ''|entity }</td>
                             <td>${ line['partner_name']  or ''|entity }</td>
                             <td>${ line['move']  or ''|entity }</td>
                             <td>${ line['lname']  or ''|entity }</td>
-                            <td>${ formatLang(line['debit'], digits=get_digits(dp='Account')) |entity}</td>
+                           <td>${ formatLang(line['debit'], digits=get_digits(dp='Account')) |entity}</td>
                             <td>${ formatLang(line['credit'], digits=get_digits(dp='Account')) |entity}</td>
-                            <td>${ line['debit'] - line['credit'] |entity}</td>
+                            <td>${ formatLang(amount, digits=get_digits(dp='Account')) |entity}</td>
                         </tr>
                     %endfor
                 </table>
@@ -61,3 +63,4 @@
         </div>
     </body>
 </html>
+