[MERGE] forward port of branch saas-2 up to revid 9136 dle@openerp.com-20140219170746-3yjvjyc2wwrb7rvd
bzr revid: chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
This commit is contained in:
commit
d5106a4d34
|
@ -1,4 +1,4 @@
|
||||||
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
|
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
|
||||||
access_im_message,im.message,model_im_message,,1,0,1,0
|
access_im_message,im.message,model_im_message,,1,0,1,0
|
||||||
access_im_user,im.user,model_im_user,,1,1,1,0
|
access_im_user,im.user,model_im_user,,1,1,1,0
|
||||||
access_im_session,im.session,model_im_session,,1,0,0,0
|
access_im_session,im.session,model_im_session,,1,1,1,0
|
|
|
@ -1014,8 +1014,8 @@ class account_invoice(osv.Model):
|
||||||
sale_order_obj = self.pool.get('sale.order')
|
sale_order_obj = self.pool.get('sale.order')
|
||||||
res = super(account_invoice, self).confirm_paid(cr, uid, ids, context=context)
|
res = super(account_invoice, self).confirm_paid(cr, uid, ids, context=context)
|
||||||
so_ids = sale_order_obj.search(cr, uid, [('invoice_ids', 'in', ids)], context=context)
|
so_ids = sale_order_obj.search(cr, uid, [('invoice_ids', 'in', ids)], context=context)
|
||||||
if so_ids:
|
for so_id in so_ids:
|
||||||
sale_order_obj.message_post(cr, uid, so_ids, body=_("Invoice paid"), context=context)
|
sale_order_obj.message_post(cr, uid, so_id, body=_("Invoice paid"), context=context)
|
||||||
return res
|
return res
|
||||||
|
|
||||||
def unlink(self, cr, uid, ids, context=None):
|
def unlink(self, cr, uid, ids, context=None):
|
||||||
|
|
Loading…
Reference in New Issue