From 997fd5ba5de8e50c0ddecaf821142c9448b480f3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@destailleur.fr> Date: Sat, 27 Feb 2016 11:59:51 +0100 Subject: [PATCH] Fix do not show no price because e already have default --- htdocs/product/price.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/product/price.php b/htdocs/product/price.php index e3a3d0f62dd..168c844768e 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -887,7 +887,7 @@ if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $ { print "\n" . '<div class="tabsAction">' . "\n"; - if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES)) + if (empty($conf->global->PRODUIT_MULTIPRICES)) { if ($user->rights->produit->creer || $user->rights->service->creer) { print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&id=' . $object->id . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>'; @@ -1606,7 +1606,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print $langs->trans('None'); } } - else if ($action != 'showlog_default_price') + else if ($action != 'showlog_default_price' && $action != 'edit_price') { // List of all prices by customers @@ -1738,14 +1738,14 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print "</tr>\n"; } } - else + /*else { $colspan=9; if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan+=1; print "<tr ".$bc[false].">"; print '<td colspan="'.$colspan.'">'.$langs->trans('None').'</td>'; print "</tr>"; - } + }*/ print "</table>"; -- GitLab