Merge lp:~openerp-dev/openerp-india/payroll-india-l10n_in_hr_payroll-improvements-kbh into lp:~openerp-dev/openerp-india/payroll-india
Proposed by
Khushboo Bhatt(openerp)
Status: | Merged |
---|---|
Merge reported by: | Mustufa Rangwala (Open ERP) |
Merged at revision: | not available |
Proposed branch: | lp:~openerp-dev/openerp-india/payroll-india-l10n_in_hr_payroll-improvements-kbh |
Merge into: | lp:~openerp-dev/openerp-india/payroll-india |
Diff against target: |
166 lines (+33/-8) 3 files modified
l10n_in_hr_payroll/data/hr.salary.rule.csv (+2/-2) l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml (+29/-4) l10n_in_hr_payroll/l10n_in_hr_payroll.py (+2/-2) |
To merge this branch: | bzr merge lp:~openerp-dev/openerp-india/payroll-india-l10n_in_hr_payroll-improvements-kbh |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP R&D Team | Pending | ||
Review via email: mp+121844@code.launchpad.net |
Description of the change
Hello,
l10n_
I have done following changes.
- salary rules changed as per specification.
- description added in salary rules.
- help added on fields of contracts.
- rules based on employer/company are made invisible in payslips.
Thanks,
KBH.
To post a comment you must log in.