Rifakat (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/6.0-opw-52676-rha into
lp:openobject-addons/6.0.
Requested reviews:
nel (nel-tinyerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-52676-rha/+merge/86697
Hello,
Remove code for adding expenses in employee payslip as expense is handeled by
hr_expense itself now.
Kindly review.
Regards,
Rifakat
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-52676-rha/+merge/86697
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.0-opw-52676-rha.
=== modified file 'hr_payroll_account/hr_payroll_account.py'
--- hr_payroll_account/hr_payroll_account.py 2011-09-29 11:43:50 +0000
+++ hr_payroll_account/hr_payroll_account.py 2011-12-22 12:59:34 +0000
@@ -402,11 +402,8 @@
def verify_sheet(self, cr, uid, ids, context=None):
move_pool = self.pool.get('account.move')
movel_pool = self.pool.get('account.move.line')
- exp_pool = self.pool.get('hr.expense.expense')
fiscalyear_pool = self.pool.get('account.fiscalyear')
period_pool = self.pool.get('account.period')
- property_pool = self.pool.get('ir.property')
- payslip_pool = self.pool.get('hr.payslip.line')
for slip in self.browse(cr, uid, ids, context=context):
if not slip.journal_id:
@@ -623,24 +620,7 @@
if not slip.period_id:
rec['period_id'] = period_id
- dates = prev_bounds(slip.date)
- exp_ids = exp_pool.search(cr, uid, [('date_valid','>=',dates[0]), ('date_valid','<=',dates[1]), ('state','=','invoiced')], context=context)
- if exp_ids:
- acc = property_pool.get(cr, uid, 'property_account_expense_categ', 'product.category')
- for exp in exp_pool.browse(cr, uid, exp_ids, context=context):
- exp_res = {
- 'name':exp.name,
- 'amount_type':'fix',
- 'type':'otherpay',
- 'category_id':exp.category_id.id,
- 'amount':exp.amount,
- 'slip_id':slip.id,
- 'account_id':acc
- }
- payslip_pool.create(cr, uid, exp_res, context=context)
-
self.write(cr, uid, [slip.id], rec, context=context)
-
return True
hr_payslip()
_______________________________________________
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
