← Back to branch summary

~openerp-commiter/openobject-addons/trunk-payroll-india-rules-psi

~openerp-commiter/openobject-addons/trunk-payroll-india-rules-psi

Viewing all changes in revision 4505.

Committer: psi(Open ERP)
Date: 2011-06-30 11:05:42 UTC
mfrom: (4495.8.3 trunk-payroll-india)
Revision ID: psi@tinyerp.co.in-20110630110542-nonvpyrdrq24p4ix

[MERGE] hr_payroll_l10n_in: Merge with main branch

files added:
hr_payroll/report/report_contribution_register.py

hr_payroll/report/report_contribution_register.rml

hr_payroll/report/report_contribution_register.sxw

hr_payroll/wizard/hr_payroll_contribution_register_report.py

hr_payroll/wizard/hr_payroll_contribution_register_report.xml

files removed:
hr_payroll/hr_payroll_wizard.xml

hr_payroll/images/hr_payment_advice.jpeg

hr_payroll/images/hr_payroll_register.jpeg

hr_payroll/report/payment_advice.sxw

hr_payroll/report/payroll_register.rml

hr_payroll/report/payroll_register.sxw

hr_payroll/report/payslip.rml

hr_payroll/report/payslip.sxw

hr_payroll/report/report_emp_salary_structure.py

hr_payroll/report/report_emp_salary_structure.rml

hr_payroll/report/report_emp_salary_structure.sxw

hr_payroll/report/report_employees_detail.py

hr_payroll/report/report_employees_detail.rml

hr_payroll/report/report_employees_detail.sxw

hr_payroll/report/report_payroll_advice.py

hr_payroll/report/report_payroll_advice.rml

hr_payroll/report/report_payroll_register.py

hr_payroll/report/report_year_report.rml

hr_payroll/report/report_year_report.sxw

hr_payroll/report/report_year_salary.py

hr_payroll/test/payment_advice.yml

hr_payroll/test/payroll_register.yml

hr_payroll/wizard/hr_payroll_employees_detail.py

hr_payroll/wizard/hr_payroll_employees_detail.xml

hr_payroll/wizard/hr_payroll_year_salary.py

hr_payroll/wizard/hr_payroll_year_salary.xml

files modified:
hr_payroll/__openerp__.py

hr_payroll/hr_payroll.py

hr_payroll/hr_payroll_data.xml

hr_payroll/hr_payroll_report.xml

hr_payroll/hr_payroll_sequence.xml

hr_payroll/hr_payroll_view.xml

hr_payroll/report/__init__.py

hr_payroll/report/report_payslip.rml

hr_payroll/report/report_payslip.sxw

hr_payroll/report/report_payslip_details.py

hr_payroll/report/report_payslip_details.rml

hr_payroll/report/report_payslip_details.sxw

hr_payroll/test/hr_payroll_report.yml

hr_payroll/wizard/__init__.py

Show diffs side-by-side

added added

removed removed

hr_payroll/__openerp__.py

hr_payroll/hr_payroll.py

hr_payroll/hr_payroll_data.xml

hr_payroll/hr_payroll_report.xml

hr_payroll/hr_payroll_sequence.xml

hr_payroll/hr_payroll_view.xml

hr_payroll/hr_payroll_wizard.xml

hr_payroll/images/hr_payment_advice.jpeg

hr_payroll/images/hr_payroll_register.jpeg

hr_payroll/report/__init__.py

hr_payroll/report/payment_advice.sxw

hr_payroll/report/payroll_register.rml

hr_payroll/report/payroll_register.sxw

hr_payroll/report/payslip.rml

hr_payroll/report/payslip.sxw

hr_payroll/report/report_contribution_register.py

hr_payroll/report/report_contribution_register.rml

hr_payroll/report/report_contribution_register.sxw

hr_payroll/report/report_emp_salary_structure.py

hr_payroll/report/report_emp_salary_structure.rml

hr_payroll/report/report_emp_salary_structure.sxw

hr_payroll/report/report_employees_detail.py

hr_payroll/report/report_employees_detail.rml

hr_payroll/report/report_employees_detail.sxw

hr_payroll/report/report_payroll_advice.py

hr_payroll/report/report_payroll_advice.rml

hr_payroll/report/report_payroll_register.py

hr_payroll/report/report_payslip.rml

hr_payroll/report/report_payslip.sxw

hr_payroll/report/report_payslip_details.py

hr_payroll/report/report_payslip_details.rml

hr_payroll/report/report_payslip_details.sxw

hr_payroll/report/report_year_report.rml

hr_payroll/report/report_year_report.sxw

hr_payroll/report/report_year_salary.py

hr_payroll/test/hr_payroll_report.yml

hr_payroll/test/payment_advice.yml

hr_payroll/test/payroll_register.yml

hr_payroll/wizard/__init__.py

hr_payroll/wizard/hr_payroll_contribution_register_report.py

hr_payroll/wizard/hr_payroll_contribution_register_report.xml

hr_payroll/wizard/hr_payroll_employees_detail.py

hr_payroll/wizard/hr_payroll_employees_detail.xml

hr_payroll/wizard/hr_payroll_year_salary.py

hr_payroll/wizard/hr_payroll_year_salary.xml

Older »