[MERGE] payroll: report cleaning

bzr revid: qdp-launchpad@openerp.com-20110710013710-efrp7hsz1hfp87ux

addons/hr_payroll/report/report_contribution_register.py

@@ -54,6 +54,7 @@ class contribution_register_report(report_sxw.rml_parse):
                         "LEFT JOIN hr_payslip AS hp on (pl.slip_id = hp.id) "\
                         "WHERE (hp.date_from >= %s) AND (hp.date_to <= %s) "\
                         "AND pl.register_id = %s "\
+                        "AND hp.state = 'done' "\
                         "ORDER BY pl.slip_id, pl.sequence",
                         (self.date_from, self.date_to, obj.id))
         payslip_lines = [x[0] for x in self.cr.fetchall()]

addons/hr_payroll/report/report_contribution_register.rml

@@ -222,7 +222,7 @@
           <para style="P15">Total:</para>
         </td>
         <td>
-          <para style="P11">[[ formatLang(abs(sum_total())) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
+          <para style="P11">[[ formatLang(sum_total()) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
         </td>
       </tr>
     </blockTable>