diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index e2e94233861..2ede7b27b9d 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -239,16 +239,27 @@ class mrp_bom(osv.osv):
         """
         if properties is None:
             properties = []
-        domain = None
         if product_id:
-            domain = ['|',('product_id', '=', product_id),('product_tmpl_id.product_variant_ids', '=', product_id)]
-        else:
+            if not product_tmpl_id:
+                product_tmpl_id = self.pool['product.product'].browse(cr, uid, product_id).product_tmpl_id.id
+            domain = [
+                '|',
+                    ('product_id', '=', product_id),
+                    '&',
+                        ('product_id', '=', False),
+                        ('product_tmpl_id', '=', product_tmpl_id)
+            ]
+        elif product_tmpl_id:
             domain = [('product_id', '=', False), ('product_tmpl_id', '=', product_tmpl_id)]
+        else:
+            # neither product nor template, makes no sense to search
+            return False
         if product_uom:
             domain +=  [('product_uom','=',product_uom)]
         domain = domain + [ '|', ('date_start', '=', False), ('date_start', '<=', time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)),
                             '|', ('date_stop', '=', False), ('date_stop', '>=', time.strftime(DEFAULT_SERVER_DATETIME_FORMAT))]
-        ids = self.search(cr, uid, domain)
+        # order to prioritize bom with product_id over the one without
+        ids = self.search(cr, uid, domain, order='product_id')
         for bom in self.pool.get('mrp.bom').browse(cr, uid, ids):
             if not set(map(int,bom.property_ids or [])) - set(properties or []):
                 return bom.id
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8402f9965f5..9228e71e131 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -587,7 +587,7 @@
             <field name="arch" type="xml">
                 <div name="options" position="inside">
                     <div>
-                        <field name="purchase_ok" attrs="{'readonly': [('is_product_variant', '=', False)]}"/>
+                        <field name="purchase_ok"/>
                         <label for="purchase_ok"/>
                     </div>
                 </div>
diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml
index c1d504e51be..aebdbacb9dd 100644
--- a/addons/web_kanban/static/src/xml/web_kanban.xml
+++ b/addons/web_kanban/static/src/xml/web_kanban.xml
@@ -45,8 +45,8 @@
                     <ul class="oe_dropdown_menu oe_kanban_group_dropdown">
                         <li><a data-action="toggle_fold" href="#">Fold</a></li>
                         <t t-if="widget.view.grouped_by_m2o and widget.value">
-                            <li t-if="parent.is_action_enabled('group_edit')"><a data-action="edit" href="#">Edit</a></li>
-                            <li t-if="parent.is_action_enabled('group_delete')"><a data-action="delete" href="#">Delete</a></li>
+                            <li t-if="parent &amp;&amp; parent.is_action_enabled('group_edit')"><a data-action="edit" href="#">Edit</a></li>
+                            <li t-if="parent &amp;&amp; parent.is_action_enabled('group_delete')"><a data-action="delete" href="#">Delete</a></li>
                         </t>
                     </ul>
                 </div>