[FIX] purchase_requisition: choose the right warehouse when creating purchase requisitions from procurement orders + allow to work in batch.
bzr revid: chs@openerp.com-20131126135254-96l4xk9q4fd0iwpu
This commit is contained in:
@@ -231,34 +231,40 @@ class product_product(osv.osv):
|
||||
product_product()
|
||||
|
||||
class procurement_order(osv.osv):
|
||||
|
||||
_inherit = 'procurement.order'
|
||||
_columns = {
|
||||
'requisition_id' : fields.many2one('purchase.requisition','Latest Requisition')
|
||||
'requisition_id': fields.many2one('purchase.requisition', 'Latest Requisition')
|
||||
}
|
||||
|
||||
def make_po(self, cr, uid, ids, context=None):
|
||||
res = {}
|
||||
requisition_obj = self.pool.get('purchase.requisition')
|
||||
warehouse_obj = self.pool.get('stock.warehouse')
|
||||
procurement = self.browse(cr, uid, ids, context=context)[0]
|
||||
if procurement.product_id.purchase_requisition:
|
||||
warehouse_id = warehouse_obj.search(cr, uid, [('company_id', '=', procurement.company_id.id or company.id)], context=context)
|
||||
res[procurement.id] = requisition_obj.create(cr, uid,
|
||||
{
|
||||
non_requisition = []
|
||||
for procurement in self.browse(cr, uid, ids, context=context):
|
||||
if procurement.product_id.purchase_requisition:
|
||||
user_company = self.pool['res.users'].browse(cr, uid, uid, context=context).company_id
|
||||
req = res[procurement.id] = requisition_obj.create(cr, uid, {
|
||||
'origin': procurement.origin,
|
||||
'date_end': procurement.date_planned,
|
||||
'warehouse_id':warehouse_id and warehouse_id[0] or False,
|
||||
'company_id':procurement.company_id.id,
|
||||
'line_ids': [(0,0,{
|
||||
'warehouse_id': self._get_warehouse(procurement, user_company),
|
||||
'company_id': procurement.company_id.id,
|
||||
'line_ids': [(0, 0, {
|
||||
'product_id': procurement.product_id.id,
|
||||
'product_uom_id': procurement.product_uom.id,
|
||||
'product_qty': procurement.product_qty
|
||||
|
||||
})],
|
||||
})],
|
||||
})
|
||||
self.write(cr,uid,[procurement.id],{'state': 'running','requisition_id': res[procurement.id]},context=context)
|
||||
else:
|
||||
res = super(procurement_order, self).make_po(cr, uid, ids, context=context)
|
||||
procurement.write({
|
||||
'state': 'running',
|
||||
'requisition_id': req
|
||||
})
|
||||
else:
|
||||
non_requisition.append(procurement.id)
|
||||
|
||||
if non_requisition:
|
||||
res.update(super(procurement_order, self).make_po(cr, uid, non_requisition, context=context))
|
||||
|
||||
return res
|
||||
|
||||
procurement_order()
|
||||
|
||||
Reference in New Issue
Block a user