From 5022b81da941800dd7ae2343dde58cad78f179b6 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 19 Jan 2011 11:40:51 +0530 Subject: [PATCH 1/4] [FIX]: purchase: Fixed default values for PO date lp bug: https://launchpad.net/bugs/704035 fixed bzr revid: rpa@tinyerp.com-20110119061051-zsmjfwihk50wrmkq --- addons/purchase/purchase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, From 7e4ceb458c8dced039d998148ef3233912cb4a4e Mon Sep 17 00:00:00 2001 From: "rha@tinyerp.com" <> Date: Wed, 19 Jan 2011 18:44:10 +0530 Subject: [PATCH 2/4] [IMP]: stock_planning: fixed import error bzr revid: rha@tinyerp.com-20110119131410-59h6c5931r7vhqne --- addons/stock_planning/wizard/stock_planning_forecast.py | 1 + 1 file changed, 1 insertion(+) 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 From c49b2ff6ad9743bc033a65bdbb1587b14fc0b12f Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Thu, 20 Jan 2011 17:39:34 +0530 Subject: [PATCH 3/4] [FIX]Error Getting when create move line in Incoming shipment to fill address field without partner bzr revid: ron@tinyerp.com-20110120120934-ty7m0t6rq3lq6ck9 --- addons/stock/stock.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index b632101208f..aff8570def5 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1593,8 +1593,10 @@ 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 - return False + part_obj_add = self.pool.get('res.partner.address').browse(cr, uid, context['address_in_id'], context) + if not part_obj_add.partner_id: + return False + return part_obj_add.partner_id.property_stock_supplier.id _defaults = { 'location_id': _default_location_source, From 2e231068532a1578b71a6677df783ecae2c77335 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Thu, 20 Jan 2011 13:31:07 +0100 Subject: [PATCH 4/4] [FIX] stock: fixed _default_location_source in cases where address_in_id is not present in the context bzr revid: qdp-launchpad@tinyerp.com-20110120123107-6n8b69xuutxr7rsp --- addons/stock/stock.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 7c28b578c58..c942818a3d4 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1594,9 +1594,9 @@ class stock_move(osv.osv): pass if context.get('address_in_id', False): part_obj_add = self.pool.get('res.partner.address').browse(cr, uid, context['address_in_id'], context=context) - if not part_obj_add.partner_id: - return False - return part_obj_add.partner_id.property_stock_supplier.id + if part_obj_add.partner_id: + return part_obj_add.partner_id.property_stock_supplier.id + return False _defaults = { 'location_id': _default_location_source,