From 017c72127b092d097f460baf69c641e6b0136013 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 1 Mar 2011 18:59:38 +0530
Subject: [PATCH] [IMP] hr_payroll:improved demo data and the structure of
 'Salary Head'

bzr revid: mtr@mtr-20110301132938-rt8nqcwndgj0gefp
---
 addons/hr_payroll/hr_payroll.py       |  6 ++---
 addons/hr_payroll/hr_payroll_demo.xml | 34 +++++++++++++++------------
 addons/hr_payroll/hr_payroll_view.xml | 19 +++++++--------
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 3e0e28fad22..8219896efd5 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -670,7 +670,7 @@ class payment_category(osv.osv):
     _columns = {
         'name':fields.char('Category Name', size=64, required=True, readonly=False),
         'code':fields.char('Category Code', size=64, required=True, readonly=False),
-        'type':fields.many2one('salary.head.type', 'Type', required=True),
+        'type':fields.many2one('salary.head.type', 'Type', required=True, help="It is used only for the reporting purpose."),
         'base':fields.text('Based on', required=True, readonly=False, help='This will use to computer the % fields values, in general its on basic, but You can use all heads code field in small letter as a variable name i.e. hra, ma, lta, etc...., also you can use, static varible basic'),
         'condition':fields.char('Condition', size=1024, required=True, readonly=False, help='Applied this head for calculation if condition is true'),
         'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'),
@@ -678,7 +678,7 @@ class payment_category(osv.osv):
         'user_id':fields.char('User', size=64, required=False, readonly=False),
         'state':fields.char('Label', size=64, required=False, readonly=False),
         'company_id':fields.many2one('res.company', 'Company', required=False),
-        'active': fields.boolean('Active'),
+        'dispaly_payslip_report': fields.boolean('Display on Payslip Report', help="Used for the display of head on Payslip Report."),
         'computation_based':fields.selection([
             ('rules','List of Rules'),
             ('exp','Expression'),
@@ -691,7 +691,7 @@ class payment_category(osv.osv):
         'company_id': lambda self, cr, uid, context: \
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
-        'active': 1,
+        'dispaly_payslip_report': 1,
         'computation_based':'rules',
     }
 payment_category()
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 6d7bd5a65fc..787ed8d11ae 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -2,57 +2,61 @@
 <openerp>
     <data>
 
-        <!-- Payroll Structure -->
-        <record id="structure_001" model="hr.payroll.structure">
-            <field name="code">ME</field>
-            <field name="name">Marketing Executive</field>
-            <field name="company_id" ref="base.main_company"/>
-        </record>
+        <!-- Salary Rules -->
 
-        <record id="hr_payslip_line_houserantallowance1" model="hr.payslip.line">
+        <record id="hr_payslip_line_houserantallowance1" model="hr.salary.rule">
             <field name="amount_type">per</field>
             <field eval="5" name="sequence"/>
             <field eval="0.4" name="amount"/>
             <field name="code">HRA</field>
             <field name="type" ref="AL"/>
             <field name="category_id" ref="hr_payroll.HRA"/>
-            <field name="function_id" ref="hr_payroll.structure_001"/>
+           <!-- <field name="function_id" ref="hr_payroll.structure_001"/>-->
             <field name="name">House Rent Allowance</field>
         </record>
 
-        <record id="hr_payslip_line_convanceallowance1" model="hr.payslip.line">
+        <record id="hr_payslip_line_convanceallowance1" model="hr.salary.rule">
             <field name="amount_type">fix</field>
             <field eval="10" name="sequence"/>
             <field eval="800.0" name="amount"/>
             <field name="code">CA</field>
             <field name="type" ref="AL"/>
             <field name="category_id" ref="hr_payroll.CA"/>
-            <field name="function_id" ref="hr_payroll.structure_001"/>
+            <!--<field name="function_id" ref="hr_payroll.structure_001"/>-->
             <field name="name">Conveyance Allowance</field>
         </record>
 
-        <record id="hr_payslip_line_professionaltax1" model="hr.payslip.line">
+        <record id="hr_payslip_line_professionaltax1" model="hr.salary.rule">
             <field name="amount_type">fix</field>
             <field eval="15" name="sequence"/>
             <field eval="200.0" name="amount"/>
             <field name="code">PT</field>
             <field name="type" ref="DED"/>
             <field name="category_id" ref="hr_payroll.PT"/>
-            <field name="function_id" ref="hr_payroll.structure_001"/>
+         <!--   <field name="function_id" ref="hr_payroll.structure_001"/>-->
             <field name="name">Professional Tax</field>
         </record>
 
-        <record id="hr_payslip_line_providentfund1" model="hr.payslip.line">
+        <record id="hr_payslip_line_providentfund1" model="hr.salary.rule">
             <field name="amount_type">per</field>
             <field eval="20" name="sequence"/>
             <field eval="0.125" name="amount"/>
             <field name="code">PF</field>
             <field name="type" ref="DED"/>
             <field name="category_id" ref="hr_payroll.PF"/>
-            <field name="function_id" ref="hr_payroll.structure_001"/>
+           <!-- <field name="function_id" ref="hr_payroll.structure_001"/>-->
             <field name="name">Provident Fund</field>
         </record>
-
+        
+        <!-- Salary Structure -->
+        
+         <record id="structure_001" model="hr.payroll.structure">
+            <field name="code">ME</field>
+            <field name="name">Marketing Executive</field>
+            <field eval="[(6, 0, [ref('hr_payslip_line_houserantallowance1'), ref('hr_payslip_line_convanceallowance1'),ref('hr_payslip_line_professionaltax1'),ref('hr_payslip_line_providentfund1')])]" name="rule_ids"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+        
         <!-- Employee -->
         <record id="hr_employee_bonamy0" model="hr.employee">
             <field eval="0" name="manager"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 6896228f2ba..ed7e53c37e4 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -496,11 +496,13 @@
             <field name="arch" type="xml">
                 <form string="Salary Heads">
                     <group col="6" colspan="6">
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="sequence"/>
-                        <field name="type" select="1"/>
-                        <field name="active"/>
+                        <group col="6" colspan="6">
+	                        <field name="name" select="1"/>
+	                        <field name="code" select="1"/>
+	                        <field name="sequence"/>
+	                        <field name="type" select="1"/>
+	                        <field name="dispaly_payslip_report"/>
+                        </group>
                         <group col="2" colspan="4">
                             <separator colspan="4" string="Expression"/>
                             <field name="base" colspan="4" nolabel="1"/>
@@ -508,15 +510,10 @@
                         <group col="2" colspan="2">
                             <separator colspan="4" string="Dynamic Computation"/>
                             <field name="computation_based" select="1"/>
-                            <field name="condition"/>
                         </group>
                     </group>
                     <separator colspan="4" string="Description"/>
-                    <notebook colspan="4">
-                        <page string="Description">
-                            <field name="note" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
+                        <field name="note" colspan="4" nolabel="1"/>
                 </form>
             </field>
         </record>