diff --git a/addons/stock/models/procurement.py b/addons/stock/models/procurement.py index bc06e4a1a12..87f2af00d8e 100644 --- a/addons/stock/models/procurement.py +++ b/addons/stock/models/procurement.py @@ -176,11 +176,6 @@ class ProcurementOrder(models.Model): 'priority': self.priority, } - def _run_move_create(self): - # FIXME - remove me in master/saas-14 - _logger.warning("'_run_move_create' has been renamed into '_get_stock_move_values'... Overrides are ignored") - return self._get_stock_move_values() - @api.multi def _run(self): if self.rule_id.action == 'move': diff --git a/addons/stock/models/stock_quant.py b/addons/stock/models/stock_quant.py index ccff6fad0f3..2ef8d7615e0 100644 --- a/addons/stock/models/stock_quant.py +++ b/addons/stock/models/stock_quant.py @@ -266,17 +266,6 @@ class Quant(models.Model): # create the quant as superuser, because we want to restrict the creation of quant manually: we should always use this method to create quants return self.sudo().create(vals) - @api.model - def _quant_create(self, qty, move, lot_id=False, owner_id=False, - src_package_id=False, dest_package_id=False, - force_location_from=False, force_location_to=False): - # FIXME - remove me in master/saas-14 - _logger.warning("'_quant_create' has been renamed into '_quant_create_from_move'... Overrides are ignored") - return self._quant_create_from_move( - qty, move, lot_id=lot_id, owner_id=owner_id, - src_package_id=src_package_id, dest_package_id=dest_package_id, - force_location_from=force_location_from, force_location_to=force_location_to) - @api.multi def _quant_update_from_move(self, move, location_dest_id, dest_package_id, lot_id=False, entire_pack=False): vals = { @@ -289,12 +278,6 @@ class Quant(models.Model): vals.update({'package_id': dest_package_id}) self.write(vals) - @api.multi - def move_quants_write(self, move, location_dest_id, dest_package_id, lot_id=False, entire_pack=False): - # FIXME - remove me in master/saas-14 - _logger.warning("'move_quants_write' has been renamed into '_quant_update_from_move'... Overrides are ignored") - return self._quant_update_from_move(move, location_dest_id, dest_package_id, lot_id=lot_id, entire_pack=entire_pack) - @api.one def _quant_reconcile_negative(self, move): """ diff --git a/addons/stock/models/stock_warehouse.py b/addons/stock/models/stock_warehouse.py index 189618a7755..13695b082a9 100644 --- a/addons/stock/models/stock_warehouse.py +++ b/addons/stock/models/stock_warehouse.py @@ -457,11 +457,6 @@ class Warehouse(models.Model): 'supplied_wh_id': self.id, 'supplier_wh_id': supplier_warehouse.id} - def _get_inter_wh_route(self, supplier_warehouse): - # FIXME - remove me in master/saas-14 - _logger.warning("'_get_inter_wh_route' has been renamed into '_get_inter_warehouse_route_values'... Overrides are ignored") - return self._get_inter_warehouse_route_values(supplier_warehouse) - def _get_crossdock_route_values(self): return { 'name': self._format_routename(route_type='crossdock'), @@ -471,11 +466,6 @@ class Warehouse(models.Model): 'active': self.delivery_steps != 'ship_only' and self.reception_steps != 'one_step', 'sequence': 20} - def _get_crossdock_route(self, route_name): - # FIXME - remove me in master/saas-14 - _logger.warning("'_get_crossdock_route' has been renamed into '_get_crossdock_route_values'... Overrides are ignored") - return self._get_crossdock_route_values(route_name) - # Pull / Push tools # ------------------------------------------------------------ @@ -514,16 +504,6 @@ class Warehouse(models.Model): 'active': True}, name_suffix=_('MTO')) return pull_rules_list - def _get_mto_pull_rule(self, route_values): - # FIXME - remove me in master/saas-14 - _logger.warning("'_get_mto_pull_rule' has been renamed into '_get_mto_pull_rules_values'... Overrides are ignored") - return self._get_mto_pull_rules_values(route_values) - - def _get_push_pull_rules(self, active, values, new_route_id): - # FIXME - remove me in master/saas-14 - _logger.warning("'_get_push_pull_rules' has been renamed into '_get_push_pull_rules_values'... Overrides are ignored") - return self._get_push_pull_rules_values(values, values={'active': active, 'route_id': new_route_id}) - def _get_supply_pull_rules_values(self, route_values, values=None): dummy, pull_rules_list = self._get_push_pull_rules_values(route_values, values=values, pull_values={'active': True}) for pull_rules in pull_rules_list: @@ -540,11 +520,6 @@ class Warehouse(models.Model): change_to_multiple = warehouse.delivery_steps == 'ship_only' warehouse._check_delivery_resupply(output_loc, change_to_multiple) - def _check_resupply(self, reception_new, delivery_new): - # FIXME - remove me in master/saas-14 - _logger.warning("'_check_resupply' has been renamed into '_update_reception_delivery_resupply'... Overrides are ignored") - return self._update_reception_delivery_resupply(reception_new, delivery_new) - def _check_delivery_resupply(self, new_location, change_to_multiple): """ Check if the resupply routes from this warehouse follow the changes of number of delivery steps Check routes being delivery bu this warehouse and change the rule going to transit location """ @@ -588,12 +563,6 @@ class Warehouse(models.Model): self._create_or_update_mto_pull(routes_data) return True - @api.multi - def change_route(self): - # FIXME - remove me in master/saas-14 - _logger.warning("'change_route' has been renamed into '_update_routes'... Overrides are ignored") - return self._update_routes() - @api.one def _update_picking_type(self): picking_type_values = self._get_picking_type_values(self.reception_steps, self.delivery_steps, self.wh_pack_stock_loc_id) @@ -623,12 +592,6 @@ class Warehouse(models.Model): warehouse.pick_type_id.sequence_id.write(sequence_data['pick_type_id']) warehouse.int_type_id.sequence_id.write(sequence_data['int_type_id']) - @api.multi - def _handle_renaming(self, new_name=False, new_code=False): - # FIXME - remove me in master/saas-14 - _logger.warning("'_handle_renaming' has been renamed into '_update_name_and_code'... Overrides are ignored") - return self._update_name_and_code(new_name=new_name, new_code=new_code) - def _update_location_reception(self, new_reception_step): switch_warehouses = self.filtered(lambda wh: wh.reception_steps != new_reception_step and not wh._location_used(wh.wh_input_stock_loc_id)) if switch_warehouses: