From 1ae27b097750c7e7701df791a5bd0de5494954ec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Oct 2013 16:34:31 +0200
Subject: [PATCH] Qual: Remove a useless action button to save one click.

---
 htdocs/product/composition/fiche.php | 80 +++++++++++++++-------------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php
index 0cca7dee679..f8a17f501b4 100644
--- a/htdocs/product/composition/fiche.php
+++ b/htdocs/product/composition/fiche.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
@@ -168,15 +168,13 @@ $picto=($product->type==1?'service':'product');
 dol_fiche_head($head, 'subproduct', $titre, 0, $picto);
 
 
-if ($id || $ref)
+if ($id > 0 || ! empty($ref))
 {
-	if ($result)
+/*	if ($result)
 	{
 		if ($action <> 'edit' && $action <> 'search' && $action <> 're-edit')
 		{
-			/*
-			 *  En mode visu
-			 */
+			// mode visu
 
 			print '<table class="border" width="100%">';
 
@@ -262,11 +260,11 @@ if ($id || $ref)
 			dol_fiche_end();
 		}
 	}
-
+*/
 	/*
 	 * Fiche en mode edition
 	 */
-	if (($action == 'edit' || $action == 'search' || $action == 're-edit') && ($user->rights->produit->creer || $user->rights->service->creer))
+	if ($user->rights->produit->lire || $user->rights->service->lire)
 	{
 		print '<table class="border" width="100%">';
 
@@ -350,37 +348,44 @@ if ($id || $ref)
 
 		dol_fiche_end();
 
-		print '<br>';
 
-		$rowspan=1;
-		if (! empty($conf->categorie->enabled)) $rowspan++;
-
-        print_fiche_titre($langs->trans("ProductToAddSearch"),'','');
-		print '<form action="'.DOL_URL_ROOT.'/product/composition/fiche.php?id='.$id.'" method="post">';
-		print '<table class="border" width="100%"><tr><td>';
-		print '<table class="nobordernopadding">';
-
-		print '<tr><td>';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print $langs->trans("KeywordFilter").' &nbsp; ';
-		print '</td>';
-		print '<td><input type="text" name="key" value="'.$key.'">';
-		print '<input type="hidden" name="action" value="search">';
-		print '<input type="hidden" name="id" value="'.$id.'">';
-		print '</td>';
-		print '<td rowspan="'.$rowspan.'" valign="middle">';
-		print '<input type="submit" class="button" value="'.$langs->trans("Search").'">';
-		print '</td></tr>';
-		if (! empty($conf->categorie->enabled))
+		// Form with product to add
+		if ((empty($action) || $action == 'view' || $action == 'edit' || $action == 'search' || $action == 're-edit') && ($user->rights->produit->creer || $user->rights->service->creer))
 		{
-			print '<tr><td>'.$langs->trans("CategoryFilter").' &nbsp; </td>';
-			print '<td>'.$form->select_all_categories(0, $parent).'</td></tr>';
+			print '<br>';
+
+			$rowspan=1;
+			if (! empty($conf->categorie->enabled)) $rowspan++;
+
+	        print_fiche_titre($langs->trans("ProductToAddSearch"),'','');
+			print '<form action="'.DOL_URL_ROOT.'/product/composition/fiche.php?id='.$id.'" method="POST">';
+			print '<table class="border" width="100%"><tr><td>';
+			print '<table class="nobordernopadding">';
+
+			print '<tr><td>';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print $langs->trans("KeywordFilter").' &nbsp; ';
+			print '</td>';
+			print '<td><input type="text" name="key" value="'.$key.'">';
+			print '<input type="hidden" name="action" value="search">';
+			print '<input type="hidden" name="id" value="'.$id.'">';
+			print '</td>';
+			print '<td rowspan="'.$rowspan.'" valign="middle">';
+			print '<input type="submit" class="button" value="'.$langs->trans("Search").'">';
+			print '</td></tr>';
+			if (! empty($conf->categorie->enabled))
+			{
+				print '<tr><td>'.$langs->trans("CategoryFilter").' &nbsp; </td>';
+				print '<td>'.$form->select_all_categories(0, $parent).'</td></tr>';
+			}
+
+			print '</table>';
+			print '</td></td></table>';
+			print '</form>';
 		}
 
-		print '</table>';
-		print '</td></td></table>';
-		print '</form>';
 
+		// List of products
 		if ($action == 'search')
 		{
 			print '<br>';
@@ -491,7 +496,7 @@ if ($id || $ref)
 /* Barre d'action                                                             */
 /*                                                                            */
 /* ************************************************************************** */
-
+/*
 print "\n<div class=\"tabsAction\">\n";
 
 if ($action == '')
@@ -503,10 +508,9 @@ if ($action == '')
 }
 
 print "\n</div>\n";
-
+*/
 
 llxFooter();
 
 $db->close();
-
-?>
+?>
\ No newline at end of file