diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index ce024b1a5cb..2d8eaac1d84 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -217,7 +217,7 @@ class purchase_order(osv.osv): 'company_id': fields.many2one('res.company','Company',required=True,select=1), } _defaults = { - 'date_order': time.strftime('%Y-%m-%d'), + 'date_order': lambda *a: time.strftime('%Y-%m-%d'), 'state': 'draft', 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order'), 'shipped': 0, diff --git a/addons/stock/stock.py b/addons/stock/stock.py index b632101208f..c942818a3d4 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1593,7 +1593,9 @@ class stock_move(osv.osv): except: pass if context.get('address_in_id', False): - return self.pool.get('res.partner.address').browse(cr, uid, context['address_in_id'], context).partner_id.property_stock_supplier.id + part_obj_add = self.pool.get('res.partner.address').browse(cr, uid, context['address_in_id'], context=context) + if part_obj_add.partner_id: + return part_obj_add.partner_id.property_stock_supplier.id return False _defaults = { diff --git a/addons/stock_planning/wizard/stock_planning_forecast.py b/addons/stock_planning/wizard/stock_planning_forecast.py index d38173a665d..60b3de62243 100644 --- a/addons/stock_planning/wizard/stock_planning_forecast.py +++ b/addons/stock_planning/wizard/stock_planning_forecast.py @@ -20,6 +20,7 @@ ############################################################################## from osv import osv, fields +from tools.translate import _ # Creates forecasts records for products from selected Product Category for selected 'Warehouse - Period' # Object added by contributor in ver 1.1