From 48f0a8554eef524fa8a22860fe0e8299cf2d1587 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 8 Oct 2010 19:41:43 +0530
Subject: [PATCH] [IMP]: improve the usability for the payslip line

bzr revid: mga@tinyerp.com-20101008141143-k2l0txnqr3y7j44g
---
 addons/hr_payroll/hr_payroll_view.xml | 113 +++++++++++++++++++++++++-
 1 file changed, 111 insertions(+), 2 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index cf45b77fbe6..0b06790407d 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -152,8 +152,8 @@
                                         <group col="2" colspan="2">
                                             <separator colspan="2" string="Advantages"/>
                                             <field name="struct_id" select="1"/>
-                                            <field name="advantages_net"/>
                                             <field name="advantages_gross"/>
+                                            <field name="advantages_net"/>
                                             <field name="advantages" nolabel="1" colspan="2"/>
                                         </group>
                                     </page>
@@ -197,6 +197,42 @@
                                 <field name="amount_type"/>
                                 <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
                             </tree>
+                            <form string="Payslip Line">
+                                <group col="6" colspan="4">
+                                    <field name="name" colspan="4" select="1"/>
+                                    <field name="code" select="1"/>
+                                </group>
+                                <group col="2" colspan="2">
+                                    <separator colspan="4" string="Calculations"/>
+                                    <field name="category_id" on_change="onchange_category(category_id)"/>
+                                    <field name="type"/>
+                                    <field name="amount_type"/>
+                                    <field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
+                                    <field name="sequence" groups="base.group_extended"/>
+                                </group>
+                                <group col="2" colspan="2">
+                                    <separator colspan="4" string="Company contribution"/>
+                                    <field name="company_contrib"/>
+                                </group>
+                                <notebook colspan="4">
+                                    <page string="Function">
+                                        <field name="line_ids" colspan="4" nolabel="1" attrs="{'readonly':[('amount_type','!=','func')]}">
+                                            <tree string="Function Arguments" editable="bottom">
+                                                <field name="name"/>
+                                                <field name="sequence" groups="base.group_extended"/>
+                                                <field name="from_val"/>
+                                                <field name="to_val"/>
+                                                <field name="amount_type"/>
+                                                <field name="value"/>
+                                            </tree>
+                                        </field>
+                                    </page>
+                                    <page string="Description">
+                                        <separator colspan="4" string="Description"/>
+                                        <field name="note" colspan="4" nolabel="1"/>
+                                    </page>
+                                </notebook>
+                            </form>
                         </field>
                     </page>
                 </xpath>
@@ -302,7 +338,44 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Salary Structure">
-                            <field name="line_ids" nolabel="1" colspan="4"/>
+                            <field name="line_ids" nolabel="1" colspan="4">
+                                <form string="Payslip Line">
+                                    <group col="6" colspan="4">
+                                        <field name="name" colspan="4" select="1"/>
+                                        <field name="code" select="1"/>
+                                    </group>
+                                    <group col="2" colspan="2">
+                                        <separator colspan="4" string="Calculations"/>
+                                        <field name="category_id" on_change="onchange_category(category_id)"/>
+                                        <field name="type"/>
+                                        <field name="amount_type"/>
+                                        <field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
+                                        <field name="sequence" groups="base.group_extended"/>
+                                    </group>
+                                    <group col="2" colspan="2">
+                                        <separator colspan="4" string="Company contribution"/>
+                                        <field name="company_contrib"/>
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Function">
+                                            <field name="line_ids" colspan="4" nolabel="1" attrs="{'readonly':[('amount_type','!=','func')]}">
+                                                <tree string="Function Arguments" editable="bottom">
+                                                    <field name="name"/>
+                                                    <field name="sequence" groups="base.group_extended"/>
+                                                    <field name="from_val"/>
+                                                    <field name="to_val"/>
+                                                    <field name="amount_type"/>
+                                                    <field name="value"/>
+                                                </tree>
+                                            </field>
+                                        </page>
+                                        <page string="Description">
+                                            <separator colspan="4" string="Description"/>
+                                            <field name="note" colspan="4" nolabel="1"/>
+                                        </page>
+                                    </notebook>
+                                </form>
+                            </field>
                         </page>
                     </notebook>
                 </form>
@@ -454,6 +527,42 @@
                                     <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
                                     <field name="total"/>
                                 </tree>
+                                <form string="Payslip Line">
+                                    <group col="6" colspan="4">
+                                        <field name="name" colspan="4" select="1"/>
+                                        <field name="code" select="1"/>
+                                    </group>
+                                    <group col="2" colspan="2">
+                                        <separator colspan="4" string="Calculations"/>
+                                        <field name="category_id" on_change="onchange_category(category_id)"/>
+                                        <field name="type"/>
+                                        <field name="amount_type"/>
+                                        <field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
+                                        <field name="sequence" groups="base.group_extended"/>
+                                    </group>
+                                    <group col="2" colspan="2">
+                                        <separator colspan="4" string="Company contribution"/>
+                                        <field name="company_contrib"/>
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Function">
+                                            <field name="line_ids" colspan="4" nolabel="1" attrs="{'readonly':[('amount_type','!=','func')]}">
+                                                <tree string="Function Arguments" editable="bottom">
+                                                    <field name="name"/>
+                                                    <field name="sequence" groups="base.group_extended"/>
+                                                    <field name="from_val"/>
+                                                    <field name="to_val"/>
+                                                    <field name="amount_type"/>
+                                                    <field name="value"/>
+                                                </tree>
+                                            </field>
+                                        </page>
+                                        <page string="Description">
+                                            <separator colspan="4" string="Description"/>
+                                            <field name="note" colspan="4" nolabel="1"/>
+                                        </page>
+                                    </notebook>
+                                </form>
                             </field>
                             <group col="6" colspan="4">
                                 <separator string="Computation Overview" colspan="6"/>