diff --git a/addons/mrp_repair/views/report_mrprepairorder.xml b/addons/mrp_repair/views/report_mrprepairorder.xml
index 2897fee1fd9..a6d00ba5b15 100644
--- a/addons/mrp_repair/views/report_mrprepairorder.xml
+++ b/addons/mrp_repair/views/report_mrprepairorder.xml
@@ -30,7 +30,7 @@
Repair Order N°:
- Repair Quotation N°:
+ Repair Quotation N°:
@@ -41,7 +41,9 @@
Lot Number
-
+
+
+
Guarantee Limit:
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index f44d354f121..044ff1333cd 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -50,7 +50,7 @@
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
-
+
Stock Picking Type multi-company
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b65c718be50..e29f4ccb9a1 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1789,7 +1789,7 @@ class stock_move(osv.osv):
'move_dest_id': move.id,
'group_id': group_id,
'route_ids': [(4, x.id) for x in move.route_ids],
- 'warehouse_id': move.warehouse_id and move.warehouse_id.id or False,
+ 'warehouse_id': move.warehouse_id.id or (move.picking_type_id and move.picking_type_id.warehouse_id.id or False),
'priority': move.priority,
}
diff --git a/addons/stock/views/report_stockpicking.xml b/addons/stock/views/report_stockpicking.xml
index d8d0ac40ec0..7d2bb125de2 100644
--- a/addons/stock/views/report_stockpicking.xml
+++ b/addons/stock/views/report_stockpicking.xml
@@ -6,16 +6,16 @@
-
-
+
+
-