From 606ebf878136a7628e9ca395da8bdefe1e6f9c1b Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 29 Jun 2011 16:41:22 +0530
Subject: [PATCH 1/2] [IMP] hr_payroll: Added button for contribution register
 in group by search for payslip search view

bzr revid: psi@tinyerp.co.in-20110629111122-13e8l8fwyorjmjqc
---
 addons/hr_payroll/hr_payroll_view.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f8b74ba01ee..1a47b1859e7 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -144,6 +144,8 @@
                     <field name="quantity" string="Quantity/Rate"/>
                     <field name="amount"/>
                     <field name="total"/>
+                    <field name="amount_select" invisible="1"/>
+                    <field name="register_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -196,6 +198,7 @@
                     <newline/>
                     <group col="8" colspan="4" expand="0" string="Group By...">
                         <filter string="Salary Rule Category" icon="terp-camera_test" name="category_id" context="{'group_by':'category_id'}"/>
+                        <filter string="Contribution Register" name="register_id" icon="terp-folder-yellow" context="{'group_by':'register_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Amount Type" name="amount_select" icon="terp-stock_symbol-selection" context="{'group_by':'amount_select'}"/>
                         <separator orientation="vertical"/>

From fff45e7a1734ed69ca87d21159ce98ce8fc5c345 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Wed, 29 Jun 2011 17:57:27 +0530
Subject: [PATCH 2/2] [IMP] hr_payroll: added a button relate on the payslip to
 get all the payslip lines applied grouped by contribution register

bzr revid: psi@tinyerp.co.in-20110629122727-1hfynocjx7kxjefd
---
 addons/hr_payroll/hr_payroll_view.xml | 121 +++++++++++++-------------
 1 file changed, 60 insertions(+), 61 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 1a47b1859e7..5e051afce6c 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -208,7 +208,6 @@
             </field>
         </record>
 
-
         <record id="view_hr_payslip_tree" model="ir.ui.view">
             <field name="name">hr.payslip.tree</field>
             <field name="model">hr.payslip</field>
@@ -526,7 +525,7 @@
             id="act_hr_employee_payslip_list"
             groups="base.group_hr_manager"/>
 
-    <!-- Salary Rules -->
+        <!-- Salary Rules -->
 
         <record id="hr_salary_rule_tree" model="ir.ui.view">
             <field name="name">hr.salary.rule.tree</field>
@@ -629,69 +628,69 @@
 
         <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)]" id="act_payslip_lines" name="Payslip Lines" res_model="hr.payslip.line" src_model="hr.payslip"/>
+        <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"/>
 
-    <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">
-                <field name="name"/>
-                <field name="date_start"/>
-                <field name="date_end"/>
-            </search>
-        </field>
-    </record>
-
-    <record id="hr_payslip_run_tree" model="ir.ui.view">
-        <field name="name">hr.payslip.run.tree</field>
-        <field name="model">hr.payslip.run</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Payslips Run">
-                <field name="name"/>
-                <field name="date_start"/>
-                <field name="date_end"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="hr_payslip_run_form" model="ir.ui.view">
-        <field name="name">hr.payslip.run.form</field>
-        <field name="model">hr.payslip.run</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Payslips Run">
-                <group col="6" colspan="4">
-                    <field name="name" colspan="4"/>
-                    <field name="credit_note"/>
+        <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">
+                    <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_end"/>
-                </group>
-                <notebook colspan="4">
-                    <page string="Payslips">
-                        <field name="slip_ids" colspan="4" nolabel="1"/>
-                    </page>
-                </notebook>
-                <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 string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft_payslip_run" type="object" states="close"/>
-                </group>
-            </form>
-        </field>
-    </record>
+                </search>
+            </field>
+        </record>
 
-    <record id="action_hr_payslip_run_tree" model="ir.actions.act_window">
-        <field name="name">Payslips Run</field>
-        <field name="res_model">hr.payslip.run</field>
-        <field name="view_type">form</field>
-        <field name="view_id" ref="hr_payslip_run_tree"/>
-        <field name="search_view_id" ref="hr_payslip_run_filter"/>
-    </record>
-    <menuitem action="action_hr_payslip_run_tree" id="menu_hr_payslip_run" parent="menu_hr_root_payroll"/>
+        <record id="hr_payslip_run_tree" model="ir.ui.view">
+            <field name="name">hr.payslip.run.tree</field>
+            <field name="model">hr.payslip.run</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Payslips Run">
+                    <field name="name"/>
+                    <field name="date_start"/>
+                    <field name="date_end"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="hr_payslip_run_form" model="ir.ui.view">
+            <field name="name">hr.payslip.run.form</field>
+            <field name="model">hr.payslip.run</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Payslips Run">
+                    <group col="6" colspan="4">
+                        <field name="name" colspan="4"/>
+                        <field name="credit_note"/>
+                        <field name="date_start"/>
+                        <field name="date_end"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Payslips">
+                            <field name="slip_ids" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                    <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 string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft_payslip_run" type="object" states="close"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_hr_payslip_run_tree" model="ir.actions.act_window">
+            <field name="name">Payslips Run</field>
+            <field name="res_model">hr.payslip.run</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="hr_payslip_run_tree"/>
+            <field name="search_view_id" ref="hr_payslip_run_filter"/>
+        </record>
+        <menuitem action="action_hr_payslip_run_tree" id="menu_hr_payslip_run" parent="menu_hr_root_payroll"/>
 
     </data>
 </openerp>