X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=fd20ebb05a88386572a802770ca8d8119d440389;hb=084f6092639794bc6b0cd73da20ddbe5dc82c968;hp=2c0991ab4f68a5a8bc401c4a8d55d34a0838441d;hpb=de3a75773afa86df1739d14f24399d6f7a46f809;p=fa-stable.git

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 2c0991ab..fd20ebb0 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -121,6 +121,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
 
 } elseif(!check_num('ChargeFreightCost', 0))
 	display_error(_("Freight cost cannot be less than zero"));
+	set_focus('ChargeFreightCost');
 
 
 //-----------------------------------------------------------------------------
@@ -129,27 +130,32 @@ function check_data()
 {
 	if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate']))	{
 		display_error(_("The entered date of delivery is invalid."));
+		set_focus('DispatchDate');
 		return false;
 	}
 
 	if (!is_date_in_fiscalyear($_POST['DispatchDate'])) {
 		display_error(_("The entered date of delivery is not in fiscal year."));
+		set_focus('DispatchDate');
 		return false;
 	}
 
 	if (!isset($_POST['due_date']) || !is_date($_POST['due_date']))	{
 		display_error(_("The entered dead-line for invoice is invalid."));
+		set_focus('due_date');
 		return false;
 	}
 
 	if ($_SESSION['Items']->trans_no==0) {
 		if (!references::is_valid($_POST['ref'])) {
 			display_error(_("You must enter a reference."));
+			set_focus('ref');
 			return false;
 		}
 
 		if ($_SESSION['Items']->trans_no==0 && !is_new_reference($_POST['ref'], 13)) {
 			display_error(_("The entered reference is already in use."));
+			set_focus('ref');
 			return false;
 		}
 	}
@@ -159,6 +165,7 @@ function check_data()
 
 	if (!check_num('ChargeFreightCost',0)) {
 		display_error(_("The entered shipping value is not numeric."));
+		set_focus('ChargeFreightCost');
 		return false;
 	}
 
@@ -210,7 +217,7 @@ function check_quantities()
 	foreach ($_SESSION['Items']->line_items as $line=>$itm) {
 		if (isset($_POST['Line'.$line])) {
 			if (!check_num('Line'.$line, $itm->qty_done, $itm->quantity) == 0) {
-				$_SESSION['Items']->line_items[$line]->qty_dispatched = 
+				$_SESSION['Items']->line_items[$line]->qty_dispatched =
 				  input_num('Line'.$line);
 			} else {
 				$ok = 0;
@@ -292,7 +299,7 @@ start_row();
 //	$_POST['ref'] = references::get_next(13);
 
 if ($_SESSION['Items']->trans_no==0) {
-	ref_cells(_("Reference"), 'ref', $_SESSION['Items']->reference, "class='tableheader2'");
+	ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
 } else {
 	label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
 }
@@ -322,7 +329,7 @@ if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate'])) {
 		$_POST['DispatchDate'] = end_fiscalyear();
 	}
 }
-date_cells(_("Date"), 'DispatchDate', $_POST['DispatchDate'], 0, 0, 0, "class='tableheader2'");
+date_cells(_("Date"), 'DispatchDate', '', $_POST['DispatchDate'], 0, 0, 0, "class='tableheader2'");
 end_row();
 
 end_table();
@@ -334,7 +341,7 @@ start_table("$table_style width=90%");
 if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
 	$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, $_POST['DispatchDate']);
 }
-date_row(_("Invoice Dead-line"), 'due_date', $_POST['due_date'], 0, 0, 0, "class='tableheader2'");
+date_row(_("Invoice Dead-line"), 'due_date', '', $_POST['due_date'], 0, 0, 0, "class='tableheader2'");
 end_table();
 
 echo "</td></tr>";
@@ -374,11 +381,12 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
 	view_stock_status_cell($ln_itm->stock_id);
 
 	text_cells(null, 'Line'.$line.'Desc', $ln_itm->item_description, 30, 50);
-	qty_cell($ln_itm->quantity);
+	$dec = get_qty_dec($ln_itm->stock_id);
+	qty_cell($ln_itm->quantity, false, $dec);
 	label_cell($ln_itm->units);
-	qty_cell($ln_itm->qty_done);
+	qty_cell($ln_itm->qty_done, false, $dec);
 
-	small_qty_cells(null, 'Line'.$line, qty_format($ln_itm->qty_dispatched));
+	small_qty_cells(null, 'Line'.$line, qty_format($ln_itm->qty_dispatched, $ln_itm->stock_id, $dec), null, null, $dec);
 
 	$display_discount_percent = percent_format($ln_itm->discount_percent*100) . "%";
 
@@ -428,8 +436,10 @@ textarea_row(_("Memo"), 'Comments', null, 50, 4);
 
 end_table(1);
 
-submit_center_first('Update', _("Update"));
-submit_center_last('process_delivery', _("Process Dispatch"));
+submit_center_first('Update', _("Update"),
+  _('Refresh document page'), true);
+submit_center_last('process_delivery', _("Process Dispatch"),
+  _('Check entered data and save document'), true);
 
 end_form();