[MERGE] forward port of branch saas-6 up to 19d62ec

2016-05-04 14:37:33 +02:00
parent c768bbeb22 19d62ec5a7
commit 3381e7bedf
1 changed files with 1 additions and 1 deletions
@@ -40,7 +40,7 @@ class stock_production_lot(osv.osv):
    # Assign dates according to products data
    def create(self, cr, uid, vals, context=None):
        context = dict(context or {})
-        context['product_id'] = vals.get('product_id', context.get('default_product_id'))
+        context['product_id'] = vals.get('product_id', context.get('default_product_id') or context.get('product_id'))
        return super(stock_production_lot, self).create(cr, uid, vals, context=context)

    _defaults = {