openerp-dev-web team mailing list archive

["Meera Trambadia \(OpenERP\)" <mtr@xxxxxxxxxxx>]

Meera Trambadia (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-payroll-demo-data-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-demo-data-mtr/+merge/57142

hr_payroll:- improved demo data
* a new structure: "Marketing Executive for Quentin Paolino": parent = Executive, only two rules defined:
    - conveyance allowance for paolino = 600
    - another new rule based on input: meal voucher (like +1€ by number_of_days in worked_days['NORM100'])
* a new contract for Quentin Paolino with structure the one define above
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-demo-data-mtr/+merge/57142
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-payroll-demo-data-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll.

=== modified file 'hr_payroll/hr_payroll_demo.xml'
--- hr_payroll/hr_payroll_demo.xml	2011-04-11 08:11:39 +0000
+++ hr_payroll/hr_payroll_demo.xml	2011-04-11 11:06:30 +0000
@@ -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>