From c1ea597cb7fa4ebe7591a3678fd573921c304388 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 26 Feb 2016 13:37:18 +0100 Subject: [PATCH] Redesign page with customer price to make it easier to understand. --- htdocs/core/lib/functions.lib.php | 1 + htdocs/product/price.php | 367 ++++++++++++++++++------------ 2 files changed, 217 insertions(+), 151 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 33cd6a270da..d7575cc6ab5 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2965,6 +2965,7 @@ function print_fiche_titre($title, $mesg='', $picto='title_generic.png', $pictoi * @param int $pictoisfullpath 1=Icon name is a full absolute url of image * @param int $id To force an id on html objects * @return string + * @see print_barre_list */ function load_fiche_titre($titre, $mesg='', $picto='title_generic.png', $pictoisfullpath=0, $id=0) { diff --git a/htdocs/product/price.php b/htdocs/product/price.php index c9023447307..e3a3d0f62dd 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -876,17 +876,18 @@ print '
'; dol_fiche_end(); + /* ************************************************************************** */ /* */ /* Barre d'action */ /* */ /* ************************************************************************** */ -if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $action == 'add_customer_price') +if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $action == 'showlog_default_price' || $action == 'add_customer_price') { print "\n" . '
' . "\n"; - if (empty($conf->global->PRODUIT_MULTIPRICES)) // For everyone, except multiprices + if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { if ($user->rights->produit->creer || $user->rights->service->creer) { print ''; @@ -1065,9 +1066,6 @@ if ($action == 'edit_price' && $object->getRights()->creer) } else { - dol_fiche_head(''); - - ?>