odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] l10n_in_hr_payroll: use xmlid instead of name searching salary rule categories (they may have been renamed, forbidding upgrade) 

bzr revid: chs@openerp.com-20131120100623-ip33s4upffu1a52h
This commit is contained in:
Christophe Simonis 2013-11-20 11:06:23 +01:00
parent c79b600b1d
commit da00eab39a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
View File

@ -1,5 +1,5 @@
"id","amount_select","condition_range_min","condition_range_max","amount_percentage","amount_fix","name","category_id","sequence","code","parent_rule_id/id","condition_select","condition_range","amount_percentage_base"
1,"fix",1,1,,100,"Education Allowance For One Child","Allowance",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
2,"fix",2,10,,200,"Education Allowance For Two Child","Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
3,"fix",1,1,,300,"Child Hostel Allowance For One Child","Allowance",26,"CHOONE","hr_payroll_rule_child2","range","employee.children",
4,"fix",2,10,,600,"Child Hostel Allowance For Two Child","Allowance",27,"CHOTWO","hr_payroll_rule_child2","range","employee.children",
"id","amount_select","condition_range_min","condition_range_max","amount_percentage","amount_fix","name","category_id/id","sequence","code","parent_rule_id/id","condition_select","condition_range","amount_percentage_base"
1,"fix",1,1,,100,"Education Allowance For One Child",hr_payroll.ALW,23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
2,"fix",2,10,,200,"Education Allowance For Two Child",hr_payroll.ALW,24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
3,"fix",1,1,,300,"Child Hostel Allowance For One Child",hr_payroll.ALW,26,"CHOONE","hr_payroll_rule_child2","range","employee.children",
4,"fix",2,10,,600,"Child Hostel Allowance For Two Child",hr_payroll.ALW,27,"CHOTWO","hr_payroll_rule_child2","range","employee.children",

1 id amount_select condition_range_min condition_range_max amount_percentage amount_fix name category_id category_id/id sequence code parent_rule_id/id condition_select condition_range amount_percentage_base
2 1 fix 1 1 100 Education Allowance For One Child Allowance hr_payroll.ALW 23 CHEAONE hr_payroll_rule_child1 range employee.children
3 2 fix 2 10 200 Education Allowance For Two Child Allowance hr_payroll.ALW 24 CHEATWO hr_payroll_rule_child1 range employee.children
4 3 fix 1 1 300 Child Hostel Allowance For One Child Allowance hr_payroll.ALW 26 CHOONE hr_payroll_rule_child2 range employee.children
5 4 fix 2 10 600 Child Hostel Allowance For Two Child Allowance hr_payroll.ALW 27 CHOTWO hr_payroll_rule_child2 range employee.children