diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index f71e787c739..ef4c8533485 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -971,12 +971,12 @@ class ProductProduct(models.Model):
     @api.multi
     def _purchase_count(self):
         domain = [
-            ('state', 'in', ['confirmed', 'approved', 'done']),
+            ('state', 'in', ['purchase', 'done']),
             ('product_id', 'in', self.mapped('id')),
         ]
         r = {}
-        for group in self.env['purchase.report'].read_group(domain, ['product_id', 'quantity'], ['product_id']):
-            r[group['product_id'][0]] = group['quantity']
+        for group in self.env['purchase.report'].read_group(domain, ['product_id', 'unit_quantity'], ['product_id']):
+            r[group['product_id'][0]] = group['unit_quantity']
         for product in self:
             product.purchase_count = r.get(product.id, 0)
         return True
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index a78c0298db7..55996435132 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -539,7 +539,7 @@
 
         <record model="ir.actions.act_window" id="action_purchase_line_product_tree">
             <field name="context">{}</field>
-            <field name="domain">[('product_id','in',active_ids)]</field>
+            <field name="domain">[('product_id.product_tmpl_id','in',active_ids), ('state', 'in', ['purchase', 'done'])]</field>
             <field name="name">Purchases</field>
             <field name="res_model">purchase.order.line</field>
             <field name="view_id" ref="purchase_order_line_tree"/>