[FIX] stock: reconfiguration of warehouse was buggy when the default resupply warehouse was removed from both the m2o and the m2m, the rules were also wrongly created (not in MTO) and the code was not clean. The renaming of a warehouse is also fixed and the buy/manufacture pull rules are now treated as well
bzr revid: qdp-launchpad@openerp.com-20131105154923-sl8ei71aa123t108
This commit is contained in:
Quentin (OpenERP)
parent
2056fc9eb4
commit
588507c071
|
|
@ -240,6 +240,13 @@ class stock_warehouse(osv.osv):
|
|||
all_routes += [warehouse.manufacture_pull_id.route_id.id]
|
||||
return all_routes
|
||||
|
||||
def _handle_renaming(self, cr, uid, warehouse, name, context=None):
|
||||
res = super(stock_warehouse, self)._handle_renaming(cr, uid, warehouse, name, context=context)
|
||||
pull_obj = self.pool.get('procurement.rule')
|
||||
#change the manufacture pull rule name
|
||||
pull_obj.write(cr, uid, warehouse.manufacture_pull_id.id, {'name': warehouse.manufacture_pull_id.name.replace(warehouse.name, name, 1)}, context=context)
|
||||
return res
|
||||
|
||||
def _get_all_products_to_resupply(self, cr, uid, warehouse, context=None):
|
||||
res = super(stock_warehouse, self)._get_all_products_to_resupply(cr, uid, warehouse, context=context)
|
||||
if warehouse.manufacture_pull_id and warehouse.manufacture_pull_id.route_id:
|
||||
|
|
|
|||
|
|
@ -148,6 +148,13 @@ class stock_warehouse(osv.osv):
|
|||
break
|
||||
return res
|
||||
|
||||
def _handle_renaming(self, cr, uid, warehouse, name, context=None):
|
||||
res = super(stock_warehouse, self)._handle_renaming(cr, uid, warehouse, name, context=context)
|
||||
pull_obj = self.pool.get('procurement.rule')
|
||||
#change the buy pull rule name
|
||||
pull_obj.write(cr, uid, warehouse.buy_pull_id.id, {'name': warehouse.buy_pull_id.name.replace(warehouse.name, name, 1)}, context=context)
|
||||
return res
|
||||
|
||||
def change_route(self, cr, uid, ids, warehouse, new_reception_step=False, new_delivery_step=False, context=None):
|
||||
res = super(stock_warehouse, self).change_route(cr, uid, ids, warehouse, new_reception_step=new_reception_step, new_delivery_step=new_delivery_step, context=context)
|
||||
if warehouse.in_type_id.default_location_dest_id != warehouse.buy_pull_id.location_id:
|
||||
|
|
|
|||
|
|
@ -2263,6 +2263,10 @@ class stock_warehouse(osv.osv):
|
|||
product_ids = self._get_all_products_to_resupply(cr, uid, warehouse, context=context)
|
||||
self.pool.get('product.product').write(cr, uid, product_ids, {'route_ids': [(4, inter_wh_route_id)]}, context=context)
|
||||
|
||||
def _unassign_route_on_products(self, cr, uid, warehouse, inter_wh_route_id, context=None):
|
||||
product_ids = self._get_all_products_to_resupply(cr, uid, warehouse, context=context)
|
||||
self.pool.get('product.product').write(cr, uid, product_ids, {'route_ids': [(3, inter_wh_route_id)]}, context=context)
|
||||
|
||||
def _get_inter_wh_route(self, cr, uid, warehouse, wh, context=None):
|
||||
return {
|
||||
'name': _('%s: Supply Product from %s') % (warehouse.name, wh.name),
|
||||
|
|
@ -2291,12 +2295,14 @@ class stock_warehouse(osv.osv):
|
|||
inter_wh_route_vals = self._get_inter_wh_route(cr, uid, warehouse, wh, context=context)
|
||||
inter_wh_route_id = route_obj.create(cr, uid, vals=inter_wh_route_vals, context=context)
|
||||
values = [(output_loc, inter_wh_location, wh.out_type_id.id), (inter_wh_location, input_loc, warehouse.in_type_id.id)]
|
||||
dummy, pull_rules_list = self._get_push_pull_rules(cr, uid, warehouse, True, values, inter_wh_route_id, context=context)
|
||||
dummy, pull_rules_list = self._get_push_pull_rules(cr, uid, warehouse, True, values, inter_wh_route_id, force_mto=True, context=context)
|
||||
for pull_rule in pull_rules_list:
|
||||
pull_obj.create(cr, uid, vals=pull_rule, context=context)
|
||||
#if the warehouse is also set as default resupply method, assign this route automatically to all product
|
||||
if default_resupply_wh and default_resupply_wh.id == wh.id:
|
||||
self._assign_route_on_products(cr, uid, warehouse, inter_wh_route_id, context=context)
|
||||
#finally, save the route on the warehouse
|
||||
self.write(cr, uid, [warehouse.id], {'route_ids': [(4, inter_wh_route_id)]}, context=context)
|
||||
|
||||
def _default_stock_id(self, cr, uid, context=None):
|
||||
#lot_input_stock = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock')
|
||||
|
|
@ -2362,7 +2368,7 @@ class stock_warehouse(osv.osv):
|
|||
'sequence': 10,
|
||||
}
|
||||
|
||||
def _get_push_pull_rules(self, cr, uid, warehouse, active, values, new_route_id, context=None):
|
||||
def _get_push_pull_rules(self, cr, uid, warehouse, active, values, new_route_id, force_mto=False, context=None):
|
||||
first_rule = True
|
||||
push_rules_list = []
|
||||
pull_rules_list = []
|
||||
|
|
@ -2384,7 +2390,7 @@ class stock_warehouse(osv.osv):
|
|||
'route_id': new_route_id,
|
||||
'action': 'move',
|
||||
'picking_type_id': pick_type_id,
|
||||
'procure_method': first_rule is True and 'make_to_stock' or 'make_to_order',
|
||||
'procure_method': force_mto and 'make_to_order' or (first_rule is True and 'make_to_stock' or 'make_to_order'),
|
||||
'active': active,
|
||||
'warehouse_id': warehouse.id,
|
||||
})
|
||||
|
|
@ -2470,7 +2476,7 @@ class stock_warehouse(osv.osv):
|
|||
#create route selectable on the product to resupply the warehouse from another one
|
||||
self._create_resupply_routes(cr, uid, warehouse, warehouse.resupply_wh_ids, warehouse.default_resupply_wh_id, context=context)
|
||||
|
||||
#return routes and mto pull rule for warehouse
|
||||
#return routes and mto pull rule to store on the warehouse
|
||||
return {
|
||||
'route_ids': wh_route_ids,
|
||||
'mto_pull_id': mto_pull_id,
|
||||
|
|
@ -2687,17 +2693,32 @@ class stock_warehouse(osv.osv):
|
|||
'pick_pack_ship': (_('Pick + Pack + Ship'), [(warehouse.lot_stock_id, warehouse.wh_pack_stock_loc_id, warehouse.int_type_id.id), (warehouse.wh_pack_stock_loc_id, warehouse.wh_output_stock_loc_id, warehouse.pack_type_id.id), (warehouse.wh_output_stock_loc_id, customer_loc, warehouse.out_type_id.id)]),
|
||||
}
|
||||
|
||||
def _handle_renaming(self, cr, uid, warehouse, name, context=None):
|
||||
location_obj = self.pool.get('stock.location')
|
||||
route_obj = self.pool.get('stock.location.route')
|
||||
pull_obj = self.pool.get('procurement.rule')
|
||||
push_obj = self.pool.get('stock.location.path')
|
||||
#rename location
|
||||
location_id = warehouse.lot_stock_id.location_id.id
|
||||
location_obj.write(cr, uid, location_id, {'name': name}, context=context)
|
||||
#rename route and push-pull rules
|
||||
for route in warehouse.route_ids:
|
||||
route_obj.write(cr, uid, route.id, {'name': route.name.replace(warehouse.name, name, 1)}, context=context)
|
||||
for pull in route.pull_ids:
|
||||
pull_obj.write(cr, uid, pull.id, {'name': pull.name.replace(warehouse.name, name, 1)}, context=context)
|
||||
for push in route.push_ids:
|
||||
push_obj.write(cr, uid, push.id, {'name': pull.name.replace(warehouse.name, name, 1)}, context=context)
|
||||
#change the mto pull rule name
|
||||
pull_obj.write(cr, uid, warehouse.mto_pull_id.id, {'name': warehouse.mto_pull_id.name.replace(warehouse.name, name, 1)}, context=context)
|
||||
|
||||
def write(self, cr, uid, ids, vals, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
if isinstance(ids, (int, long)):
|
||||
ids = [ids]
|
||||
seq_obj = self.pool.get('ir.sequence')
|
||||
location_obj = self.pool.get('stock.location')
|
||||
route_obj = self.pool.get('stock.location.route')
|
||||
warehouse_obj = self.pool.get('stock.warehouse')
|
||||
pull_obj = self.pool.get('procurement.rule')
|
||||
push_obj = self.pool.get('stock.location.path')
|
||||
|
||||
context_with_inactive = context.copy()
|
||||
context_with_inactive['active_test'] = False
|
||||
|
|
@ -2713,48 +2734,40 @@ class stock_warehouse(osv.osv):
|
|||
#rename sequence
|
||||
if vals.get('name'):
|
||||
name = vals.get('name')
|
||||
#rename location
|
||||
location_id = warehouse.lot_stock_id.location_id.id
|
||||
location_obj.write(cr, uid, location_id, {'name': name}, context=context_with_inactive)
|
||||
#rename route and push-pull rules
|
||||
for route in warehouse.route_ids:
|
||||
route_obj.write(cr, uid, route.id, {'name': route.name.replace(warehouse.name, name, 1)}, context=context_with_inactive)
|
||||
for pull in route.pull_ids:
|
||||
pull_obj.write(cr, uid, pull.id, {'name': pull.name.replace(warehouse.name, name, 1)}, context=context_with_inactive)
|
||||
for push in route.push_ids:
|
||||
push_obj.write(cr, uid, push.id, {'name': pull.name.replace(warehouse.name, name, 1)}, context=context_with_inactive)
|
||||
#change the mto pull rule name
|
||||
pull_obj.write(cr, uid, warehouse.mto_pull_id.id, {'name': warehouse.mto_pull_id.name.replace(warehouse.name, name, 1)}, context=context_with_inactive)
|
||||
self._handle_renaming(cr, uid, warehouse, name, context=context_with_inactive)
|
||||
seq_obj.write(cr, uid, warehouse.in_type_id.sequence_id.id, {'name': name + _(' Sequence in'), 'prefix': vals.get('code', warehouse.code) + '\IN\\'}, context=context)
|
||||
seq_obj.write(cr, uid, warehouse.out_type_id.sequence_id.id, {'name': name + _(' Sequence out'), 'prefix': vals.get('code', warehouse.code) + '\OUT\\'}, context=context)
|
||||
seq_obj.write(cr, uid, warehouse.pack_type_id.sequence_id.id, {'name': name + _(' Sequence packing'), 'prefix': vals.get('code', warehouse.code) + '\PACK\\'}, context=context)
|
||||
seq_obj.write(cr, uid, warehouse.pick_type_id.sequence_id.id, {'name': name + _(' Sequence picking'), 'prefix': vals.get('code', warehouse.code) + '\PICK\\'}, context=context)
|
||||
seq_obj.write(cr, uid, warehouse.int_type_id.sequence_id.id, {'name': name + _(' Sequence internal'), 'prefix': vals.get('code', warehouse.code) + '\INT\\'}, context=context)
|
||||
|
||||
if vals.get('resupply_wh_ids') and not vals.get('resupply_route_ids'):
|
||||
for cmd in vals.get('resupply_wh_ids'):
|
||||
if cmd[0] == 6:
|
||||
new_ids = set(cmd[2])
|
||||
old_ids = set([wh.id for wh in warehouse.resupply_wh_ids])
|
||||
to_add_wh_ids = new_ids - old_ids
|
||||
supplier_warehouses = warehouse_obj.browse(cr, uid, list(to_add_wh_ids), context=context)
|
||||
self._create_resupply_routes(cr, uid, warehouse, supplier_warehouses, warehouse.default_resupply_wh_id, context=context)
|
||||
if to_add_wh_ids:
|
||||
supplier_warehouses = warehouse_obj.browse(cr, uid, list(to_add_wh_ids), context=context)
|
||||
self._create_resupply_routes(cr, uid, warehouse, supplier_warehouses, warehouse.default_resupply_wh_id, context=context)
|
||||
to_remove_wh_ids = old_ids - new_ids
|
||||
to_remove_route_ids = route_obj.search(cr, uid, [('supplied_wh_id', '=', warehouse.id), ('supplier_wh_id', 'in', list(to_remove_wh_ids))], context=context)
|
||||
route_obj.unlink(cr, uid, to_remove_route_ids, context=context)
|
||||
if to_remove_wh_ids:
|
||||
to_remove_route_ids = route_obj.search(cr, uid, [('supplied_wh_id', '=', warehouse.id), ('supplier_wh_id', 'in', list(to_remove_wh_ids))], context=context)
|
||||
if to_remove_route_ids:
|
||||
route_obj.unlink(cr, uid, to_remove_route_ids, context=context)
|
||||
else:
|
||||
#not implemented
|
||||
pass
|
||||
if 'default_resupply_wh_id' in vals:
|
||||
if warehouse.default_resupply_wh_id:
|
||||
#remove the existing resupplying route on all products
|
||||
to_remove_route_ids = route_obj.search(cr, uid, [('supplied_wh_id', '=', warehouse.id), ('supplier_wh_id', '=', warehouse.default_resupply_wh_id.id)], context=context)
|
||||
route_obj.unlink(cr, uid, to_remove_route_ids, context=context)
|
||||
self._create_resupply_routes(cr, uid, warehouse, [warehouse.default_resupply_wh_id], False, context=context)
|
||||
for inter_wh_route_id in to_remove_route_ids:
|
||||
self._unassign_route_on_products(cr, uid, warehouse, inter_wh_route_id, context=context)
|
||||
if vals.get('default_resupply_wh_id'):
|
||||
to_remove_route_ids = route_obj.search(cr, uid, [('supplied_wh_id', '=', warehouse.id), ('supplier_wh_id', '=', vals.get('default_resupply_wh_id'))], context=context)
|
||||
route_obj.unlink(cr, uid, to_remove_route_ids, context=context)
|
||||
def_supplier_wh = warehouse_obj.browse(cr, uid, vals['default_resupply_wh_id'], context=context)
|
||||
self._create_resupply_routes(cr, uid, warehouse, [def_supplier_wh], def_supplier_wh, context=context)
|
||||
#assign the new resupplying route on all products
|
||||
to_assign_route_ids = route_obj.search(cr, uid, [('supplied_wh_id', '=', warehouse.id), ('supplier_wh_id', '=', vals.get('default_resupply_wh_id'))], context=context)
|
||||
for inter_wh_route_id in to_assign_route_ids:
|
||||
self._assign_route_on_products(cr, uid, warehouse, inter_wh_route_id, context=context)
|
||||
|
||||
return super(stock_warehouse, self).write(cr, uid, ids, vals=vals, context=context)
|
||||
|
||||
|
|
@ -2763,13 +2776,8 @@ class stock_warehouse(osv.osv):
|
|||
return super(stock_warehouse, self).unlink(cr, uid, ids, context=context)
|
||||
|
||||
def get_all_routes_for_wh(self, cr, uid, warehouse, context=None):
|
||||
all_routes = []
|
||||
all_routes += [warehouse.crossdock_route_id.id]
|
||||
all_routes += [warehouse.reception_route_id.id]
|
||||
all_routes += [warehouse.delivery_route_id.id]
|
||||
all_routes = [route.id for route in warehouse.route_ids]
|
||||
all_routes += [warehouse.mto_pull_id.route_id.id]
|
||||
all_routes += [route.id for route in warehouse.resupply_route_ids]
|
||||
all_routes += [route.id for route in warehouse.route_ids]
|
||||
return all_routes
|
||||
|
||||
def view_all_routes_for_wh(self, cr, uid, ids, context=None):
|
||||
|
|
@ -2802,7 +2810,7 @@ class stock_location_path(osv.osv):
|
|||
if context is None:
|
||||
context = {}
|
||||
context_with_inactive = context.copy()
|
||||
context_with_inactive['active_test']=False
|
||||
context_with_inactive['active_test'] = False
|
||||
for route in self.pool.get('stock.location.route').browse(cr, uid, ids, context=context_with_inactive):
|
||||
for push_rule in route.push_ids:
|
||||
result[push_rule.id] = True
|
||||
|
|
|
|||
Loading…
Reference in New Issue