From ecb85380ad98cd838b47c475598cca6dbad40b66 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 11 Jul 2011 14:15:25 +0200
Subject: [PATCH] [IMP] hr_payrolll: usability improvements

bzr revid: qdp-launchpad@openerp.com-20110711121525-88cz0kag3s6qim68
---
 addons/hr_payroll/hr_payroll_view.xml | 83 ++++++++++++---------------
 1 file changed, 38 insertions(+), 45 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 5848e7b7fc4..f5fea89f3d9 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -208,6 +208,9 @@
             </field>
         </record>
 
+
+        <!-- payslip -->
+
         <record id="view_hr_payslip_tree" model="ir.ui.view">
             <field name="name">hr.payslip.tree</field>
             <field name="model">hr.payslip</field>
@@ -346,6 +349,7 @@
                 </form>
             </field>
         </record>
+
         <record id="view_hr_payslip_filter" model="ir.ui.view">
             <field name="name">hr.payslip.select</field>
             <field name="model">hr.payslip</field>
@@ -354,13 +358,11 @@
                 <search string="Search Payslips">
                     <group col="8" colspan="4">
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Slip"/>
-                        <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Slip"/>
+                        <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done Slip"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-dolar_ok!" string="Paid" domain="[('state','=','done'),('paid','=',True)]" help="Paid Slip"/>
-                        <separator orientation="vertical"/>
-                        <field name="name"/>
-                        <field name="employee_id"/>
                         <field name="number"/>
+                        <field name="employee_id"/>
+                        <field name="name"/>
                         <field name="date_from"/>
                         <field name="payslip_run_id"/>
                     </group>
@@ -368,11 +370,11 @@
                     <group col="8" colspan="4" expand="0" string="Group By...">
                         <filter string="Employees" icon="terp-personal" name="employee_id" context="{'group_by':'employee_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Companies" name="company_id"  icon="terp-go-home" context="{'group_by':'company_id'}"/>
+                        <filter string="PaySlip Run" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/>
+                        <separator orientation="vertical" groups="base.group_multi_company"/>
+                        <filter string="Companies" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="States" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="PaySlip Run" name="payslip_run_id" icon="terp-folder-orange" context="{'group_by':'payslip_run_id'}"/>
                     </group>
                 </search>
             </field>
@@ -497,33 +499,6 @@
             parent="payroll_configure"
             sequence="14"
         />
-        <!-- <record id="hr_contibution_register_line_form" model="ir.ui.view">
-            <field name="name">hr.contibution.register.line.form</field>
-            <field name="model">hr.contibution.register.line</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Contribution">
-                      <field name="name"/>
-                      <field name="code"/>
-                      <field name="employee_id"/>
-                      <field name="emp_deduction"/>
-                      <field name="comp_deduction"/>
-                      <field name="total"/>
-                </form>
-            </field>
-        </record> -->
-
-
-
-        <!--  Shortcuts -->
-        <act_window name="Payslips"
-            domain="[('employee_id', '=', active_id)]"
-            context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
-            res_model="hr.payslip"
-            src_model="hr.employee"
-            view_id ="view_hr_payslip_tree"
-            id="act_hr_employee_payslip_list"
-            groups="base.group_hr_manager"/>
 
         <!-- Salary Rules -->
 
@@ -563,15 +538,15 @@
                                     <field name="condition_select"/><newline/>
                                     <field name="condition_python" attrs="{'invisible':[('condition_select','&lt;&gt;','python')], 'required': [('condition_select','=','python')]}" colspan="4"/> <newline/>
                                     <field name="condition_range" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/><newline/>
-                                    <field name="condition_range_min" colspan="2" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/>
-                                    <field name="condition_range_max" colspan="2" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/>
+                                    <field name="condition_range_min" colspan="2" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/><newline/>
+                                    <field name="condition_range_max" colspan="2" attrs="{'invisible':[('condition_select','&lt;&gt;','range')], 'required':[('condition_select','=','range')]}"/><newline/>
                                     <separator colspan="4" string="Computation"/>
-                                    <field name="amount_select"/>
+                                    <field name="amount_select"/><newline/>
+                                    <field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/><newline/>
                                     <field name="quantity" attrs="{'invisible':[('amount_select','=','code')], 'required':[('amount_select','!=','code')]}"/><newline/>
-                                    <field name="amount_fix"  attrs="{'invisible':[('amount_select','&lt;&gt;','fix')], 'required':[('amount_select','=','fix')]}"/>
-                                    <field colspan="4" name="amount_python_compute" attrs="{'invisible':[('amount_select','&lt;&gt;','code')], 'required':[('amount_select','=','code')]}"/>
-                                    <field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/>
+                                    <field name="amount_fix"  attrs="{'invisible':[('amount_select','&lt;&gt;','fix')], 'required':[('amount_select','=','fix')]}"/><newline/>
                                     <field name="amount_percentage" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required':[('amount_select','=','percentage')]}"/>
+                                    <field colspan="4" name="amount_python_compute" attrs="{'invisible':[('amount_select','&lt;&gt;','code')], 'required':[('amount_select','=','code')]}"/>
                                     <separator colspan="4" string="Company contribution"/>
                                     <field name="register_id"/>
                                 </group>
@@ -611,7 +586,7 @@
                     </group>
                     <newline/>
                     <group col="8" colspan="4" expand="0" string="Group By...">
-                        <filter string="Head" icon="terp-folder-yellow" name="head" context="{'group_by':'category_id'}"/>
+                        <filter string="Category" icon="terp-folder-yellow" name="head" context="{'group_by':'category_id'}"/>
                     </group>
                 </search>
             </field>
@@ -628,14 +603,18 @@
 
         <menuitem id="menu_action_hr_salary_rule_form" action="action_salary_rule_form" parent="payroll_configure" sequence="12"/>
 
-        <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"/>
+
+        <!-- payslip runs -->
 
         <record id="hr_payslip_run_filter" model="ir.ui.view">
             <field name="name">hr.payslip.run.search</field>
             <field name="model">hr.payslip.run</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Payslips Group">
+                <search string="Search Payslip Runs">
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft runs"/>
+                    <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]" help="Done runs"/>
+                    <separator orientation="vertical"/>
                     <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
@@ -652,6 +631,7 @@
                     <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
+                    <field name="credit_note"/>
                 </tree>
             </field>
         </record>
@@ -676,7 +656,7 @@
                     <group col="6" colspan="4">
                         <field name="state"/>
                         <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" icon="gtk-execute" string="Generate Payslips" />
-                        <button name="close_payslip_run" type="object" icon="gtk-jump-to" string="Close" states="draft"/>
+                        <button name="close_payslip_run" type="object" icon="terp-camera_test" string="Close" states="draft"/>
                         <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft_payslip_run" type="object" states="close"/>
                     </group>
                 </form>
@@ -692,6 +672,19 @@
         </record>
         <menuitem action="action_hr_payslip_run_tree" id="menu_hr_payslip_run" parent="menu_hr_root_payroll"/>
 
+        <!--  Shortcuts -->
+
+        <act_window name="Payslips"
+            domain="[('employee_id', '=', active_id)]"
+            context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
+            res_model="hr.payslip"
+            src_model="hr.employee"
+            view_id ="view_hr_payslip_tree"
+            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"/>
+
     </data>
 </openerp>