Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-for-caribou-jam-l10n-in-hr-payroll-fix-tch into lp:~openerp-dev/openobject-addons/trunk-for-caribou-jam

  1. trunk-for-caribou-jam-l10n-in-hr-payroll-fix-tch
  2. Merge into trunk-for-caribou-jam
Proposed by Twinkle Christian(OpenERP)
Status: Merged
Merged at revision: 7057
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-for-caribou-jam-l10n-in-hr-payroll-fix-tch
Merge into: lp:~openerp-dev/openobject-addons/trunk-for-caribou-jam
Diff against target: 13 lines (+4/-4)
1 file modified
l10n_in_hr_payroll/data/hr.salary.rule.csv (+4/-4)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-for-caribou-jam-l10n-in-hr-payroll-fix-tch
Reviewer Review Type Date Requested Status
Jigar A. Pending
Review via email: mp+127738@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_in_hr_payroll/data/hr.salary.rule.csv'
2--- l10n_in_hr_payroll/data/hr.salary.rule.csv 2012-08-29 09:42:52 +0000
3+++ l10n_in_hr_payroll/data/hr.salary.rule.csv 2012-10-03 12:28:24 +0000
4@@ -1,5 +1,5 @@
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"
6-1,"fix",1,1,,100,"Education Allowance For One Child","Allowance",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
7-2,"fix",2,10,,200,"Education Allowance For Two Child","Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
8-3,"fix",1,1,,300,"Child Hostel Allowance For One Child","Allowance",26,"CHOONE","hr_payroll_rule_child2","range","employee.children",
9-4,"fix",2,10,,600,"Child Hostel Allowance For Two Child","Allowance",27,"CHOTWO","hr_payroll_rule_child2","range","employee.children",
10+1,"fix",1,1,,100,"Education Allowance For One Child","hr_payroll.ALW",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
11+2,"fix",2,10,,200,"Education Allowance For Two Child","hr_payroll.ALW",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
12+3,"fix",1,1,,300,"Child Hostel Allowance For One Child","hr_payroll.ALW",26,"CHOONE","hr_payroll_rule_child2","range","employee.children",
13+4,"fix",2,10,,600,"Child Hostel Allowance For Two Child","hr_payroll.ALW",27,"CHOTWO","hr_payroll_rule_child2","range","employee.children",

Subscribers

People subscribed via source and target branches

to all changes: