From afb6030523195247bc2ae76953018021b83acd56 Mon Sep 17 00:00:00 2001 From: "Hemendra Paregi (Open ERP)" Date: Mon, 26 Dec 2011 15:51:46 +0530 Subject: [PATCH 1/2] [IMP]SOL contain service duplicate on invoice lp bug: https://launchpad.net/bugs/907211 fixed bzr revid: hpa@tinyerp.com-20111226102146-ncss7v7bmw0oc7bm --- addons/sale/stock.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 From 40860b517b000fc729353aa7ebd50f842898d1cd Mon Sep 17 00:00:00 2001 From: "Hemendra Paregi (Open ERP)" Date: Wed, 28 Dec 2011 18:55:20 +0530 Subject: [PATCH 2/2] [IMP] Remove Extra Spaces bzr revid: hpa@tinyerp.com-20111228132520-od6cjuvyfc2n7ln6 --- addons/sale/stock.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/sale/stock.py b/addons/sale/stock.py index b48a8952323..653b147d3d0 100644 --- a/addons/sale/stock.py +++ b/addons/sale/stock.py @@ -139,15 +139,14 @@ class stock_picking(osv.osv): 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: