From 431b93bd59fe18a77a1ee3971e497e64da2eed81 Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Wed, 20 Jul 2011 15:16:39 +0530 Subject: [PATCH 1/3] [FIX]:wrong scheduled date and order date for PO generated from procurement lp bug: https://launchpad.net/bugs/812794 fixed bzr revid: ksa@tinyerp.co.in-20110720094639-u0hujqlwotv2cgo7 --- addons/purchase/purchase.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 6ec558acc97..3818060c9b5 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -792,8 +792,9 @@ class procurement_order(osv.osv): price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, partner_id, {'uom': uom_id})[pricelist_id] - newdate = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - newdate = (newdate - relativedelta(days=company.po_lead)) - relativedelta(days=seller_delay) + order_date = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') + order_date = (order_date - relativedelta(days=company.po_lead)) - relativedelta(days=seller_delay) + schedule_date = (order_date - relativedelta(days=company.po_lead)) #Passing partner_id to context for purchase order line integrity of Line name context.update({'lang': partner.lang, 'partner_id': partner_id}) @@ -806,7 +807,7 @@ class procurement_order(osv.osv): 'product_id': procurement.product_id.id, 'product_uom': uom_id, 'price_unit': price, - 'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'), + 'date_planned': schedule_date.strftime('%Y-%m-%d %H:%M:%S'), 'move_dest_id': res_id, 'notes': product.description_purchase, } @@ -822,6 +823,7 @@ class procurement_order(osv.osv): 'partner_address_id': address_id, 'location_id': procurement.location_id.id, 'pricelist_id': pricelist_id, + 'date_order': order_date.strftime('%Y-%m-%d %H:%M:%S'), 'order_line': [(0,0,line)], 'company_id': procurement.company_id.id, 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False From 8691e4b906fb4c114fa687665953a978b7efe2c8 Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Thu, 21 Jul 2011 11:29:40 +0530 Subject: [PATCH 2/3] [IMP]:improve bzr revid: ksa@tinyerp.co.in-20110721055940-poqs2hb1ppvxdss9 --- addons/purchase/purchase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 3818060c9b5..67223903219 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -793,7 +793,7 @@ class procurement_order(osv.osv): price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, partner_id, {'uom': uom_id})[pricelist_id] order_date = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - order_date = (order_date - relativedelta(days=company.po_lead)) - relativedelta(days=seller_delay) + order_dates = (order_date - relativedelta(days=company.po_lead)) - relativedelta(days=seller_delay) schedule_date = (order_date - relativedelta(days=company.po_lead)) #Passing partner_id to context for purchase order line integrity of Line name @@ -823,7 +823,7 @@ class procurement_order(osv.osv): 'partner_address_id': address_id, 'location_id': procurement.location_id.id, 'pricelist_id': pricelist_id, - 'date_order': order_date.strftime('%Y-%m-%d %H:%M:%S'), + 'date_order': order_dates.strftime('%Y-%m-%d %H:%M:%S'), 'order_line': [(0,0,line)], 'company_id': procurement.company_id.id, 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False From f1b56240b0ea6265a384a4946cc478c414073d67 Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Fri, 22 Jul 2011 18:53:24 +0530 Subject: [PATCH 3/3] [IMP]: improve code bzr revid: ksa@tinyerp.co.in-20110722132324-ojbbzlcp0xrl3jvt --- 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 67223903219..0d6e75437ff 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -793,8 +793,8 @@ class procurement_order(osv.osv): price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, partner_id, {'uom': uom_id})[pricelist_id] order_date = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - order_dates = (order_date - relativedelta(days=company.po_lead)) - relativedelta(days=seller_delay) schedule_date = (order_date - relativedelta(days=company.po_lead)) + order_dates = schedule_date - relativedelta(days=seller_delay) #Passing partner_id to context for purchase order line integrity of Line name context.update({'lang': partner.lang, 'partner_id': partner_id})