From 5274942d61a7a59e495985a951fb7b7be1211e7b Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Thu, 15 Sep 2011 16:52:55 +0530
Subject: [PATCH 1/2] [IMP] hr_payroll: Add button to get salary rule hierarchy

bzr revid: psi@tinyerp.com-20110915112255-nls8msun2o4nfdb4
---
 addons/hr_payroll/hr_payroll_view.xml | 36 ++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index a2523fcb7ba..1b58bdbc55d 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -554,7 +554,7 @@
         <!-- Salary Rules -->
 
         <record id="hr_salary_rule_tree" model="ir.ui.view">
-            <field name="name">hr.salary.rule.tree</field>
+            <field name="name">hr.salary.rule.list</field>
             <field name="model">hr.salary.rule</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
@@ -567,6 +567,22 @@
                 </tree>
             </field>
         </record>
+
+        <record id="view_salary_rule_tree" model="ir.ui.view">
+            <field name="name">hr.salary.rule.tree</field>
+            <field name="model">hr.salary.rule</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field eval="20" name="priority"/>
+            <field name="arch" type="xml">
+                <tree string="Salary Rules">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="category_id" invisible="True"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </tree>
+            </field>
+        </record>
         <record id="hr_salary_rule_form" model="ir.ui.view">
             <field name="name">hr.salary.rule.form</field>
             <field name="model">hr.salary.rule</field>
@@ -654,6 +670,24 @@
 
         <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure" sequence="12"/>
 
+        <record id="action_hr_salary_rule_tree_view" model="ir.actions.act_window">
+            <field name="name">Salary Rule Hierarchy</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.salary.rule</field>
+            <field name="domain">[('id','in',active_ids)]</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="view_salary_rule_tree"/>
+        </record>
+
+        <ir_set>
+            <field eval="'action'" name="key"/>
+            <field eval="'client_action_multi'" name="key2"/>
+            <field eval="['hr.salary.rule']" name="models"/>
+            <field name="name">Salary Rule Hierarchy</field>
+            <field eval="'ir.actions.act_window,'+str(action_hr_salary_rule_tree_view)" name="value"/>
+            <field eval="True" name="isobject"/>
+            <field eval="True" name="replace"/>
+        </ir_set>
 
         <!-- payslip runs -->
 

From ba785eca19814ae360194e84a713965fd3d1226d Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Thu, 15 Sep 2011 18:10:55 +0530
Subject: [PATCH 2/2] [IMP] hr_payroll: small changes(imporve view ids)

bzr revid: psi@tinyerp.com-20110915124055-is068g72tfk47nl1
---
 addons/hr_payroll/hr_payroll_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 1b58bdbc55d..8d639964407 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -553,7 +553,7 @@
 
         <!-- Salary Rules -->
 
-        <record id="hr_salary_rule_tree" model="ir.ui.view">
+        <record id="hr_salary_rule_list" model="ir.ui.view">
             <field name="name">hr.salary.rule.list</field>
             <field name="model">hr.salary.rule</field>
             <field name="type">tree</field>
@@ -568,7 +568,7 @@
             </field>
         </record>
 
-        <record id="view_salary_rule_tree" model="ir.ui.view">
+        <record id="hr_salary_rule_tree" model="ir.ui.view">
             <field name="name">hr.salary.rule.tree</field>
             <field name="model">hr.salary.rule</field>
             <field name="type">tree</field>
@@ -663,7 +663,7 @@
             <field name="name">Salary Rules</field>
             <field name="res_model">hr.salary.rule</field>
             <field name="view_type">form</field>
-            <field name="view_id" ref="hr_salary_rule_tree"/>
+            <field name="view_id" ref="hr_salary_rule_list"/>
             <field name="domain">[('parent_rule_id','=',False)]</field>
             <field name="search_view_id" ref="view_hr_rule_filter"/>
         </record>
@@ -676,7 +676,7 @@
             <field name="res_model">hr.salary.rule</field>
             <field name="domain">[('id','in',active_ids)]</field>
             <field name="view_type">tree</field>
-            <field name="view_id" ref="view_salary_rule_tree"/>
+            <field name="view_id" ref="hr_salary_rule_tree"/>
         </record>
 
         <ir_set>