diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index ac051fd92e0..cad97108733 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -416,7 +416,7 @@ function dol_print_object_info($object, $usetable = 0) } else { print ': '; } - if (is_object($object->user_approve)) { + if (!empty($object->user_approve) && is_object($object->user_approve)) { if ($object->user_approve->id) { print $object->user_approve->getNomUrl(-1, '', 0, 0, 0); } else { diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index c352faef1fc..8ac65f6cac3 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -2084,6 +2084,10 @@ if ($action == 'create') { // Date if ($object->methode_commande_id > 0) { + $usehourmin = 0; + if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) { + $usehourmin = 1; + } print ''.$langs->trans("Date").''; print $object->date_commande ? dol_print_date($object->date_commande, $usehourmin ? 'dayhour' : 'day') : ''; if ($object->hasDelay() && !empty($object->date_delivery) && !empty($object->date_commande)) {