diff options
| author | Denis Ledoux <dle@odoo.com> | 2015-05-20 13:41:03 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2015-05-20 13:41:03 +0200 |
| commit | 75aa699f62e7a42b418befef3a7bd69efcb78be9 (patch) | |
| tree | c4a9f1454176ac061b87fd8d8cafcc001234a556 | |
| parent | 7b306fc17a9e8f3d33df809cbd39af38ab694552 (diff) | |
| parent | 6026c2f4d080347702cc04023496e53549f71524 (diff) | |
[MERGE] forward port of branch saas-3 up to 6026c2f
| -rw-r--r-- | addons/purchase/purchase.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 7c3a05dad98..3f07396dfc6 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -1545,7 +1545,7 @@ class account_invoice(osv.Model): else: user_id = uid po_ids = purchase_order_obj.search(cr, user_id, [('invoice_ids', 'in', ids)], context=context) - for order in purchase_order_obj.browse(cr, uid, po_ids, context=context): + for order in purchase_order_obj.browse(cr, user_id, po_ids, context=context): purchase_order_obj.message_post(cr, user_id, order.id, body=_("Invoice received"), context=context) invoiced = [] shipped = True @@ -1558,8 +1558,8 @@ class account_invoice(osv.Model): if all(line.invoice_id.state not in ['draft', 'cancel'] for line in po_line.invoice_lines): invoiced.append(po_line.id) if invoiced and shipped: - self.pool['purchase.order.line'].write(cr, uid, invoiced, {'invoiced': True}) - workflow.trg_write(uid, 'purchase.order', order.id, cr) + self.pool['purchase.order.line'].write(cr, user_id, invoiced, {'invoiced': True}) + workflow.trg_write(user_id, 'purchase.order', order.id, cr) return res def confirm_paid(self, cr, uid, ids, context=None): |