From f763635a53e3f4c932d102eb160417935527c97f Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Thu, 15 Sep 2011 10:57:37 +0530
Subject: [PATCH 1/2] [FIX] hr_payroll: shifed the worked days and input tab to
 first position and rename Payslip Lines  act window to Payslip Computation
 Detail

bzr revid: psi@tinyerp.com-20110915052737-541rkobli69etr2g
---
 addons/hr_payroll/hr_payroll_view.xml | 81 ++++++++++++++-------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index a2523fcb7ba..ed3628a8adb 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -270,43 +270,7 @@
                         <field name="credit_note"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Salary Computation" >
-                            <field name="line_ids" colspan="4" nolabel="1">
-                                <tree string="Salary Structure" editable="bottom" colors="blue:total == 0">
-                                    <field name="name"/>
-                                    <field name="code"/>
-                                    <field name="category_id"/>
-                                    <field name="sequence" invisible="1"/>
-                                    <field name="quantity" string="Quantity/Rate"/>
-                                    <field name="amount"/>
-                                    <field name="total"/>
-                                </tree>
-                                <form string="Payslip Line">
-                                    <group>
-                                        <field name="name" select="1"/>
-                                        <field name="code" select="1"/>
-                                        <field name="category_id"/>
-                                        <field name="sequence" groups="base.group_extended"/>
-                                        <field name="quantity" string="Quantity/Rate"/>
-                                        <field name="amount"/>
-                                        <field name="total"/>
-                                        <field name="salary_rule_id" groups="base.group_extended"/>
-                                    </group>
-                                </form>
-                            </field>
-                        </page>
-                        <page string="Details By Salary Rule Category">
-                            <field name="details_by_salary_rule_category" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
-                                <tree string="Payslip Lines" colors="blue:total == 0">
-                                    <field name="category_id"/>
-                                    <field name="name"/>
-                                    <field name="code"/>
-                                    <field name="total"/>
-                                </tree>
-                            </field>
-                       </page>
-
-                       <page string="Worked Days &amp; Inputs">
+                        <page string="Worked Days &amp; Inputs">
                             <field name="worked_days_line_ids" colspan="4" nolabel="1">
                                 <tree string="Worked Days" editable="bottom">
                                     <field name="name"/>
@@ -347,8 +311,42 @@
                                     </group>
                                 </form>
                             </field>
+                        </page>
+                        <page string="Salary Computation" >
+                            <field name="line_ids" colspan="4" nolabel="1">
+                                <tree string="Salary Structure" editable="bottom" colors="blue:total == 0">
+                                    <field name="name"/>
+                                    <field name="code"/>
+                                    <field name="category_id"/>
+                                    <field name="sequence" invisible="1"/>
+                                    <field name="quantity" string="Quantity/Rate"/>
+                                    <field name="amount"/>
+                                    <field name="total"/>
+                                </tree>
+                                <form string="Payslip Line">
+                                    <group>
+                                        <field name="name" select="1"/>
+                                        <field name="code" select="1"/>
+                                        <field name="category_id"/>
+                                        <field name="sequence" groups="base.group_extended"/>
+                                        <field name="quantity" string="Quantity/Rate"/>
+                                        <field name="amount"/>
+                                        <field name="total"/>
+                                        <field name="salary_rule_id" groups="base.group_extended"/>
+                                    </group>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Details By Salary Rule Category">
+                            <field name="details_by_salary_rule_category" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1">
+                                <tree string="Payslip Lines" colors="blue:total == 0">
+                                    <field name="category_id"/>
+                                    <field name="name"/>
+                                    <field name="code"/>
+                                    <field name="total"/>
+                                </tree>
+                            </field>
                        </page>
-
                        <page string="Other Information">
                             <separator colspan="4" string="Other Information"/>
                             <group col="5" colspan="2">
@@ -734,7 +732,12 @@
             id="act_hr_employee_payslip_list"
             groups="base.group_hr_manager"/>
 
-        <act_window domain="[('slip_id', '=', active_id)]" context="{'search_default_register_id': 1}" id="act_payslip_lines" name="Payslip Lines" res_model="hr.payslip.line" src_model="hr.payslip"/>
+        <act_window name="Payslip Computation Detail"
+        	domain="[('slip_id', '=', active_id)]"
+        	context="{'search_default_register_id': 1}"
+        	res_model="hr.payslip.line"
+        	src_model="hr.payslip"
+        	id="act_payslip_lines"/>
 
     </data>
 </openerp>

From 4960c39193fae617f62ccd743551623586f91404 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Thu, 15 Sep 2011 11:39:53 +0530
Subject: [PATCH 2/2] [IMP] hr_payroll:label improvment

bzr revid: psi@tinyerp.com-20110915060953-zslf0b4pdcg03oya
---
 addons/hr_payroll/hr_payroll_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index ed3628a8adb..76e80d48abf 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -732,7 +732,7 @@
             id="act_hr_employee_payslip_list"
             groups="base.group_hr_manager"/>
 
-        <act_window name="Payslip Computation Detail"
+        <act_window name="Payslip Computation Details"
         	domain="[('slip_id', '=', active_id)]"
         	context="{'search_default_register_id': 1}"
         	res_model="hr.payslip.line"