From 998c0f641f180c0eed66bbb555b93bbda078fc3c Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 27 May 2011 13:02:56 +0530
Subject: [PATCH] [IMP] hr_payroll: contribution report improvemnt as specified
 in need fixing

bzr revid: psi@tinyerp.co.in-20110527073256-d6v6voa6ssw9fykg
---
 addons/hr_payroll/hr_payroll.py                            | 4 ++--
 addons/hr_payroll/report/report_contribution_register.py   | 2 --
 addons/hr_payroll/report/report_contribution_register.rml  | 4 ++--
 .../wizard/hr_payroll_cotribution_register_report.py       | 7 +++----
 .../wizard/hr_payroll_cotribution_register_report.xml      | 2 +-
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 93a5d88d861..d4d824d3d81 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -309,7 +309,7 @@ class hr_payslip(osv.osv):
 
     def hr_verify_sheet(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'verify'}, context=context)
-    
+
     def refund_sheet(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         wf_service = netsvc.LocalService("workflow")
@@ -759,7 +759,7 @@ class hr_salary_rule(osv.osv):
         'amount_python_compute':fields.text('Python Code'),
         'amount_percentage_base':fields.char('Percentage based on',size=1024, required=False, readonly=False, help='result will be affected to a variable'),
         'child_ids':fields.one2many('hr.salary.rule', 'parent_rule_id', 'Child Salary Rule'),
-        'register_id':fields.many2one('hr.contribution.register', 'Contribution Register', help="Contribution register based on company", required=False),
+        'register_id':fields.many2one('hr.contribution.register', 'Contribution Register', help="Contribution register based on company"),
         'input_ids': fields.one2many('hr.rule.input', 'input_id', 'Inputs'),
         'note':fields.text('Description'),
      }
diff --git a/addons/hr_payroll/report/report_contribution_register.py b/addons/hr_payroll/report/report_contribution_register.py
index ede2f8f87d9..585495e7d52 100644
--- a/addons/hr_payroll/report/report_contribution_register.py
+++ b/addons/hr_payroll/report/report_contribution_register.py
@@ -27,7 +27,6 @@ from datetime import datetime
 from dateutil import relativedelta
 
 from report import report_sxw
-from tools.safe_eval import safe_eval as eval
 
 class contribution_register_report(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
@@ -48,7 +47,6 @@ class contribution_register_report(report_sxw.rml_parse):
     def _get_payslip_lines(self, obj):
         payslip_obj = self.pool.get('hr.payslip')
         payslip_line = self.pool.get('hr.payslip.line')
-        localdict = {}
         res = []
         result = {}
         self.regi_total = 0.0
diff --git a/addons/hr_payroll/report/report_contribution_register.rml b/addons/hr_payroll/report/report_contribution_register.rml
index a903208d55d..5ccbc0dd30a 100644
--- a/addons/hr_payroll/report/report_contribution_register.rml
+++ b/addons/hr_payroll/report/report_contribution_register.rml
@@ -81,7 +81,7 @@
     <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
     <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
     <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P15" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT"/>
     <paraStyle name="P16" fontName="Helvetica" fontSize="2.0" leading="3"/>
@@ -209,7 +209,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="465.0,74.0" style="Table5">
+    <blockTable colWidths="479.0,60.0" style="Table5">
       <tr>
         <td>
           <para style="P13">Total:</para>
diff --git a/addons/hr_payroll/wizard/hr_payroll_cotribution_register_report.py b/addons/hr_payroll/wizard/hr_payroll_cotribution_register_report.py
index f429dd61618..14860cdc753 100644
--- a/addons/hr_payroll/wizard/hr_payroll_cotribution_register_report.py
+++ b/addons/hr_payroll/wizard/hr_payroll_cotribution_register_report.py
@@ -39,17 +39,16 @@ class payslip_lines_contribution_register(osv.osv_memory):
     }
 
     def print_report(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [], context=context)[0]
         datas = {
              'ids': context.get('active_ids', []),
              'model': 'hr.contribution.register',
-             'form': data
-            }
+             'form': self.read(cr, uid, ids, [], context=context)[0]
+        }
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'contribution.register.lines',
             'datas': datas,
-            }
+        }
 
 payslip_lines_contribution_register()
 
diff --git a/addons/hr_payroll/wizard/hr_payroll_cotribution_register_report.xml b/addons/hr_payroll/wizard/hr_payroll_cotribution_register_report.xml
index 9b5710a5efa..cb787cf536e 100644
--- a/addons/hr_payroll/wizard/hr_payroll_cotribution_register_report.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_cotribution_register_report.xml
@@ -31,7 +31,7 @@
             <field name="target">new</field>
         </record>
 
-        <record model="ir.values" id="hr_holidays_summary_employee_value">
+        <record model="ir.values" id="payslip_lines_contribution_register_value">
             <field name="model_id" ref="model_hr_contribution_register" />
             <field name="object" eval="1" />
             <field name="name">PaySlip Lines</field>