Twinkle Christian(OpenERP) has proposed merging 
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.

Requested reviews:
  Jigar Amin  (OpenERP) (jam-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-for-caribou-jam-l10n-in-hr-payroll-fix-tch/+merge/127738
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-for-caribou-jam-l10n-in-hr-payroll-fix-tch/+merge/127738
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-for-caribou-jam.
=== modified file 'l10n_in_hr_payroll/data/hr.salary.rule.csv'
--- l10n_in_hr_payroll/data/hr.salary.rule.csv	2012-08-29 09:42:52 +0000
+++ l10n_in_hr_payroll/data/hr.salary.rule.csv	2012-10-03 12:28:24 +0000
@@ -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",
+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",

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to