diff --git a/addons/stock/models/stock_location.py b/addons/stock/models/stock_location.py
index 58ae5fab3e8..39826717a1a 100644
--- a/addons/stock/models/stock_location.py
+++ b/addons/stock/models/stock_location.py
@@ -254,7 +254,11 @@ class Location(models.Model):
for values in quant_data:
qty_by_location[values['location_id'][0]] += values['quantity']
- return putaway_rules._get_putaway_location(product, quantity, package, qty_by_location) or self
+ putaway_location = putaway_rules._get_putaway_location(product, quantity, package, qty_by_location)
+ if not putaway_location:
+ putaway_location = locations[0] if locations and self.usage == 'view' else self
+
+ return putaway_location
def _get_next_inventory_date(self):
""" Used to get the next inventory date for a quant located in this location. It is
diff --git a/addons/stock/models/stock_move_line.py b/addons/stock/models/stock_move_line.py
index c198a9509ff..4b700923e4c 100644
--- a/addons/stock/models/stock_move_line.py
+++ b/addons/stock/models/stock_move_line.py
@@ -54,8 +54,8 @@ class StockMoveLine(models.Model):
'res.partner', 'From Owner',
check_company=True,
help="When validating the transfer, the products will be taken from this owner.")
- location_id = fields.Many2one('stock.location', 'From', check_company=True, required=True)
- location_dest_id = fields.Many2one('stock.location', 'To', check_company=True, required=True)
+ location_id = fields.Many2one('stock.location', 'From', domain="[('usage', '!=', 'view')]", check_company=True, required=True)
+ location_dest_id = fields.Many2one('stock.location', 'To', domain="[('usage', '!=', 'view')]", check_company=True, required=True)
lots_visible = fields.Boolean(compute='_compute_lots_visible')
picking_code = fields.Selection(related='picking_id.picking_type_id.code', readonly=True)
picking_type_use_create_lots = fields.Boolean(related='picking_id.picking_type_id.use_create_lots', readonly=True)
diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml
index 8d7eca6e009..9f6edf415dd 100644
--- a/addons/stock/views/stock_move_views.xml
+++ b/addons/stock/views/stock_move_views.xml
@@ -213,8 +213,8 @@
-
-
+
+
-
-
+
+