diff --git a/addons/sale/stock.py b/addons/sale/stock.py index 378af21c1b4..b48a8952323 100644 --- a/addons/sale/stock.py +++ b/addons/sale/stock.py @@ -135,18 +135,19 @@ class stock_picking(osv.osv): for picking in picking_obj.browse(cursor, user, picking_ids, context=context): - if not picking.sale_id: + if not picking.sale_id or picking.backorder_id: continue sale_lines = picking.sale_id.order_line invoice_created = invoices[result[picking.id]] + if picking.sale_id.user_id: invoice_obj.write(cursor, user, [invoice_created.id], {'user_id': picking.sale_id.user_id.id}, context=context) - if picking.sale_id.fiscal_position: invoice_obj.write(cursor, user, [invoice_created.id], {'fiscal_position': picking.sale_id.fiscal_position.id}, context=context) if picking.sale_id.client_order_ref: inv_name = picking.sale_id.client_order_ref + " : " + invoice_created.name invoice_obj.write(cursor, user, [invoice_created.id], {'name': inv_name}, context=context) + for sale_line in sale_lines: if sale_line.product_id.type == 'service' and sale_line.invoiced == False: if not type: @@ -195,4 +196,4 @@ class stock_picking(osv.osv): }) return result -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file