odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] improve the newly created wizard as per requirment suggested 

bzr revid: psi@tinyerp.co.in-20110426102656-s2lfltvnkkvzz6ve
This commit is contained in:
psi (Open ERP) 2011-04-26 15:56:56 +05:30
parent ea9ab772d6
commit e425496f88
4 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_payroll/hr_payroll.py
View File

@ -265,7 +265,7 @@ class hr_payslip(osv.osv):
'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}),
'details_by_salary_head': fields.function(_get_lines_salary_head, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Head'),
'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another"),
'payslip_group_id': fields.many2one('hr.payslip.groups', 'Group', readonly=True, states={'draft': [('readonly', False)]}),
'payslip_group_id': fields.many2one('hr.payslip.groups', 'Payslip Group', readonly=True, states={'draft': [('readonly', False)]}),
}
_defaults = {
'date_from': lambda *a: time.strftime('%Y-%m-01'),

18
addons/hr_payroll/hr_payroll_view.xml
View File

@ -601,12 +601,23 @@
<act_window domain="[('slip_id', '=', active_id)]" id="act_payslip_lines" name="Payslip Lines" res_model="hr.payslip.line" src_model="hr.payslip"/>
<record id="hr_payslip_category_filter" model="ir.ui.view">
<field name="name">hr.payslip.category.search</field>
<field name="model">hr.payslip.groups</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Payslips Group">
<field name="name"/>
</search>
</field>
</record>
<record id="hr_payslip_category_tree" model="ir.ui.view">
<field name="name">hr.payslip.category.tree</field>
<field name="model">hr.payslip.groups</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Payslip Groups">
<tree string="Payslips Group">
<field name="name"/>
</tree>
</field>
@ -617,7 +628,7 @@
<field name="model">hr.payslip.groups</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Payslip by Category">
<form string="Payslips Group">
<group colspan="4">
<field name="name"/>
</group>
@ -627,10 +638,11 @@
</record>
<record id="action_hr_payslip_category_tree" model="ir.actions.act_window">
<field name="name">Payslips by Category</field>
<field name="name">Payslip Groups</field>
<field name="res_model">hr.payslip.groups</field>
<field name="view_type">form</field>
<field name="view_id" ref="hr_payslip_category_tree"/>
<field name="search_view_id" ref="hr_payslip_category_filter"/>
</record>
<menuitem action="action_hr_payslip_category_tree" id="menu_hr_payslip_category" parent="menu_hr_root_payroll"/>
</data>

40
addons/hr_payroll/wizard/hr_payroll_payslips_by_category.py
View File

@ -20,39 +20,43 @@
##############################################################################
from osv import fields, osv
import netsvc
from tools.translate import _
class hr_payroll_payslip_groups(osv.osv_memory):
class hr_payslip_category(osv.osv_memory):
_name ='hr.payroll.payslip.groups'
_name ='hr.payslip.category'
_columns = {
'employee_category': fields.many2one('hr.employee.category', 'Employee Category', required=True),
'category_id': fields.many2one('hr.employee.category', 'Employee Category', required=True),
}
def compute_sheet(self, cr, uid, ids, context=None):
emp_pool = self.pool.get('hr.employee')
slip_pool = self.pool.get('hr.payslip')
wf_service = netsvc.LocalService("workflow")
if context is None:
context = {}
data = self.read(cr, uid, ids, context=context)[0]
cr.execute('SELECT DISTINCT emp_id FROM employee_category_rel WHERE category_id = %s', (data['employee_category'][0], ))
emp_ids = filter(None, map(lambda x:x[0], cr.fetchall()))
cr.execute('SELECT DISTINCT emp_id FROM employee_category_rel WHERE category_id = %s', (data['category_id'][0], ))
emp_ids = [x[0] for x in cr.fetchall()]
if not emp_ids:
raise osv.except_osv(_("Warning !"), _("No employee(s) found for '%s' category!") % (data['category_id'][1]))
slip_ids = []
for emp in emp_pool.browse(cr, uid, emp_ids, context=context):
old_slips = slip_pool.search(cr, uid, [('employee_id','=', emp.id)], context=context)
old_slips = slip_pool.search(cr, uid, [('employee_id', '=', emp.id),('state', '=', 'draft')], context=context)
if old_slips:
slip_pool.write(cr, uid, old_slips, {'payslip_group_id': context.get('active_id', False)}, context=context)
for sid in old_slips:
wf_service.trg_validate(uid, 'hr.payslip', sid, 'compute_sheet', cr)
for id in context.get('active_ids'):
slip_pool.write(cr, uid, old_slips, {'payslip_group_id': id}, context=context)
slip_ids.extend(old_slips)
else:
res = {
'employee_id': emp.id,
'payslip_group_id': context.get('active_id', False),
}
slip_id = slip_pool.create(cr, uid, res, context=context)
wf_service.trg_validate(uid, 'hr.payslip', slip_id, 'compute_sheet', cr)
for id in context.get('active_ids'):
res = {
'employee_id': emp.id,
'payslip_group_id': id,
}
slip_id = slip_pool.create(cr, uid, res, context=context)
slip_ids.append(slip_id)
slip_pool.compute_sheet(cr, uid, slip_ids, context=context)
return {'type': 'ir.actions.act_window_close'}
hr_payroll_payslip_groups()
hr_payslip_category()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

15
addons/hr_payroll/wizard/hr_payroll_payslips_by_category.xml
View File

@ -4,27 +4,27 @@
<record id="view_hr_payslip_by_category" model="ir.ui.view">
<field name="name">hr_payroll_payslip_category</field>
<field name="model">hr.payroll.payslip.groups</field>
<field name="model">hr.payslip.category</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Employee Category">
<group colspan="4" >
<separator string="Select Employee Category" colspan="4"/>
<field name="employee_category"/>
<separator string="This wizard will generate payslips based on employee(s) category" colspan="4"/>
<field name="category_id"/>
</group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Generate Payslip" name="compute_sheet" type="object"/>
<button icon="terp-gtk-go-back-rtl" string="Generate" name="compute_sheet" type="object"/>
</group>
</form>
</field>
</record>
<record id="action_hr_payslip_by_category" model="ir.actions.act_window">
<field name="name">Generate Payslips by Category</field>
<field name="res_model">hr.payroll.payslip.groups</field>
<field name="name">Generate Payslips</field>
<field name="res_model">hr.payslip.category</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_hr_payslip_by_category"/>
@ -34,10 +34,9 @@
<record id="action_idea_post_vote_values" model="ir.values">
<field name="model_id" ref="model_hr_payslip_groups" />
<field name="object" eval="1" />
<field name="name">Generate Payslips by Category</field>
<field name="name">Generate Payslips</field>
<field name="key2">client_action_multi</field>
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_payslip_by_category'))"/>
<field name="key">action</field>
<field name="model">hr.payslip.groups</field>
</record>