Merge pull request #330 from marcosgdf/fix-bug-504

Fixed bug #504

htdocs/product/admin/product.php

@@ -36,7 +36,7 @@ $langs->load("admin");
 $langs->load("products");
 
 // Security check
-if (! $user->admin || empty($conf->product->enabled))
+if (! $user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled)))
 	accessforbidden();
 
 $action = GETPOST('action','alpha');