Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra-salary-head-category-kbh
into lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-india-mra-salary-head-category-kbh/+merge/118887
Hello,
l10n_in_hr_payroll:
I have added category field on wizard for selecting categories of salary rules
and improved code of report by using this field.
Thanks,
KBH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-india-mra-salary-head-category-kbh/+merge/118887
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra-salary-head-category-kbh
into lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra.
=== modified file 'l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py'
--- l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py 2012-07-26 05:41:02 +0000
+++ l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py 2012-08-09 07:28:22 +0000
@@ -68,20 +68,18 @@
self.mnths.append('None')
return [mnth_name]
- def get_salary(self, form, emp_id, emp_salary, total_mnths):
- emp_obj = self.pool.get('hr.employee')
- date_from = form.get('start_date', [])
- date_to = form.get('end_date', [])
- emp_ids = form.get('employee_ids', [])
- employees = emp_obj.browse(self.cr, self.uid, emp_ids, context=self.context)
+ def get_salary(self, form, emp_id, emp_salary, total_mnths, category):
+ ids = []
+ category_ids = form.get('category_id', [])
+ ids.append(category_ids[0])
- self.cr.execute("select to_char(date_to,'mm-yyyy') as to_date ,sum(pl.total) as net \
+ self.cr.execute("select to_char(date_to,'mm-yyyy') as to_date ,sum(pl.total) \
from hr_payslip_line as pl \
left join hr_payslip as p on pl.slip_id = p.id \
left join hr_employee as emp on emp.id = p.employee_id \
left join resource_resource as r on r.id = emp.resource_id \
- where pl.code = 'NET' and p.state = 'done' and p.employee_id = %s \
- group by r.name, p.date_to,emp.id",(emp_id,))
+ where p.state = 'done' and p.employee_id = %s and pl.category_id in %s \
+ group by r.name, p.date_to,emp.id",(emp_id,tuple(ids),))
sal = self.cr.fetchall()
salary = dict(sal)
total = 0.0
@@ -107,6 +105,7 @@
emp_salary = []
salary_list = []
total_mnths=['Total', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+ category = form.get('category_id', [])
emp_obj = self.pool.get('hr.employee')
emp_ids = form.get('employee_ids', [])
employees = emp_obj.browse(self.cr, self.uid, emp_ids, context=self.context)
@@ -114,7 +113,7 @@
for emp_id in employees:
emp_salary.append(emp_id.name)
total = 0.0
- emp_salary, total, total_mnths = self.get_salary(form, emp_id.id, emp_salary, total_mnths)
+ emp_salary, total, total_mnths = self.get_salary(form, emp_id.id, emp_salary, total_mnths, category)
emp_salary.append(total)
salary_list.append(emp_salary)
emp_salary = []
=== modified file 'l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py'
--- l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py 2012-08-08 06:23:15 +0000
+++ l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py 2012-08-09 07:28:22 +0000
@@ -31,6 +31,7 @@
'start_date': fields.date('Start Date', required=True),
'end_date': fields.date('End Date', required=True),
'employee_ids': fields.many2many('hr.employee', 'payroll_year_rel', 'payroll_year_id', 'employee_id', 'Employees', required=True),
+ 'category_id': fields.many2one('hr.salary.rule.category', 'Category', required=True),
}
_defaults = {
@@ -51,7 +52,7 @@
context = {}
datas = {'ids': context.get('active_ids', [])}
- res = self.read(cr, uid, ids, ['employee_ids', 'start_date', 'end_date'], context=context)
+ res = self.read(cr, uid, ids, ['category_id', 'employee_ids', 'start_date', 'end_date'], context=context)
res = res and res[0] or {}
datas.update({'form': res})
return {
=== modified file 'l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml'
--- l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml 2012-08-08 07:04:14 +0000
+++ l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml 2012-08-09 07:28:22 +0000
@@ -16,6 +16,7 @@
<group>
<field name="start_date"/>
<field name="end_date"/>
+ <field name="category_id"/>
<separator string="Employees" />
<field name="employee_ids" nolabel="1" colspan="4"/>
</group>
_______________________________________________
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
