[IMP] stock: in some extension, we may want to group some invoice lines, by checking...

bzr revid: rvalyi@gmail.com-20120127045032-isxspwmhmk78yrbt

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 00af35b..f730b84 100644 (file)
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1097,11 +1097,11 @@ class stock_picking(osv.osv):
             for move_line in picking.move_lines:
                 if move_line.state == 'cancel':
                     continue
-                invoice_line_id = invoice_line_obj.create(cr, uid,
-                        self._prepare_invoice_line(cr, uid, group, picking, move_line,
+                vals = self._prepare_invoice_line(cr, uid, group, picking, move_line,
                                 invoice_id, invoice_vals, context=context),
-                        context=context)
-                self._invoice_line_hook(cr, uid, move_line, invoice_line_id)
+                if vals:
+                    invoice_line_id = invoice_line_obj.create(cr, uid, vals, context=context)
+                    self._invoice_line_hook(cr, uid, move_line, invoice_line_id)
 
             invoice_obj.button_compute(cr, uid, [invoice_id], context=context,
                     set_total=(inv_type in ('in_invoice', 'in_refund')))