OpenERP India

Merge lp://qastaging/~openerp-dev/openerp-india/payroll-india-trunk-improve-salary-rules-kbh into lp://qastaging/~openerp-dev/openerp-india/payroll-india-trunk

  1. payroll-india-trunk-improve-salary-rules-kbh
  2. Merge into payroll-india-trunk
Proposed by Khushboo Bhatt(openerp)
Status: Merged
Merge reported by: Mustufa Rangwala (Open ERP)
Merged at revision: not available
Proposed branch: lp://qastaging/~openerp-dev/openerp-india/payroll-india-trunk-improve-salary-rules-kbh
Merge into: lp://qastaging/~openerp-dev/openerp-india/payroll-india-trunk
Diff against target: 874 lines (+363/-199)
7 files modified
hr_payroll/hr_payroll_demo.xml (+0/-8)
l10n_in_hr_payroll/__openerp__.py (+4/-3)
l10n_in_hr_payroll/data/hr.salary.rule.csv (+6/-9)
l10n_in_hr_payroll/l10n_in_hr_payroll.py (+60/-1)
l10n_in_hr_payroll/l10n_in_hr_payroll_data.xml (+256/-171)
l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml (+37/-6)
l10n_in_hr_payroll/security/hr.salary.rule.csv (+0/-1)
To merge this branch: bzr merge lp://qastaging/~openerp-dev/openerp-india/payroll-india-trunk-improve-salary-rules-kbh
Reviewer Review Type Date Requested Status
Mustufa Rangwala (Open ERP) Approve
Khushboo Bhatt(openerp) Pending
Review via email: mp+107199@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-05-23.

Description of the change

Hello,

 code improved as per suggestion.

Thank you,
KBH.

To post a comment you must log in.
Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) wrote : Posted in a previous version of this proposal

- Correct salary rules code, Dont use _ in the code while defining salary rules.
- Gratuity rule is not working.
- Put description on rule in proper text.
- import in py file should be defined as per pep8 standard.
- recheck line 162-168 again, I dont find any difference there.
- on contract: No_of_year do not define field start with capital just use number_of_year and allow user to write on that function field.
- Use tooltip to expalin all the fields defined on contact for payslip
- remove CEA category we should use allowance
- fix security folder, hr.salaray.head object has been removed.

Thanks,
Mustufa

review: Needs Fixing
Revision history for this message
Khushboo Bhatt(openerp) (kbh-openerp) wrote : Posted in a previous version of this proposal

Hello,
  ===l10_in_payroll====
     changes done as per your suggestion.
     Added salary rule for child hostel allowance.

Thank you,
KBH.

review: Needs Resubmitting
Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) wrote : Posted in a previous version of this proposal

Hello,

Please fix below points.

- sequence of hra rules shoule be near to basic sequence and change seq for all rules as per standard payslip display.
- food coupon: remove condition and put it inside the Allowance group, remove quantity from salary rules as its python code we never use qty with it.
- Child Education Allowance CEA refactor.
- Separate hostel allowance from Eduction allowance
- Gratuity + VPF rules not working

Thanks,
Mustufa

review: Needs Fixing
Revision history for this message
Khushboo Bhatt(openerp) (kbh-openerp) wrote : Posted in a previous version of this proposal

Hello,

 Code improved as per your suggestion.

Thank you,
KBH.

> Hello,
>
> Please fix below points.
>
> - sequence of hra rules shoule be near to basic sequence and change seq for
> all rules as per standard payslip display.
> - food coupon: remove condition and put it inside the Allowance group, remove
> quantity from salary rules as its python code we never use qty with it.
> - Child Education Allowance CEA refactor.
> - Separate hostel allowance from Eduction allowance
> - Gratuity + VPF rules not working
>
> Thanks,
> Mustufa

Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: