From 4f27ec3e8ffde2dea4e71352cb983499d053dab5 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Wed, 30 Mar 2011 11:00:55 +0530
Subject: [PATCH] [IMP] hr_payroll: again committing changes which got reverted

bzr revid: mtr@mtr-20110330053055-3ovz8idtmrvtkoqq
---
 addons/hr_payroll/hr_payroll.py       | 3 ++-
 addons/hr_payroll/hr_payroll_view.xml | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index f0060f6a3ae..d5a5ea90615 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -750,7 +750,7 @@ class hr_payslip(osv.osv):
                 total = 0.0
                 obj = {'basic': contract.wage}
                 for line in rules:
-                    cd = line.code.lower()
+                    cd = line.code
                     obj[cd] = line.amount or 0.0
 
                 for line in rules:
@@ -761,6 +761,7 @@ class hr_payslip(osv.osv):
                     calculate = False
                     try:
                         exp = line.conditions
+                        exec line.conditions in obj
                         calculate = eval(exp, obj)
                     except Exception, e:
                         raise osv.except_osv(_('Variable Error !'), _('Variable Error: %s ') % (e))
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index fb4d2d19195..f456ce1de50 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -310,6 +310,7 @@
                             <field name="appears_on_payslip_rule" nolabel="1"/>
                         </page>
                         <page string="Details by salary head">
+                            <field name="details_by_salary_head" nolabel="1" context="{'group_by': 'category_id'}"/>
                         </page>
                     </notebook>
                     <group col="10" colspan="4">