Merge lp:~matjaz-6/openerpsl/openerpsl_01_25 into lp:openerpsl/7.0

[Matjaz Kalic]

[FIX] m_web_api/m_web.py (if sale_line_id == False)

[lp:~matjaz-6/openerpsl/openerpsl_01_25]

306. By Dušan Laznik (Mentis) on 2014-01-26

[FIX] m_web_api/m_web.py (if sale_line_id == False)

=== modified file 'm_web_api/m_web.py'
--- m_web_api/m_web.py	2014-01-26 16:55:10 +0000
+++ m_web_api/m_web.py	2014-01-26 18:08:54 +0000
@@ -185,13 +185,16 @@
         if 'sale_line_id' not in vals:
             vals['basket_status'] = 2
         else:
-            sale_line = self.pool.get('sale.order.line').browse(cr, user, [vals['sale_line_id']])[0]
-            if sale_line.order_id.shop_id.shop_production:
-                vals['basket_status'] = 3
-                vals['product_qty_returned'] = sale_line.product_qty_returned
+            if vals['sale_line_id']:
+                sale_line = self.pool.get('sale.order.line').browse(cr, user, [vals['sale_line_id']])[0]
+                if sale_line.order_id.shop_id.shop_production:
+                    vals['basket_status'] = 3
+                    vals['product_qty_returned'] = sale_line.product_qty_returned
+                else:
+                    vals['basket_status'] = 2
+                    vals['basket_deliverd'] = sale_line.product_uom_qty
             else:
                 vals['basket_status'] = 2
-                vals['basket_deliverd'] = sale_line.product_uom_qty
                 
         res = super(stock_move_basket, self).create(cr, user, vals, context=context)
         return res