From ab98d8809d0dd4ea9d8429cac1fa31df97788bb4 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Thu, 31 Mar 2011 14:50:48 +0530
Subject: [PATCH] [FIX] payroll

bzr revid: mra@mra-laptop-20110331092048-uivs7dxmh2o7fhp8
---
 addons/hr_payroll/hr_payroll.py       | 2 +-
 addons/hr_payroll/hr_payroll_view.xml | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 97890297754..510237f5b70 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -1429,7 +1429,7 @@ class hr_salary_rule(osv.osv):
         ],'Company Amount Type', select=True),
         'contribute_per':fields.float('Company Contribution', digits=(16, 4), help='Define Company contribution ratio 1.00=100% contribution.'),
         'company_contribution':fields.boolean('Company Contribution',help="This rule has Company Contributions."),
-	'expression_result':fields.char('Expression based on',size=1024, required=True, readonly=False, help='result will be affected to a variable'),
+	'expression_result':fields.char('Expression based on',size=1024, required=False, readonly=False, help='result will be affected to a variable'),
 	'parent_rule_id':fields.many2one('hr.salary.rule', 'Parent Salary Rule', select=True),
      }
     _defaults = {
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 81a7dd4f10b..e6921aa85b0 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -292,7 +292,7 @@
                         <page string="Applied Salary Rules" attrs="{'invisible':[('Applied Salary Rules')]}">
                             <field name="applied_salary_rule" nolabel="1" />
                         </page>
-			
+
                        <page string="Appears On Payslip">
                             <field name="appears_on_payslip_rule" nolabel="1"/>
                         </page>
@@ -699,7 +699,7 @@
         </field>
     </record>
 
-    <record id="view_hr_payslip_filter" model="ir.ui.view">
+    <record id="view_hr_rule_filter" model="ir.ui.view">
 	<field name="name">hr.salary.rule.select</field>
 	<field name="model">hr.salary.rule</field>
 	<field name="type">search</field>
@@ -716,7 +716,7 @@
 		</group>
 		</search>
 	</field>
-    </record>	
+    </record>
 
     <record id="action_salary_rule_form" model="ir.actions.act_window">
         <field name="name">Salary Rules</field>
@@ -724,6 +724,7 @@
         <field name="view_type">form</field>
         <field name="view_id" ref="hr_salary_rule_tree"/>
         <field name="domain">[('parent_rule_id','=',False)]</field>
+        <field name="search_view_id" ref="view_hr_rule_filter"/>
     </record>
 
     <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure" sequence="12"/>