[ADD]sequence number created in mentho,access rights added for payroll advice.
bzr revid: kbh@tinyerp.com-20120613065137-78ye6taovw0yffdw
This commit is contained in:
parent
5a9f920606
commit
8ca629034c
|
@ -129,6 +129,7 @@ class payroll_advice(osv.osv):
|
|||
payslip_pool = self.pool.get('hr.payslip')
|
||||
advice_line_pool = self.pool.get('hr.payroll.advice.line')
|
||||
payslip_line_pool = self.pool.get('hr.payslip.line')
|
||||
sequence_pool = self.pool.get('ir.sequence')
|
||||
|
||||
for advice in self.browse(cr, uid, ids, context=context):
|
||||
old_line_ids = advice_line_pool.search(cr, uid, [('advice_id','=',advice.id)], context=context)
|
||||
|
@ -152,7 +153,8 @@ class payroll_advice(osv.osv):
|
|||
'bysal': line.total
|
||||
}
|
||||
advice_line_pool.create(cr, uid, advice_line, context=context)
|
||||
return True
|
||||
number = self.pool.get('ir.sequence').get(cr, uid, 'payment.advice')
|
||||
self.write(cr, uid, ids, {'number':number}, context=context)
|
||||
|
||||
def confirm_sheet(self, cr, uid, ids, context=None):
|
||||
return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
<field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<data>
|
||||
<xpath expr="/form/notebook/page[@name='information']/group[@name='right_column']/field[@name='struct_id']" position="after">
|
||||
<xpath expr="//field[@name='struct_id']" position="after">
|
||||
<group col="2" colspan="2" name="right_column">
|
||||
<separator colspan="2" string="Allowance"/>
|
||||
<field name="food_coupon_amount"/>
|
||||
|
|
|
@ -1,2 +1,4 @@
|
|||
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
|
||||
"access_hr_salary_rule","hr.salary.rule","model_hr_salary_rule","base.group_hr_user",1,1,1,1
|
||||
"access_hr_payroll_advice","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_payroll_advice_line","hr.payroll.advice.line","model_hr_payroll_advice_line","base.group_hr_manager",1,1,1,1
|
||||
|
|
|
Loading…
Reference in New Issue