[MERGE] Merge kbh branch lp:~openerp-dev/openerp-india/payroll-india-trunk-demo_data-kbh
bzr revid: mra@tinyerp.com-20120626065034-luebnogr0g9nxfio
This commit is contained in:
commit
2c60eedc43
|
@ -46,7 +46,7 @@ Indian Payroll Salary Rules.
|
|||
'active': False,
|
||||
'update_xml': [
|
||||
'l10n_in_hr_payroll_view.xml',
|
||||
'l10n_in_hr_payroll_data.xml',
|
||||
'data/l10n_in_hr_payroll_data.xml',
|
||||
'data/hr.salary.rule.csv',
|
||||
'security/ir.model.access.csv',
|
||||
'l10n_in_hr_payroll_report.xml',
|
||||
|
@ -56,4 +56,4 @@ Indian Payroll Salary Rules.
|
|||
'installable': True
|
||||
}
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -4,10 +4,10 @@
|
|||
|
||||
<!-- Hr Salary structure-->
|
||||
|
||||
<record id="hr_payroll_salary_structure_emp_ind" model="hr.payroll.structure">
|
||||
<record id="hr_payroll_salary_structure_ind_emp" model="hr.payroll.structure">
|
||||
<field name="code">IND</field>
|
||||
<field name="name">Indian Employee</field>
|
||||
<field eval="[(6, 0, [ref('hr_salary_rule_medical'),ref('hr_salary_rule_lta'),ref('hr_salary_rule_telephone'), ref('hr_salary_rule_internet'),ref('hr_payroll_rule_child1'),ref('hr_salary_rule_gratuity')])]" name="rule_ids"/>
|
||||
<field name="name">Non-executive employees</field>
|
||||
<field eval="[(6, 0, [ref('hr_salary_rule_medical'), ref('hr_salary_rule_da'), ref('hr_salary_rule_lta'), ref('hr_salary_rule_telephone'), ref('hr_salary_rule_internet'), ref('hr_payroll_rule_child1'), ref('hr_salary_rule_gratuity')])]" name="rule_ids"/>
|
||||
<field name="company_id" ref="base.main_company"/>
|
||||
<field name="parent_id" ref="hr_payroll.structure_base"/>
|
||||
</record>
|
||||
|
|
Loading…
Reference in New Issue