diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 7f451ea6933..4198c1319b0 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -53,6 +53,7 @@
                         <group>
                             <field name="guarantee_limit"/>
                             <field name="deliver_bool"/>
+                            <field name="picking_type_id" attrs="{'invisible': [('deliver_bool','=', False)], 'required': [('deliver_bool', '=', True)]}"/>
                             <field name="repaired" groups="base.group_no_one"/>
                             <field name="invoiced" groups="base.group_no_one"/>
                         </group>
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 202ed6e4684..70132506310 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -256,7 +256,7 @@
           <para style="P16">[[ o.product_id.name or '' ]]</para>
         </td>
         <td>
-          <para style="P16">[[ o.prodlot_id.name or ' ' ]]</para>
+          <para style="P16">[[ ','.join([x.name for x in o.move_id.lot_ids]) ]]</para>
         </td>
         <td>
           <para style="P16">[[ formatLang(o.guarantee_limit,date = True) ]]</para>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index c620142112a..789449b84d6 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -62,7 +62,7 @@
                         <field name="ordering_date" attrs="{'readonly': [('state','not in',('draft'))]}"/>
                         <field name="schedule_date" attrs="{'readonly': [('state','not in',('draft'))]}"/>
                         <field name="origin" placeholder="e.g. OP0025" attrs="{'readonly': [('state','not in',('draft'))]}"/>
-                        <field name="warehouse_id" widget="selection" groups="stock.group_locations" attrs="{'readonly': [('state','not in',('draft'))]}"/>
+                        <field name="picking_type_id" widget="selection" groups="stock.group_locations" attrs="{'readonly': [('state','not in',('draft'))]}"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection" attrs="{'readonly': [('state','not in',('draft'))]}"/>
                     </group>
                 </group>