diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py index 87fe437a1db..44c0fb93506 100644 --- a/addons/hr_payroll/__openerp__.py +++ b/addons/hr_payroll/__openerp__.py @@ -49,6 +49,7 @@ Generic Payroll system. ], 'update_xml': [ 'security/hr_security.xml', + 'wizard/hr_payroll_payslips_by_employees.xml', 'hr_payroll_view.xml', 'hr_payroll_workflow.xml', 'hr_payroll_sequence.xml', diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 386ecbc37e9..87c996e9690 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -165,17 +165,17 @@ class contrib_register(osv.osv): contrib_register() -class hr_salary_category(osv.osv): +class hr_salary_rule_category(osv.osv): """ - HR Salary Category + HR Salary Rule Category """ - _name = 'hr.salary.category' - _description = 'Salary Category' + _name = 'hr.salary.rule.category' + _description = 'Salary Rule Category' _columns = { 'name':fields.char('Name', size=64, required=True, readonly=False), 'code':fields.char('Code', size=64, required=True, readonly=False), - 'parent_id':fields.many2one('hr.salary.category', 'Parent', help="Linking a salary category to its parent is used only for the reporting purpose."), + 'parent_id':fields.many2one('hr.salary.rule.category', 'Parent', help="Linking a salary category to its parent is used only for the reporting purpose."), 'note': fields.text('Description'), 'company_id':fields.many2one('res.company', 'Company', required=False), } @@ -186,7 +186,7 @@ class hr_salary_category(osv.osv): context=context).company_id.id, } -hr_salary_category() +hr_salary_rule_category() class one2many_mod2(fields.one2many): @@ -203,6 +203,29 @@ class one2many_mod2(fields.one2many): res[r[self._fields_id]].append( r['id'] ) return res +class hr_payslip_run(osv.osv): + + _name = 'hr.payslip.run' + _columns = { + 'name': fields.char('Name', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}), + 'slip_ids': fields.one2many('hr.payslip', 'payslip_run_id', 'Payslips', required=False, readonly=True, states={'draft': [('readonly', False)]}), + 'state': fields.selection([ + ('draft', 'Draft'), + ('close', 'Close'), + ], 'State', select=True, readonly=True) + } + _defaults = { + 'state': 'draft', + } + + def draft_payslip_run(self, cr, uid, ids, context=None): + return self.write(cr, uid, ids, {'state': 'draft'}, context=context) + + def close_payslip_run(self, cr, uid, ids, context=None): + return self.write(cr, uid, ids, {'state': 'close'}, context=context) + +hr_payslip_run() + class hr_payslip(osv.osv): ''' Pay Slip @@ -214,22 +237,23 @@ class hr_payslip(osv.osv): def __init__(self, pool, cr): super(hr_payslip, self).__init__(pool, cr) self.cr = cr - - def _get_lines_salary_category(self, cr, uid, ids, field_names, arg=None, context=None): + + def _get_lines_salary_rule_category(self, cr, uid, ids, field_names, arg=None, context=None): result = {} if not ids: return result + for id in ids: + result.setdefault(id, []) cr.execute('''SELECT pl.slip_id, pl.id FROM hr_payslip_line AS pl \ - LEFT JOIN hr_salary_category AS sh on (pl.category_id = sh.id) \ + LEFT JOIN hr_salary_rule_category AS sh on (pl.category_id = sh.id) \ WHERE pl.slip_id in %s \ GROUP BY pl.slip_id, pl.sequence, pl.id ORDER BY pl.sequence''',(tuple(ids),)) res = cr.fetchall() for r in res: - result.setdefault(r[0], []) result[r[0]].append(r[1]) return result _columns = { - 'struct_id': fields.many2one('hr.payroll.structure', 'Structure', help='Defines the rules that have to be applied to this payslip, accordingly to the contract chosen. If you let empty the field contract, this field isn\'t mandatory anymore and thus the rules applied will be all the rules set on the structure of all contracts of the employee valid for the chosen period'), + 'struct_id': fields.many2one('hr.payroll.structure', 'Structure', readonly=True, states={'draft': [('readonly', False)]}, help='Defines the rules that have to be applied to this payslip, accordingly to the contract chosen. If you let empty the field contract, this field isn\'t mandatory anymore and thus the rules applied will be all the rules set on the structure of all contracts of the employee valid for the chosen period'), 'name': fields.char('Description', size=64, required=False, readonly=True, states={'draft': [('readonly', False)]}), 'number': fields.char('Reference', size=64, required=False, readonly=True, states={'draft': [('readonly', False)]}), 'employee_id': fields.many2one('hr.employee', 'Employee', required=True, readonly=True, states={'draft': [('readonly', False)]}), @@ -250,14 +274,16 @@ class hr_payslip(osv.osv): \n* If the salary is paid then state is set to \'Paid Salary\'.\ \n* The \'Reject\' state is used when user cancel payslip.'), # 'line_ids': fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Line', required=False, readonly=True, states={'draft': [('readonly', False)]}), - 'line_ids': one2many_mod2('hr.payslip.line', 'slip_id', 'Payslip Line',readonly=True), + 'line_ids': one2many_mod2('hr.payslip.line', 'slip_id', 'Payslip Lines', readonly=True, states={'draft':[('readonly',False)]}), 'company_id': fields.many2one('res.company', 'Company', required=False, readonly=True, states={'draft': [('readonly', False)]}), + 'worked_days_line_ids': fields.one2many('hr.payslip.worked_days', 'payslip_id', 'Payslip Worked Days', required=False, readonly=True, states={'draft': [('readonly', False)]}), 'input_line_ids': fields.one2many('hr.payslip.input', 'payslip_id', 'Payslip Inputs', required=False, readonly=True, states={'draft': [('readonly', False)]}), 'paid': fields.boolean('Made Payment Order ? ', required=False, readonly=True, states={'draft': [('readonly', False)]}), - 'note': fields.text('Description'), + 'note': fields.text('Description', readonly=True, states={'draft':[('readonly',False)]}), 'contract_id': fields.many2one('hr.contract', 'Contract', required=False, readonly=True, states={'draft': [('readonly', False)]}), - 'details_by_salary_category': fields.function(_get_lines_salary_category, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Head'), + 'details_by_salary_rule_category': fields.function(_get_lines_salary_rule_category, method=True, type='one2many', relation='hr.payslip.line', string='Details by Salary Rule Category'), 'credit_note': fields.boolean('Credit Note', help="Indicates this payslip has a refund of another"), + 'payslip_run_id': fields.many2one('hr.payslip.run', 'Payslip Run', readonly=True, states={'draft': [('readonly', False)]}), } _defaults = { 'date_from': lambda *a: time.strftime('%Y-%m-01'), @@ -325,59 +351,6 @@ class hr_payslip(osv.osv): } def verify_sheet(self, cr, uid, ids, context=None): - #TODO clean me: this function should create the register lines accordingly to the rules computed (run the compute_sheet first) -# holiday_pool = self.pool.get('hr.holidays') -# salary_rule_pool = self.pool.get('hr.salary.rule') -# structure_pool = self.pool.get('hr.payroll.structure') -# register_line_pool = self.pool.get('hr.contibution.register.line') -# contracts = [] -# structures = [] -# rules = [] -# lines = [] -# sal_structures =[] -# for slip in self.browse(cr, uid, ids, context=context): -# if slip.contract_id: -# contracts.append(slip.contract_id) -# else: -# contracts = self.get_contract(cr, uid, slip.employee_id, slip.date, context=context) -# for contract in contracts: -# structures.append(contract.struct_id.id) -# leave_ids = self._get_leaves(cr, uid, slip.date, slip.employee_id, contract, context) -# for hday in holiday_pool.browse(cr, uid, leave_ids, context=context): -# salary_rules = salary_rule_pool.search(cr, uid, [('code', '=', hday.holiday_status_id.code)], context=context) -# rules += salary_rule_pool.browse(cr, uid, salary_rules, context=context) -# for structure in structures: -# sal_structures = self._get_parent_structure(cr, uid, [structure], context=context) -# for struct in sal_structures: -# lines = structure_pool.browse(cr, uid, struct, context=context).rule_ids -# for line in lines: -# if line.child_ids: -# for r in line.child_ids: -# lines.append(r) -# rules.append(line) -# base = { -# 'basic': slip.basic_amount, -# } -# if rules: -# for rule in rules: -# if rule.company_contribution: -# base[rule.code.lower()] = rule.amount -# if rule.register_id: -# for slip in slip.line_ids: -# if slip.category_id == rule.category_id: -# line_tot = slip.total -# value = eval(rule.computational_expression, base) -# company_contrib = self._compute(cr, uid, rule.id, value, employee, contract, context) -# reg_line = { -# 'name': rule.name, -# 'register_id': rule.register_id.id, -# 'code': rule.code, -# 'employee_id': slip.employee_id.id, -# 'emp_deduction': line_tot, -# 'comp_deduction': company_contrib, -# 'total': rule.amount + line_tot -# } -# register_line_pool.create(cr, uid, reg_line, context=context) return self.write(cr, uid, ids, {'state': 'confirm'}, context=context) #TODO move this function into hr_contract module, on hr.employee object @@ -395,9 +368,9 @@ class hr_payslip(osv.osv): #OR if it starts between the given dates clause_2 = ['&',('date_start', '<=', date_to),('date_start','>=', date_from)] #OR if it starts before the date_from and finish after the date_end (or never finish) - clause_3 = [('date_start','<=', date_from),'|',('date_end', '=', False),('date_end','>=', date)] + clause_3 = [('date_start','<=', date_from),'|',('date_end', '=', False),('date_end','>=', date_to)] clause_final = [('employee_id', '=', employee.id),'|','|'] + clause_1 + clause_2 + clause_3 - contract_ids = contract_obj.search(cr, uid, [('employee_id', '=', employee.id),], context=context) + contract_ids = contract_obj.search(cr, uid, clause_final, context=context) return contract_ids def compute_sheet(self, cr, uid, ids, context=None): @@ -405,7 +378,7 @@ class hr_payslip(osv.osv): for payslip in self.browse(cr, uid, ids, context=context): #delete old payslip lines old_slipline_ids = slip_line_pool.search(cr, uid, [('slip_id', '=', payslip.id)], context=context) - old_slipline_ids +# old_slipline_ids if old_slipline_ids: slip_line_pool.unlink(cr, uid, old_slipline_ids, context=context) if payslip.contract_id: @@ -418,7 +391,7 @@ class hr_payslip(osv.osv): self.write(cr, uid, [payslip.id], {'line_ids': lines}, context=context) return True - def get_input_lines(self, cr, uid, contract_ids, date_from, date_to, context=None): + def get_worked_day_lines(self, cr, uid, contract_ids, date_from, date_to, context=None): """ @param contract_ids: list of contract id @return: returns a list of dict containing the input that should be applied for the given contract between date_from and date_to @@ -475,10 +448,31 @@ class hr_payslip(osv.osv): res += [attendances] + leaves return res + def get_inputs(self, cr, uid, contract_ids, date_from, date_to, context=None): + res = [] + contract_obj = self.pool.get('hr.contract') + rule_obj = self.pool.get('hr.salary.rule') + + structure_ids = contract_obj.get_all_structures(cr, uid, contract_ids, context=context) + rule_ids = self.pool.get('hr.payroll.structure').get_all_rules(cr, uid, structure_ids, context=context) + sorted_rule_ids = [id for id, sequence in sorted(rule_ids, key=lambda x:x[1])] + + for contract in contract_obj.browse(cr, uid, contract_ids, context=context): + for rule in rule_obj.browse(cr, uid, sorted_rule_ids, context=context): + if rule.input_ids: + for input in rule.input_ids: + inputs = { + 'name': input.name, + 'code': input.code, + 'contract_id': contract.id, + } + res += [inputs] + return res + def get_payslip_lines(self, cr, uid, contract_ids, payslip_id, context): - def _sum_salary_category(localdict, category, amount): + def _sum_salary_rule_category(localdict, category, amount): if category.parent_id: - localdict = _sum_salary_category(localdict, category.parent_id, amount) + localdict = _sum_salary_rule_category(localdict, category.parent_id, amount) localdict['categories'][category.code] = category.code in localdict['categories'] and localdict['categories'][category.code] + amount or amount return localdict @@ -489,9 +483,12 @@ class hr_payslip(osv.osv): obj_rule = self.pool.get('hr.salary.rule') payslip = payslip_obj.browse(cr, uid, payslip_id, context=context) worked_days = {} + for worked_days_line in payslip.worked_days_line_ids: + worked_days[worked_days_line.code] = worked_days_line + inputs = {} for input_line in payslip.input_line_ids: - worked_days[input_line.code] = input_line - localdict = {'categories': {}, 'payslip': payslip, 'worked_days': worked_days, 'payslip_obj': payslip_obj} + inputs[input_line.code] = input_line + localdict = {'categories': {}, 'payslip': payslip, 'worked_days': worked_days, 'inputs': inputs, 'payslip_obj': payslip_obj} #get the ids of the structures on the contracts and their parent id as well structure_ids = self.pool.get('hr.contract').get_all_structures(cr, uid, contract_ids, context=context) #get the rules of the structure and thier children @@ -514,7 +511,7 @@ class hr_payslip(osv.osv): #set/overwrite the amount computed for this rule in the localdict localdict[rule.code] = amount #sum the amount for its salary category - localdict = _sum_salary_category(localdict, rule.category_id, amount - previous_amount) + localdict = _sum_salary_rule_category(localdict, rule.category_id, amount - previous_amount) #create/overwrite the rule in the temporary results result_dict[key] = { 'salary_rule_id': rule.id, @@ -549,38 +546,48 @@ class hr_payslip(osv.osv): def onchange_employee_id(self, cr, uid, ids, date_from, date_to, employee_id=False, contract_id=False, context=None): empolyee_obj = self.pool.get('hr.employee') contract_obj = self.pool.get('hr.contract') + worked_days_obj = self.pool.get('hr.payslip.worked_days') input_obj = self.pool.get('hr.payslip.input') if context is None: context = {} + #delete old worked days lines + old_worked_days_ids = ids and worked_days_obj.search(cr, uid, [('payslip_id', '=', ids[0])], context=context) or False + if old_worked_days_ids: + worked_days_obj.unlink(cr, uid, old_worked_days_ids, context=context) + #delete old input lines old_input_ids = ids and input_obj.search(cr, uid, [('payslip_id', '=', ids[0])], context=context) or False if old_input_ids: input_obj.unlink(cr, uid, old_input_ids, context=context) + #defaults res = {'value':{ 'line_ids':[], + 'input_line_ids': [], + 'worked_days_line_ids': [], + #'details_by_salary_head':[], TODO put me back 'name':'', 'contract_id': False, 'struct_id': False, } - } + } if not employee_id: return res ttyme = datetime.fromtimestamp(time.mktime(time.strptime(date_from, "%Y-%m-%d"))) employee_id = empolyee_obj.browse(cr, uid, employee_id, context=context) res['value'].update({ - 'name': _('Salary Slip of %s for %s') % (employee_id.name, tools.ustr(ttyme.strftime('%B-%Y'))), - 'company_id': employee_id.company_id.id - }) + 'name': _('Salary Slip of %s for %s') % (employee_id.name, tools.ustr(ttyme.strftime('%B-%Y'))), + 'company_id': employee_id.company_id.id + }) if not context.get('contract', False): #fill with the first contract of the employee contract_ids = self.get_contract(cr, uid, employee_id, date_from, date_to, context=context) res['value'].update({ - 'struct_id': contract_ids and contract_obj.read(cr, uid, contract_ids[0], ['struct_id'], context=context)['struct_id'][0] or False, - 'contract_id': contract_ids and contract_ids[0] or False, + 'struct_id': contract_ids and contract_obj.read(cr, uid, contract_ids[0], ['struct_id'], context=context)['struct_id'][0] or False, + 'contract_id': contract_ids and contract_ids[0] or False, }) else: if contract_id: @@ -588,7 +595,10 @@ class hr_payslip(osv.osv): contract_ids = [contract_id] #fill the structure with the one on the selected contract contract_record = contract_obj.browse(cr, uid, contract_id, context=context) - res['value'].update({'struct_id': contract_record.struct_id.id, 'contract_id': contract_id}) + res['value'].update({ + 'struct_id': contract_record.struct_id.id, + 'contract_id': contract_id + }) else: #if we don't give the contract, then the input to fill should be for all current contracts of the employee contract_ids = self.get_contract(cr, uid, employee_id, date_from, date_to, context=context) @@ -596,13 +606,16 @@ class hr_payslip(osv.osv): return res #computation of the salary input - input_line_ids = self.get_input_lines(cr, uid, contract_ids, date_from, date_to, context=context) + worked_days_line_ids = self.get_worked_day_lines(cr, uid, contract_ids, date_from, date_to, context=context) + input_line_ids = self.get_inputs(cr, uid, contract_ids, date_from, date_to, context=context) res['value'].update({ + 'worked_days_line_ids': worked_days_line_ids, 'input_line_ids': input_line_ids, - }) + }) return res def onchange_contract_id(self, cr, uid, ids, date_from, date_to, employee_id=False, contract_id=False, context=None): +#TODO it seems to be the mess in the onchanges, we should have onchange_employee => onchange_contract => doing all the things if context is None: context = {} res = {'value':{ @@ -634,9 +647,31 @@ class hr_payslip(osv.osv): sum -= r['total'] cr.close() return sum - + hr_payslip() +class hr_payslip_worked_days(osv.osv): + ''' + Payslip Worked Days + ''' + + _name = 'hr.payslip.worked_days' + _description = 'Payslip Worked Days' + _columns = { + 'name': fields.char('Description', size=256, required=True), + 'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True), + 'sequence': fields.integer('Sequence', required=True,), + 'code': fields.char('Code', size=52, required=True, help="The code that can be used in the salary rules"), + 'number_of_days': fields.float('Number of Days'), + 'number_of_hours': fields.float('Number of Hours'), + 'contract_id': fields.many2one('hr.contract', 'Contract', required=True, help="The contract for which applied this input"), + } + _order = 'payslip_id, sequence' + _defaults = { + 'sequence': 10, + } +hr_payslip_worked_days() + class hr_payslip_input(osv.osv): ''' Payslip Input @@ -649,15 +684,15 @@ class hr_payslip_input(osv.osv): 'payslip_id': fields.many2one('hr.payslip', 'Pay Slip', required=True), 'sequence': fields.integer('Sequence', required=True,), 'code': fields.char('Code', size=52, required=True, help="The code that can be used in the salary rules"), - 'number_of_days': fields.float('Number of Days'), - 'number_of_hours': fields.float('Number of Hours'), + 'quantity': fields.float('Quantity', help="It is used in computation. For e.g. A rule for sales having 1% commission of basic salary for per product can defined in expression like result = inputs['S-ASUS']['qunatity']*contract.wage*0.01."), 'contract_id': fields.many2one('hr.contract', 'Contract', required=True, help="The contract for which applied this input"), } - _order = 'payslip_id,sequence' + _order = 'payslip_id, sequence' _defaults = { 'sequence': 10, + 'quantity': 0.0, } - + def sum(self, cr, uid, code, field, from_date, to_date=None, employee=False, context=None): if not employee: return 0.0 @@ -685,7 +720,7 @@ class hr_salary_rule(osv.osv): 'code':fields.char('Code', size=64, required=True, help="The code of salary rules can be used as reference in computation of other rules. In that case, it is case sensitive."), 'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence'), 'quantity': fields.char('Quantity', size=256, help="It is used in computation for percentage and fixed amount.For e.g. A rule for Meal Voucher having fixed amount of 1€ per worked day can have its quantity defined in expression like worked_days['WORK100']['number_of_days']."), - 'category_id':fields.many2one('hr.salary.category', 'Category', required=True), + 'category_id':fields.many2one('hr.salary.rule.category', 'Category', required=True), 'active':fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the salary rule without removing it."), 'appears_on_payslip': fields.boolean('Appears on Payslip', help="Used for the display of rule on payslip"), 'parent_rule_id':fields.many2one('hr.salary.rule', 'Parent Salary Rule', select=True), @@ -715,6 +750,7 @@ class hr_salary_rule(osv.osv): help="Contribution register based on company", required=False ), + 'input_ids': fields.one2many('hr.rule.input', 'input_id', 'Inputs'), 'note':fields.text('Description'), } _defaults = { @@ -725,8 +761,9 @@ class hr_salary_rule(osv.osv): # employee: hr.employee object # contract: hr.contract object # rules: rules code (previously computed) -# categories: dictionary containing the computed categories (sum of amount of all rules belonging to that category). Keys are the category codes. +# categories: dictionary containing the computed salary rule categories (sum of amount of all rules belonging to that category). Keys are the category codes. # worked_days: dictionary containing the computed worked days. Keys are the worked days codes. +# inputs: dictionary containing the computed inputs. Keys are the inputs codes. # Note: returned value have to be set in the variable 'result' @@ -739,8 +776,9 @@ result = contract.wage * 0.10''', # employee: hr.employee object # contract: hr.contract object # rules: rules code (previously computed) -# categories: dictionary containing the computed categories (sum of amount of all rules belonging to that category). Keys are the category codes. +# categories: dictionary containing the computed salary rule categories (sum of amount of all rules belonging to that category). Keys are the category codes. # worked_days: dictionary containing the computed worked days. Keys are the worked days codes. +# inputs: dictionary containing the computed inputs. Keys are the inputs codes. # Note: returned value have to be set in the variable 'result' @@ -821,6 +859,21 @@ result = rules['NET'] > categories['NET'] * 0.10''', hr_salary_rule() +class hr_rule_input(osv.osv): + ''' + Salary Rule Input + ''' + + _name = 'hr.rule.input' + _description = 'Salary Rule Input' + _columns = { + 'name': fields.char('Description', size=256, required=True), + 'code': fields.char('Code', size=52, required=True, help="The code that can be used in the salary rules"), + 'input_id': fields.many2one('hr.salary.rule', 'Salary Rule Input', required=True) + } + +hr_rule_input() + class hr_payslip_line(osv.osv): ''' Payslip Line diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml index cee14f2ccbb..c7ba6e62062 100644 --- a/addons/hr_payroll/hr_payroll_data.xml +++ b/addons/hr_payroll/hr_payroll_data.xml @@ -2,32 +2,32 @@ - + Basic BASIC - + Allowance ALW - + Deduction DED - + Gross GROSS - + Net NET - + Company Contribution COMP diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml index db903fbabfe..5a6ccc2c995 100644 --- a/addons/hr_payroll/hr_payroll_demo.xml +++ b/addons/hr_payroll/hr_payroll_demo.xml @@ -60,6 +60,30 @@ Meal Voucher + + + code + SALE + + Get 1% of sales + + result = (inputs['S-ASUS']['quantity'] + inputs['S-CHINA']['quantity']) * contract.wage * 0.01 + + + + + + S-ASUS + Sale to ASUStek + + + + + S-CHINA + Sale to China Export + + + diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index f7015a97791..4d422d708de 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -209,7 +209,7 @@ hr.payslip tree - + @@ -260,8 +260,8 @@ - - + + @@ -272,7 +272,7 @@ - + @@ -281,6 +281,36 @@ +
+ + + + + + + + + +
+ + + + + + + + + +
+ + + + + + + + +
@@ -288,6 +318,7 @@ + @@ -347,9 +378,9 @@ - - hr.salary.category.form - hr.salary.category + + hr.salary.rule.category.form + hr.salary.rule.category form
@@ -364,9 +395,9 @@ - - hr.salary.category.tree - hr.salary.category + + hr.salary.rule.category.tree + hr.salary.rule.category tree @@ -377,9 +408,9 @@ - - hr.salary.category.select - hr.salary.category + + hr.salary.rule.category.select + hr.salary.rule.category search @@ -389,16 +420,16 @@ - - Salary Categories - hr.salary.category + + Salary Rule Categories + hr.salary.rule.category form - - + + @@ -487,7 +518,7 @@ - + hr.salary.rule.tree hr.salary.rule tree @@ -501,86 +532,149 @@ - - hr.salary.rule.form - hr.salary.rule + + hr.salary.rule.form + hr.salary.rule + form + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + hr.salary.rule.select + hr.salary.rule + search + + + + + + + + + + + + + + + + + + Salary Rules + hr.salary.rule + form + + [('parent_rule_id','=',False)] + + + + + + + + + hr.payslip.run.search + hr.payslip.run + search + + + + + + + + + hr.payslip.run.tree + hr.payslip.run + tree + + + + + + + + + hr.payslip.run.form + hr.payslip.run form -
+ - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + +