From a325842fc30d5ad7c3c36387a3874d000292b4a5 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 11 Apr 2011 16:27:47 +0530
Subject: [PATCH 1/2] [IMP] hr_payroll: improved demo data

bzr revid: mtr@mtr-20110411105747-w76xe1ylr9e14r42
---
 addons/hr_payroll/hr_payroll_demo.xml | 40 ++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 03a692f328e..6daa4d20b1c 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -41,7 +41,24 @@
             <field name="category_id" ref="hr_payroll.DED"/>
             <field name="name">Provident Fund</field>
         </record>
-
+        
+        <record id="hr_salary_rule_ca_paolino" model="hr.salary.rule">
+            <field name="amount_select">fix</field>
+            <field eval="600.0" name="amount_fix"/>
+            <field name="code">CAP</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="name">Conveyance Allowance For Paolino</field>
+            <field name="sequence" eval="10"/>
+        </record>
+        
+        <record id="hr_salary_rule_meal_voucher" model="hr.salary.rule">
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = worked_days['WORK100']['number_of_days'] * 1</field>
+            <field name="code">MA</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="name">Meal Voucher</field>
+            <field name="sequence" eval="10"/>
+         </record>
         <!-- Salary Structure -->
 
          <record id="structure_001" model="hr.payroll.structure">
@@ -51,6 +68,14 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="parent_id" ref="structure_base"/>
         </record>
+        
+        <record id="structure_002" model="hr.payroll.structure">
+            <field name="code">MEQP</field>
+            <field name="name">Marketing Executive for Quentin Paolino</field>
+            <field eval="[(6, 0, [ref('hr_salary_rule_ca_paolino'),(hr_salary_rule_meal_voucher)])]" name="rule_ids"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="parent_id" ref="structure_001"/>
+        </record>
 
         <!-- Employee -->
         <record id="hr_employee_bonamy0" model="hr.employee">
@@ -74,6 +99,19 @@
             <field eval="4000.0" name="wage"/>
             <field eval="5" name="working_days_per_week"/>
         </record>
+        
+        <record id="hr_contract_quentin_paolino" model="hr.contract">
+            <field name="name">Contract For Quentin Paolino</field>
+            <field name="type_id" ref="hr_contract.hr_contract_type_emp"/>
+            <field name="date_start" eval="time.strftime('%Y-%m')+'-1'"/>
+            <field name="date_end" eval="time.strftime('%Y')+'-12-31'"/>
+            <field name="struct_id" ref="hr_payroll.structure_002"/>
+            <field name="employee_id" ref="hr.employee2"/>
+            <field name="notes">This is Quentin Paolino's contract</field>
+            <field eval="5000.0" name="wage"/>
+            <field eval="5" name="working_days_per_week"/>
+            <field name="working_hours" ref="resource.timesheet_group1"/>
+        </record>
 
     </data>
 </openerp>

From 3c3d8349c92ca2a33c9b10b62e70293a90a8e98f Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 11 Apr 2011 18:38:03 +0530
Subject: [PATCH 2/2] [IMP] hr_payroll: improved demo data i.e. sequence on
 salary rules

bzr revid: mtr@mtr-20110411130803-fp5gfz4plxap6h59
---
 addons/hr_payroll/hr_payroll_demo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 6daa4d20b1c..e6c4a1d9945 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -48,7 +48,7 @@
             <field name="code">CAP</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">Conveyance Allowance For Paolino</field>
-            <field name="sequence" eval="10"/>
+            <field name="sequence" eval="15"/>
         </record>
         
         <record id="hr_salary_rule_meal_voucher" model="hr.salary.rule">
@@ -57,7 +57,7 @@
             <field name="code">MA</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">Meal Voucher</field>
-            <field name="sequence" eval="10"/>
+            <field name="sequence" eval="170"/>
          </record>
         <!-- Salary Structure -->