From 76cb9f60c7b74e31f059db19dc2f3574a6b3b139 Mon Sep 17 00:00:00 2001
From: atm-quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 29 Aug 2018 14:12:17 +0200
Subject: [PATCH 1/3] NEW hook on dispatch order fourn

---
 htdocs/fourn/commande/dispatch.php | 79 +++++++++++++++++-------------
 1 file changed, 46 insertions(+), 33 deletions(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 04c039cfbb1..e53ef59304f 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -62,6 +62,10 @@ if (empty($conf->stock->enabled)) {
 	accessforbidden();
 }
 
+
+$hookmanager->initHooks(array('dispatch'));
+
+
 // Recuperation de l'id de projet
 $projectid = 0;
 if ($_GET["projectid"])
@@ -502,9 +506,12 @@ if ($id > 0 || ! empty($ref)) {
 				print '<tr class="liste_titre">';
 
 				print '<td>' . $langs->trans("Description") . '</td>';
-				print '<td></td>';
-				print '<td></td>';
-				print '<td></td>';
+				if (!empty($conf->productbatch->enabled))
+				{
+					print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
+					print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
+					print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
+				}
 				print '<td align="right">' . $langs->trans("QtyOrdered") . '</td>';
 				print '<td align="right">' . $langs->trans("QtyDispatchedShort") . '</td>';
 				print '<td align="right">' . $langs->trans("QtyToDispatchShort") . '</td>';
@@ -512,15 +519,9 @@ if ($id > 0 || ! empty($ref)) {
 				print '<td align="right">' . $langs->trans("Warehouse") . '</td>';
 				print "</tr>\n";
 
-				if (! empty($conf->productbatch->enabled)) {
-					print '<tr class="liste_titre">';
-					print '<td></td>';
-					print '<td>' . $langs->trans("batch_number") . '</td>';
-					print '<td>' . $langs->trans("EatByDate") . '</td>';
-					print '<td>' . $langs->trans("SellByDate") . '</td>';
-					print '<td colspan="5">&nbsp;</td>';
-					print "</tr>\n";
-				}
+			
+				
+				
 			}
 
 			$nbfreeproduct = 0;		// Nb of lins of free products/services
@@ -559,16 +560,21 @@ if ($id > 0 || ! empty($ref)) {
 
 						if (! empty($conf->productbatch->enabled)) {
 							if ($objp->tobatch) {
-								print '<td colspan="4">';
+								print '<td>';
 								print $linktoprod;
 								print "</td>";
+								print '<td class="dispatch_batch_number"></td>';
+								print '<td class="dispatch_dluo"></td>';
+								print '<td class="dispatch_dlc"></td>';
 							} else {
 								print '<td>';
 								print $linktoprod;
 								print "</td>";
-								print '<td colspan="3">';
+								print '<td class="dispatch_batch_number">';
 								print $langs->trans("ProductDoesNotUseBatchSerial");
 								print '</td>';
+								print '<td class="dispatch_dluo"></td>';
+								print '<td class="dispatch_dlc"></td>';
 							}
 						} else {
 							print '<td colspan="4">';
@@ -614,7 +620,7 @@ if ($id > 0 || ! empty($ref)) {
 
 							print '</td>';
 
-							print '<td>';
+							print '<td >';
 							print '<input type="text" class="inputlotnumber" id="lot_number' . $suffix . '" name="lot_number' . $suffix . '" size="40" value="' . GETPOST('lot_number' . $suffix) . '">';
 							print '</td>';
 							print '<td>';
@@ -627,6 +633,7 @@ if ($id > 0 || ! empty($ref)) {
 							print '</td>';
 							print '<td colspan="2">&nbsp</td>'; // Qty ordered + qty already dispatached
 						} else {
+							
 							$type = 'dispatch';
 							print '<td align="right">';
 							print '</td>';     // Qty to dispatch
@@ -701,21 +708,27 @@ if ($id > 0 || ! empty($ref)) {
 
 		if ($nbproduct)
 		{
-            $checkboxlabel=$langs->trans("CloseReceivedSupplierOrdersAutomatically", $langs->transnoentitiesnoconv($object->statuts[5]));
+			$checkboxlabel = $langs->trans("CloseReceivedSupplierOrdersAutomatically", $langs->transnoentitiesnoconv($object->statuts[5]));
 
 			print '<br><div class="center">';
-            print $langs->trans("Comment") . ' : ';
-			print '<input type="text" class="minwidth400" maxlength="128" name="comment" value="';
-			print $_POST["comment"] ? GETPOST("comment") : $langs->trans("DispatchSupplierOrder", $object->ref);
-			// print ' / '.$object->ref_supplier; // Not yet available
-			print '" class="flat"><br>';
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+			// modified by hook
+			if (empty($reshook))
+			{
+				print $langs->trans("Comment").' : ';
+				print '<input type="text" class="minwidth400" maxlength="128" name="comment" value="';
+				print $_POST["comment"] ? GETPOST("comment") : $langs->trans("DispatchSupplierOrder", $object->ref);
+				// print ' / '.$object->ref_supplier; // Not yet available
+				print '" class="flat"><br>';
 
-			print '<input type="checkbox" checked="checked" name="closeopenorder"> '.$checkboxlabel;
+				print '<input type="checkbox" checked="checked" name="closeopenorder"> '.$checkboxlabel;
 
-			print '<br><input type="submit" class="button" value="' . $langs->trans("DispatchVerb") . '"';
-			if (count($listwarehouses) <= 0)
-				print ' disabled';
-			print '>';
+				print '<br><input type="submit" class="button" value="'.$langs->trans("DispatchVerb").'"';
+				if (count($listwarehouses) <= 0)
+					print ' disabled';
+				print '>';
+			}
 			print '</div>';
 		}
 
@@ -755,14 +768,14 @@ if ($id > 0 || ! empty($ref)) {
 			print load_fiche_titre($langs->trans("ReceivingForSameOrder"));
 
 			print '<div class="div-table-responsive">';
-			print '<table class="noborder" width="100%">';
+			print '<table id="dispatch_received_products" class="noborder" width="100%">';
 
 			print '<tr class="liste_titre">';
 			print '<td>' . $langs->trans("Product") . '</td>';
 			if (! empty($conf->productbatch->enabled)) {
-				print '<td>' . $langs->trans("batch_number") . '</td>';
-				print '<td>' . $langs->trans("EatByDate") . '</td>';
-				print '<td>' . $langs->trans("SellByDate") . '</td>';
+				print '<td class="dispatch_batch_number_title">' . $langs->trans("batch_number") . '</td>';
+				print '<td class="dispatch_dluo_title">' . $langs->trans("EatByDate") . '</td>';
+				print '<td class="dispatch_dlc_title">' . $langs->trans("SellByDate") . '</td>';
 			}
 			print '<td align="right">' . $langs->trans("QtyDispatched") . '</td>';
 			print '<td></td>';
@@ -784,9 +797,9 @@ if ($id > 0 || ! empty($ref)) {
 				print "</td>\n";
 
 				if (! empty($conf->productbatch->enabled)) {
-					print '<td>' . $objp->batch . '</td>';
-					print '<td>' . dol_print_date($db->jdate($objp->eatby), 'day') . '</td>';
-					print '<td>' . dol_print_date($db->jdate($objp->sellby), 'day') . '</td>';
+					print '<td class="dispatch_batch_number">' . $objp->batch . '</td>';
+					print '<td class="dispatch_dluo">' . dol_print_date($db->jdate($objp->eatby), 'day') . '</td>';
+					print '<td class="dispatch_dlc">' . dol_print_date($db->jdate($objp->sellby), 'day') . '</td>';
 				}
 
 				// Qty

From 88044a3d75088b4907cbc41ae7bc8f8cf2880eda Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 29 Aug 2018 20:42:19 +0200
Subject: [PATCH 2/3] Update dispatch.php

---
 htdocs/fourn/commande/dispatch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index e53ef59304f..1f6f86d57ae 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -620,7 +620,7 @@ if ($id > 0 || ! empty($ref)) {
 
 							print '</td>';
 
-							print '<td >';
+							print '<td>';
 							print '<input type="text" class="inputlotnumber" id="lot_number' . $suffix . '" name="lot_number' . $suffix . '" size="40" value="' . GETPOST('lot_number' . $suffix) . '">';
 							print '</td>';
 							print '<td>';

From 7211aff01681b774a815f0690bca09324814ae78 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 29 Aug 2018 21:11:28 +0200
Subject: [PATCH 3/3] Update dispatch.php

---
 htdocs/fourn/commande/dispatch.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 15e42ac089b..761cce030f7 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -517,16 +517,18 @@ if ($id > 0 || ! empty($ref)) {
 					print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
 					print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
 				}
+				else
+				{
+					print '<td></td>';
+					print '<td></td>';
+					print '<td></td>';					
+				}
 				print '<td align="right">' . $langs->trans("QtyOrdered") . '</td>';
 				print '<td align="right">' . $langs->trans("QtyDispatchedShort") . '</td>';
 				print '<td align="right">' . $langs->trans("QtyToDispatchShort") . '</td>';
 				print '<td width="32"></td>';
 				print '<td align="right">' . $langs->trans("Warehouse") . '</td>';
 				print "</tr>\n";
-
-			
-				
-				
 			}
 
 			$nbfreeproduct = 0;		// Nb of lins of free products/services