summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Simonis <chs@openerp.com>2014-02-20 16:45:17 +0100
committerChristophe Simonis <chs@openerp.com>2014-02-20 16:45:17 +0100
commitd5106a4d34a9b7c52a1ecad7c65331f1fda2e231 (patch)
tree8bfcb2dce7afe90367a91752abed393c464f3b1f
parent09d73647395bddd30659c1817073a2885f5673c4 (diff)
parent8edb7c556b11bc44a536bda0bfd6fa1b791f87f7 (diff)
[MERGE] forward port of branch saas-2 up to revid 9136 dle@openerp.com-20140219170746-3yjvjyc2wwrb7rvd
bzr revid: chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
-rw-r--r--addons/im/security/ir.model.access.csv2
-rw-r--r--addons/sale/sale.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/im/security/ir.model.access.csv b/addons/im/security/ir.model.access.csv
index 5137990498a..d35d694661a 100644
--- a/addons/im/security/ir.model.access.csv
+++ b/addons/im/security/ir.model.access.csv
@@ -1,4 +1,4 @@
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_user,im.user,model_im_user,,1,1,1,0
-access_im_session,im.session,model_im_session,,1,0,0,0 \ No newline at end of file
+access_im_session,im.session,model_im_session,,1,1,1,0 \ No newline at end of file
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 8848ba9df2b..a8851c654f8 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1014,8 +1014,8 @@ class account_invoice(osv.Model):
sale_order_obj = self.pool.get('sale.order')
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)
- if so_ids:
- sale_order_obj.message_post(cr, uid, so_ids, body=_("Invoice paid"), context=context)
+ for so_id in so_ids:
+ sale_order_obj.message_post(cr, uid, so_id, body=_("Invoice paid"), context=context)
return res
def unlink(self, cr, uid, ids, context=None):