[FIX] picking_type_id from push rule
bzr revid: fp@tinyerp.com-20130730151731-685wj39c20v423ke
This commit is contained in:
parent
4919049903
commit
3fe258af58
|
@ -90,8 +90,6 @@ class stock_location_path(osv.osv):
|
||||||
'date': newdate,
|
'date': newdate,
|
||||||
'location_dest_id': rule.location_dest_id.id
|
'location_dest_id': rule.location_dest_id.id
|
||||||
})
|
})
|
||||||
vals = {}
|
|
||||||
vals['type'] = rule.picking_type
|
|
||||||
if rule.location_dest_id.id<>move.location_dest_id.id:
|
if rule.location_dest_id.id<>move.location_dest_id.id:
|
||||||
move_obj._push_apply(self, cr, uid, move.id, context)
|
move_obj._push_apply(self, cr, uid, move.id, context)
|
||||||
return move.id
|
return move.id
|
||||||
|
@ -103,6 +101,7 @@ class stock_location_path(osv.osv):
|
||||||
'company_id': rule.company_id and rule.company_id.id or False,
|
'company_id': rule.company_id and rule.company_id.id or False,
|
||||||
'date_expected': newdate,
|
'date_expected': newdate,
|
||||||
'picking_id': False,
|
'picking_id': False,
|
||||||
|
'picking_type_id': rule.picking_type_id and rule.picking_type_id.id or False,
|
||||||
'type': move_obj.get_type_from_usage(cr, uid, move.location_id, move.location_dest_id, context=context),
|
'type': move_obj.get_type_from_usage(cr, uid, move.location_id, move.location_dest_id, context=context),
|
||||||
'rule_id': rule.id,
|
'rule_id': rule.id,
|
||||||
'propagate': rule.propagate,
|
'propagate': rule.propagate,
|
||||||
|
@ -310,7 +309,6 @@ class stock_location(osv.osv):
|
||||||
'putaway_strategy_ids': fields.one2many('product.putaway', 'location_id', 'Put Away Strategies'),
|
'putaway_strategy_ids': fields.one2many('product.putaway', 'location_id', 'Put Away Strategies'),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def get_putaway_strategy(self, cr, uid, location, product, context=None):
|
def get_putaway_strategy(self, cr, uid, location, product, context=None):
|
||||||
pa = self.pool.get('product.putaway')
|
pa = self.pool.get('product.putaway')
|
||||||
categ = product.categ_id
|
categ = product.categ_id
|
||||||
|
|
Loading…
Reference in New Issue