From e6ee1e70413f19e139a089f1626770b6f73e0a76 Mon Sep 17 00:00:00 2001 From: VESSILLER Date: Thu, 27 Jun 2019 14:21:38 +0200 Subject: [PATCH 1/3] FIX Force order method in order supplier before making order --- htdocs/fourn/commande/card.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 9b27810e6bb..178816bccbb 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -902,6 +902,17 @@ $result = $object->updateline( } } + // Open DSI -- Force mandatory order method -- Begin + if ($action == 'commande') { + $methodecommande = GETPOST('methodecommande'); + + if ($methodecommande <= 0) { + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("OrderMode")), null, 'errors'); + $action = 'makeorder'; + } + } + // Open DSI -- Force mandatory order method -- End + if ($action == 'confirm_commande' && $confirm == 'yes' && $user->rights->fournisseur->commande->commander) { $result = $object->commande($user, $_REQUEST["datecommande"], $_REQUEST["methode"], $_REQUEST['comment']); @@ -2543,7 +2554,10 @@ elseif (! empty($object->id)) print $form->selectDate($date_com, '', 1, 1, '', "commande", 1, 1); print ''; - print ''.$langs->trans("OrderMode").''; + // Open DSI -- Force mandatory order method -- Begin + //print ''.$langs->trans("OrderMode").''; + print ''.$langs->trans("OrderMode").''; + // Open DSI -- Force mandatory order method -- End $formorder->selectInputMethod(GETPOST('methodecommande'), "methodecommande", 1); print ''; From f4978e9473e53a4959155ae731fe4fd839097ead Mon Sep 17 00:00:00 2001 From: VESSILLER Date: Fri, 28 Jun 2019 10:58:31 +0200 Subject: [PATCH 2/3] FIX/NEW - Force mandatory order method --- htdocs/fourn/commande/card.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 178816bccbb..ff1b1020ae6 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -902,7 +902,7 @@ $result = $object->updateline( } } - // Open DSI -- Force mandatory order method -- Begin + // Force mandatory order method if ($action == 'commande') { $methodecommande = GETPOST('methodecommande'); @@ -911,7 +911,6 @@ $result = $object->updateline( $action = 'makeorder'; } } - // Open DSI -- Force mandatory order method -- End if ($action == 'confirm_commande' && $confirm == 'yes' && $user->rights->fournisseur->commande->commander) { @@ -2554,10 +2553,8 @@ elseif (! empty($object->id)) print $form->selectDate($date_com, '', 1, 1, '', "commande", 1, 1); print ''; - // Open DSI -- Force mandatory order method -- Begin - //print ''.$langs->trans("OrderMode").''; + // Force mandatory order method print ''.$langs->trans("OrderMode").''; - // Open DSI -- Force mandatory order method -- End $formorder->selectInputMethod(GETPOST('methodecommande'), "methodecommande", 1); print ''; From 1de499a320f7ca5bd4726ebe3d4f3eafdab1cfa8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jul 2019 15:52:03 +0200 Subject: [PATCH 3/3] Update card.php --- htdocs/fourn/commande/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index ff1b1020ae6..2c3df524109 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -2547,7 +2547,7 @@ elseif (! empty($object->id)) print load_fiche_titre($langs->trans("ToOrder"), '', ''); print ''; //print ''; - print '
'.$langs->trans("ToOrder").'
'.$langs->trans("OrderDate").''; + print '
'.$langs->trans("OrderDate").''; $date_com = dol_mktime(GETPOST('rehour', 'int'), GETPOST('remin', 'int'), GETPOST('resec', 'int'), GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int')); if (empty($date_com)) $date_com=dol_now(); print $form->selectDate($date_com, '', 1, 1, '', "commande", 1, 1);