Completed
Branch develop (04fd4c)
by
unknown
15:44
created
htdocs/expedition/dispatch.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -177,8 +177,8 @@  discard block
 block discarded – undo
177 177
 						$sql .= " JOIN ".MAIN_DB_PREFIX."product_stock as ps";
178 178
 						$sql .= " ON ps.rowid = pb.fk_product_stock";
179 179
 						$sql .= " WHERE pb.batch = '".$db->escape($lot)."'";
180
-						$sql .= " AND ps.fk_product = ".((int) GETPOST($prod, 'int')) ;
181
-						$sql .= " AND ps.fk_entrepot = ".((int) GETPOST($ent, 'int')) ;
180
+						$sql .= " AND ps.fk_product = ".((int) GETPOST($prod, 'int'));
181
+						$sql .= " AND ps.fk_entrepot = ".((int) GETPOST($ent, 'int'));
182 182
 
183 183
 						$resql = $db->query($sql);
184 184
 						if ($resql) {
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 					$qtystart = 0;
203 203
 
204 204
 					if ($idline > 0) {
205
-						$result = $expeditiondispatch->fetch($idline);	// get line from llx_expeditiondet
205
+						$result = $expeditiondispatch->fetch($idline); // get line from llx_expeditiondet
206 206
 						if ($result < 0) {
207 207
 							setEventMessages($expeditiondispatch->error, $expeditiondispatch->errors, 'errors');
208 208
 							$error++;
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 llxHeader('', $title, $help_url, '', 0, 0, $morejs);
376 376
 
377 377
 if ($object->id > 0 || !empty($object->ref)) {
378
-	$lines = $object->lines;	// This is an array of detail of line, on line per source order line found intolines[]->fk_origin_line, then each line may have sub data
378
+	$lines = $object->lines; // This is an array of detail of line, on line per source order line found intolines[]->fk_origin_line, then each line may have sub data
379 379
 	//var_dump($lines[0]->fk_origin_line); exit;
380 380
 
381 381
 	$num_prod = count($lines);
@@ -521,7 +521,7 @@  discard block
 block discarded – undo
521 521
 	print '<center>';
522 522
 
523 523
 	print '<br>';
524
-	$disabled = 0;	// This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0.
524
+	$disabled = 0; // This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0.
525 525
 
526 526
 	if ($object->statut == Expedition::STATUS_DRAFT) {
527 527
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
@@ -625,7 +625,7 @@  discard block
 block discarded – undo
625 625
 				}
626 626
 				print '<td class="right">'.$langs->trans("QtyOrdered").'</td>';
627 627
 				if ($object->status == Expedition::STATUS_DRAFT) {
628
-					print '<td class="right">'.$langs->trans("QtyToShip");	// Qty to dispatch (sum for all lines of batch detail if there is)
628
+					print '<td class="right">'.$langs->trans("QtyToShip"); // Qty to dispatch (sum for all lines of batch detail if there is)
629 629
 				} else {
630 630
 					print '<td class="right">'.$langs->trans("QtyDispatchedShort").'</td>';
631 631
 				}
@@ -681,7 +681,7 @@  discard block
 block discarded – undo
681 681
 				if (!$objp->fk_product > 0) {
682 682
 					$nbfreeproduct++;
683 683
 				} else {
684
-					$alreadydispatched = isset($products_dispatched[$objp->rowid])?$products_dispatched[$objp->rowid]:0;
684
+					$alreadydispatched = isset($products_dispatched[$objp->rowid]) ? $products_dispatched[$objp->rowid] : 0;
685 685
 					$remaintodispatch = price2num($objp->qty, 5); // Calculation of dispatched
686 686
 					if ($remaintodispatch < 0 && empty($conf->global->SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN)) {
687 687
 						$remaintodispatch = 0;
@@ -886,10 +886,10 @@  discard block
 block discarded – undo
886 886
 								print '<td>';
887 887
 								if (isModEnabled('productbatch') && $objp->tobatch > 0) {
888 888
 									$type = 'batch';
889
-									print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" '.($numd != $j+1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"');
889
+									print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" '.($numd != $j + 1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"');
890 890
 								} else {
891 891
 									$type = 'dispatch';
892
-									print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" '.($numd != $j+1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"');
892
+									print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" '.($numd != $j + 1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"');
893 893
 								}
894 894
 
895 895
 								print '</td>';
Please login to merge, or discard this patch.