From 46c985d8cc9a526d550f8e54097edf958b34f6a3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 17 Oct 2016 15:16:21 +0200 Subject: [PATCH 1/2] FIX Hidden option PRODUCT_MAX_VISIBLE_PHOTO --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index e1e1b833248..279d1342580 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -929,7 +929,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r $showimage=$object->is_photo_available($conf->product->multidir_output[$object->entity]); $maxvisiblephotos=(isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO)?$conf->global->PRODUCT_MAX_VISIBLE_PHOTO:5); if ($conf->browser->phone) $maxvisiblephotos=1; - if ($showimage) $morehtmlleft.='
'.$object->show_photos($conf->product->multidir_output[$object->entity],'small',-$maxvisiblephotos,0,0,0,$width,0).'
'; + if ($showimage) $morehtmlleft.='
'.$object->show_photos($conf->product->multidir_output[$object->entity],'small',$maxvisiblephotos,0,0,0,$width,0).'
'; else { if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) { From 24ee2bce14b975ea89f90e0d0adc314659379a0a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 18 Oct 2016 12:57:30 +0200 Subject: [PATCH 2/2] FIX Can edit the customer ref even if order is not draft. --- htdocs/commande/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index dd9a45eae3d..0930a205151 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1981,7 +1981,7 @@ if ($action == 'create' && $user->rights->commande->creer) print ''; - if ($action != 'refcustomer' && $object->brouillon) + if ($action != 'refcustomer') print ''; print '
'; print $langs->trans('RefCustomer') . ''; print '' . img_edit($langs->trans('Modify')) . '
'; print '';