Update card.php

Dolibarr · Nov 13, 2024 · ae57aeb · ae57aeb
1 parent eaed6f6
commit ae57aeb
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
@@ -2027,50 +2027,48 @@
 	print '<td colspan="3">'.dol_print_date($object->date_creation, "dayhour")."</td>\n";
 	print '</tr>';
 
-	// Delivery sending date
+	// Delivery date planned
 	print '<tr><td height="10">';
 	print '<table class="nobordernopadding centpercent"><tr><td>';
-	print $langs->trans('DateShipping');
+	print $langs->trans('DateDeliveryPlanned');
 	print '</td>';
-
-	if ($action != 'editdate_shipping') {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_shipping&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetShippingDate'), 1).'</a></td>';
+	if ($action != 'editdate_livraison') {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td colspan="2">';
-	if ($action == 'editdate_shipping') {
+	if ($action == 'editdate_livraison') {
 		print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate_livraison">';
-		print $form->selectDate($object->date_shipping ? $object->date_shipping : -1, 'liv_', 1, 1, 0, "setdate_shipping", 1, 0);
+		print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, 0, "setdate_livraison", 1, 0);
 		print '<input type="submit" class="button button-edit smallpaddingimp" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
-		print $object->date_shipping ? dol_print_date($object->date_shipping, 'dayhour') : '&nbsp;';
+		print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
 	}
 	print '</td>';
 	print '</tr>';
 
-	// Delivery date planned
+	// Delivery sending date
 	print '<tr><td height="10">';
 	print '<table class="nobordernopadding centpercent"><tr><td>';
-	print $langs->trans('DateDeliveryPlanned');
+	print $langs->trans('DateShipping');
 	print '</td>';
-
-	if ($action != 'editdate_livraison') {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+	if ($action != 'editdate_shipping') {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_shipping&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetShippingDate'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td colspan="2">';
-	if ($action == 'editdate_livraison') {
+	if ($action == 'editdate_shipping') {
 		print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate_livraison">';
-		print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, 0, "setdate_livraison", 1, 0);
+		print $form->selectDate($object->date_shipping ? $object->date_shipping : -1, 'liv_', 1, 1, 0, "setdate_shipping", 1, 0);
 		print '<input type="submit" class="button button-edit smallpaddingimp" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
-		print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
+		print $object->date_shipping ? dol_print_date($object->date_shipping, 'dayhour') : '&nbsp;';
 	}
 	print '</td>';
 	print '</tr>';