[IMP]procurement, purchase: Improved PEP standard
bzr revid: ron@tinyerp.com-20110916132442-lp0kaaik6bubyj2q
This commit is contained in:
parent
191952b5b8
commit
5b7af7eb60
|
@ -371,7 +371,7 @@ class procurement_order(osv.osv):
|
|||
id = procurement.move_id.id
|
||||
if not (procurement.move_id.state in ('done','assigned','cancel')):
|
||||
ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
|
||||
order_point_id = self.pool.get('stock.warehouse.orderpoint').search(cr, uid, [('product_id', '=', procurement.product_id.id)])
|
||||
order_point_id = self.pool.get('stock.warehouse.orderpoint').search(cr, uid, [('product_id', '=', procurement.product_id.id)], context=context)
|
||||
if not order_point_id and not ok:
|
||||
message = _("Not enough stock and no minimum orderpoint rule defined.")
|
||||
elif not order_point_id:
|
||||
|
|
|
@ -67,7 +67,7 @@ class procurement_order(osv.osv):
|
|||
report_except = 0
|
||||
report_later = 0
|
||||
while True:
|
||||
ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_order')], offset=offset, limit=500, order='priority,date_planned', context=context)
|
||||
ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_order')], offset=offset, limit=500, order='priority, date_planned', context=context)
|
||||
for proc in procurement_obj.browse(cr, uid, ids, context=context):
|
||||
if maxdate >= proc.date_planned:
|
||||
wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
|
||||
|
|
|
@ -801,7 +801,7 @@ class procurement_order(osv.osv):
|
|||
partner_id = partner.id
|
||||
address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
|
||||
pricelist_id = partner.property_product_pricelist_purchase.id
|
||||
warehouse_id = wharehouse_obj.search(cr, uid, [('company_id','=',procurement.company_id.id or company.id or '')], context=context)
|
||||
warehouse_id = wharehouse_obj.search(cr, uid, [('company_id', '=', procurement.company_id.id or company.id or '')], context=context)
|
||||
uom_id = procurement.product_id.uom_po_id.id
|
||||
|
||||
qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
|
||||
|
|
Loading…
Reference in New Issue