merge

order_point.py

@@ -15,7 +15,9 @@ class OrderPoint(OSV):
 
     product = fields.Many2One(
         'product.product', 'Product', required=True, select=1,
-        domain=[('type', '=', 'stockable')])
+        domain="type == 'purchase' "\
+            "and [('type', '=', 'stockable'), ('purchasable', '=', True)] "\
+            "or [('type', '=', 'stockable')]")
     warehouse_location = fields.Many2One(
         'stock.location', 'Warehouse Location', select=1,
         domain="[('type', '=', 'warehouse')]",