pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] child alw (because deleted head in xml and referenced in csv file

Browse Source 
bzr revid: osenda-20110412082952-wgf73mzgl3fgg48x
This commit is contained in:
Osenda
2011-04-12 10:29:52 +02:00
parent 8eb2155874
commit fe5f075f5f
3 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_payroll/hr_payroll_data.xml
+1 -1
View File
@@ -115,7 +115,7 @@
<field name="code">TDS</field>
<field name="parent_id" ref="DED"/>
<field name="name">Tax Deduct at Source</field>
<field name="sequence" eval="65"/>
</record>
<record id="LWP" model="hr.salary.head">
addons/hr_payroll_l10n_be/data/hr.salary.rule.csv
+31 -32
View File
@@ -1,14 +1,14 @@
"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",0,480,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
2,"fix",480,495,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
3,"fix",495,510,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
4,"fix",510,525,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
5,"fix",525,540,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
6,"fix",540,555,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
7,"fix",555,570,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
8,"fix",570,585,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
9,"fix",585,600,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
10,"fix",600,615,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
1,"fix",0,480,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
2,"fix",480,495,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
3,"fix",495,510,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
4,"fix",510,525,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
5,"fix",525,540,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
6,"fix",540,555,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
7,"fix",555,570,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
8,"fix",570,585,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
9,"fix",585,600,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
10,"fix",600,615,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
11,"fix",615,630,,-1.58,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
12,"fix",630,645,,-5.19,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
13,"fix",645,660,,-8.8,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
@@ -470,18 +470,18 @@
469,"fix",7485,7500,,-3356.32,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
470,"fix",7500,7500,,-3364.34,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_bareme","range","rules['GROSS']",
,,,,,,,,,,,,,
471,"fix",0,960,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
472,"fix",960,975,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
473,"fix",975,990,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
474,"fix",990,1005,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
475,"fix",1005,1020,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
476,"fix",1020,1035,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
477,"fix",1035,1050,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
478,"fix",1050,1065,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
479,"fix",1065,1080,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
480,"fix",1080,1095,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
481,"fix",1095,1110,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
482,"fix",1110,1125,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
471,"fix",0,960,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
472,"fix",960,975,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
473,"fix",975,990,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
474,"fix",990,1005,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
475,"fix",1005,1020,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
476,"fix",1020,1035,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
477,"fix",1035,1050,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
478,"fix",1050,1065,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
479,"fix",1065,1080,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
480,"fix",1080,1095,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
481,"fix",1095,1110,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
482,"fix",1110,1125,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
483,"fix",1125,1140,,-3.28,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
484,"fix",1140,1155,,-7.09,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
485,"fix",1155,1170,,-11.33,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
@@ -909,7 +909,7 @@
907,"fix",7485,7500,,-3027.11,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
908,"fix",7500,7500,,-3035.14,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeII","range","rules['GROSS']",
,,,,,,,,,,,,,
909,"fix",0,15,,-0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeIII","range","rules['GROSS']",
909,"fix",0,15,,0,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeIII","range","rules['GROSS']",
910,"fix",15,30,,-2.86,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeIII","range","rules['GROSS']",
911,"fix",30,45,,-5.72,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeIII","range","rules['GROSS']",
912,"fix",45,60,,-8.58,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeIII","range","rules['GROSS']",
@@ -1411,12 +1411,11 @@
1408,"fix",7485,7500,,-3480.71,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeIII","range","rules['GROSS']",
1409,"fix",7500,7500,,-3488.73,"Precompte Professionnel","Precompte Professionnel Bareme 2011",130,"P.P","hr_payroll_rules_baremeIII","range","rules['GROSS']",
,,,,,,,,,,,,,
1410,"fix",1,1,,31,"Child Allowance Belgium","Child Allowance Belgium",51,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
1411,"fix",2,2,,85,"Child Allowance Belgium","Child Allowance Belgium",51,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
1412,"fix",3,3,,229,"Child Allowance Belgium","Child Allowance Belgium",51,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
1413,"fix",4,4,,418,"Child Allowance Belgium","Child Allowance Belgium",51,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
1414,"fix",5,5,,618,"Child Allowance Belgium","Child Allowance Belgium",51,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
1415,"fix",6,6,,817,"Child Allowance Belgium","Child Allowance Belgium",51,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
1416,"fix",7,7,,1016,"Child Allowance Belgium","Child Allowance Belgium",51,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
1417,"fix",8,8,,1231,"Child Allowance Belgium","Child Allowance Belgium",51,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
,,,,,,,,,,,,,
1410,"fix",1,1,,31,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
1411,"fix",2,2,,85,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
1412,"fix",3,3,,229,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
1413,"fix",4,4,,418,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
1414,"fix",5,5,,618,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
1415,"fix",6,6,,817,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
1416,"fix",7,7,,1016,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
1417,"fix",8,8,,1231,"Child Allowance Belgium","Child Allowance Belgium",140,"Ch.A","hr_payroll_rules_child_alw","range","employee.children",
1 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
2 1 fix 0 480 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_bareme range rules['GROSS']
3 2 fix 480 495 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_bareme range rules['GROSS']
4 3 fix 495 510 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_bareme range rules['GROSS']
5 4 fix 510 525 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_bareme range rules['GROSS']
6 5 fix 525 540 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_bareme range rules['GROSS']
7 6 fix 540 555 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_bareme range rules['GROSS']
8 7 fix 555 570 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_bareme range rules['GROSS']
9 8 fix 570 585 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_bareme range rules['GROSS']
10 9 fix 585 600 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_bareme range rules['GROSS']
11 10 fix 600 615 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_bareme range rules['GROSS']
12 11 fix 615 630 -1.58 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_bareme range rules['GROSS']
13 12 fix 630 645 -5.19 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_bareme range rules['GROSS']
14 13 fix 645 660 -8.8 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_bareme range rules['GROSS']
470 469 fix 7485 7500 -3356.32 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_bareme range rules['GROSS']
471 470 fix 7500 7500 -3364.34 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_bareme range rules['GROSS']
472
473 471 fix 0 960 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
474 472 fix 960 975 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
475 473 fix 975 990 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
476 474 fix 990 1005 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
477 475 fix 1005 1020 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
478 476 fix 1020 1035 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
479 477 fix 1035 1050 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
480 478 fix 1050 1065 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
481 479 fix 1065 1080 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
482 480 fix 1080 1095 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
483 481 fix 1095 1110 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
484 482 fix 1110 1125 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
485 483 fix 1125 1140 -3.28 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
486 484 fix 1140 1155 -7.09 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
487 485 fix 1155 1170 -11.33 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
909 907 fix 7485 7500 -3027.11 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
910 908 fix 7500 7500 -3035.14 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeII range rules['GROSS']
911
912 909 fix 0 15 -0 0 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeIII range rules['GROSS']
913 910 fix 15 30 -2.86 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeIII range rules['GROSS']
914 911 fix 30 45 -5.72 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeIII range rules['GROSS']
915 912 fix 45 60 -8.58 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeIII range rules['GROSS']
1411 1408 fix 7485 7500 -3480.71 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeIII range rules['GROSS']
1412 1409 fix 7500 7500 -3488.73 Precompte Professionnel Precompte Professionnel Bareme 2011 130 P.P hr_payroll_rules_baremeIII range rules['GROSS']
1413
1414 1410 fix 1 1 31 Child Allowance Belgium Child Allowance Belgium 51 140 Ch.A hr_payroll_rules_child_alw range employee.children
1415 1411 fix 2 2 85 Child Allowance Belgium Child Allowance Belgium 51 140 Ch.A hr_payroll_rules_child_alw range employee.children
1416 1412 fix 3 3 229 Child Allowance Belgium Child Allowance Belgium 51 140 Ch.A hr_payroll_rules_child_alw range employee.children
1417 1413 fix 4 4 418 Child Allowance Belgium Child Allowance Belgium 51 140 Ch.A hr_payroll_rules_child_alw range employee.children
1418 1414 fix 5 5 618 Child Allowance Belgium Child Allowance Belgium 51 140 Ch.A hr_payroll_rules_child_alw range employee.children
1419 1415 fix 6 6 817 Child Allowance Belgium Child Allowance Belgium 51 140 Ch.A hr_payroll_rules_child_alw range employee.children
1420 1416 fix 7 7 1016 Child Allowance Belgium Child Allowance Belgium 51 140 Ch.A hr_payroll_rules_child_alw range employee.children
1421 1417 fix 8 8 1231 Child Allowance Belgium Child Allowance Belgium 51 140 Ch.A hr_payroll_rules_child_alw range employee.children
addons/hr_payroll_l10n_be/hr_payroll_l10n_be_data.xml
+7 -1
View File
@@ -24,6 +24,12 @@
<field name="code">C.C.</field>
<field name="parent_id" ref="hr_payroll.ALW"/>
</record>
<record id="hr_payroll_head_child_alw" model="hr.salary.head">
<field name="name">Child Allowance Belgium</field>
<field name="code">Ch.A</field>
<field name="parent_id" ref="hr_payroll.DED"/>
</record>
<!-- HR SALAR RULES-->
@@ -159,7 +165,7 @@
</record>
<record id="hr_payroll_rules_ch_value" model="hr.salary.rule">
<field name="category_id" ref="hr_payroll.COMP"/>
<field name="category_id" ref="hr_payroll.DED"/>
<field name="parent_rule_id" ref="hr_payroll_rules_parent_ch"/>
<field name="name">Check Value Meal, Company Part</field>
<field name="code">Ch.M.</field>