diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index fa2dfedff49..2beed43af2e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -527,7 +527,8 @@ class mrp_production(osv.osv):
         'priority': fields.selection([('0', 'Not urgent'), ('1', 'Normal'), ('2', 'Urgent'), ('3', 'Very Urgent')], 'Priority',
             select=True, readonly=True, states=dict.fromkeys(['draft', 'confirmed'], [('readonly', False)])),
 
-        'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}, 
+                                      domain=[('type','!=','service')]),
         'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'product_uos_qty': fields.float('Product UoS Quantity', readonly=True, states={'draft': [('readonly', False)]}),
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7659dc1981a..9bf317885d3 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -684,7 +684,7 @@
                     </div>
                     <group>
                         <group>
-                            <field name="product_id" on_change="product_id_change(product_id, product_qty)" domain="[('bom_ids','!=',False),('bom_ids.type','!=','phantom'),('type','!=','service')]" class="oe_inline" context='{"default_type": "product"}'/>
+                            <field name="product_id" on_change="product_id_change(product_id, product_qty)" domain="[('bom_ids','!=',False),('bom_ids.type','!=','phantom')]" class="oe_inline" context='{"default_type": "product"}'/>
                             <label for="product_qty"/>
                             <div>
                                 <field name="product_qty" class="oe_inline" on_change="product_id_change(product_id, product_qty)"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 70c700199d6..b126b43c239 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1269,6 +1269,7 @@ class stock_picking(osv.osv):
             move_obj.action_confirm(cr, uid, moves, context=context)
         return moves
 
+
     def rereserve_quants(self, cr, uid, picking, move_ids=[], context=None):
         """ Unreserve quants then try to reassign quants."""
         stock_move_obj = self.pool.get('stock.move')
diff --git a/addons/stock_dropshipping/wizard/__init__.py b/addons/stock_dropshipping/wizard/__init__.py
index 2aff429ec00..eaaefbe7a25 100644
--- a/addons/stock_dropshipping/wizard/__init__.py
+++ b/addons/stock_dropshipping/wizard/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
+import stock_invoice_onshipping
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-import stock_invoice_onshipping
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file