X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=8e5da8e8b8efa69c67045591a3fe1cb6a6fe2b02;hb=e2f475311cfe6efc1aae1b08da1eadaa00744991;hp=5d0aaa1cbda6bab31974b0cf2b2b767173139fce;hpb=d67d5295b9342c011697ce4df325197e29898588;p=fa-stable.git

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 5d0aaa1c..8e5da8e8 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -36,7 +36,6 @@ page($_SESSION['page_title'], false, false, "", $js);
 
 if (isset($_GET['AddedID'])) {
 	$dispatch_no = $_GET['AddedID'];
-	print_hidden_script(13);
 
 	display_notification(_("Dispatch processed:") . ' '.$_GET['AddedID'], true);
 
@@ -55,7 +54,6 @@ if (isset($_GET['AddedID'])) {
 } elseif (isset($_GET['UpdatedID'])) {
 
 	$delivery_no = $_GET['UpdatedID'];
-	print_hidden_script(13);
 
 	display_notification_centered(sprintf(_('Delivery Note # %d has been updated.'),$delivery_no));
 
@@ -73,7 +71,7 @@ if (isset($_GET['AddedID'])) {
 
 if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
 
-	$ord = new Cart(30,$_GET['OrderNumber'], true);
+	$ord = new Cart(30, $_GET['OrderNumber'], true);
 
 	/*read in all the selected order into the Items cart  */
 
@@ -88,6 +86,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
 	$ord->order_no = key($ord->trans_no);
 	$ord->trans_no = 0;
 	$ord->reference = references::get_next(13);
+	$ord->document_date = Today();
 	$_SESSION['Items'] = $ord;
 	copy_from_cart();
 
@@ -104,7 +103,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
 	}
 
 	copy_from_cart();
-
+	
 } elseif ( !processing_active() ) {
 	/* This page can only be called with an order number for invoicing*/
 
@@ -188,7 +187,7 @@ function copy_to_cart()
 	$cart = &$_SESSION['Items'];
 	$cart->ship_via = $_POST['ship_via'];
 	$cart->freight_cost = input_num('ChargeFreightCost');
-	$cart->document_date =  $_POST['DispatchDate'];
+	$cart->document_date = $_POST['DispatchDate'];
 	$cart->due_date =  $_POST['due_date'];
 	$cart->Location = $_POST['Location'];
 	$cart->Comments = $_POST['Comments'];
@@ -203,10 +202,10 @@ function copy_from_cart()
 	$cart = &$_SESSION['Items'];
 	$_POST['ship_via'] = $cart->ship_via;
 	$_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
-	$_POST['DispatchDate']= $cart->document_date;
+	$_POST['DispatchDate'] = $cart->document_date;
 	$_POST['due_date'] = $cart->due_date;
-	$_POST['Location']= $cart->Location;
-	$_POST['Comments']= $cart->Comments;
+	$_POST['Location'] = $cart->Location;
+	$_POST['Comments'] = $cart->Comments;
 }
 //------------------------------------------------------------------------------
 
@@ -216,10 +215,19 @@ function check_quantities()
 	// Update cart delivery quantities/descriptions
 	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 = 
+		if($_SESSION['Items']->trans_no) {
+			$min = $itm->qty_done;
+			$max = $itm->quantity;
+		} else {
+			$min = 0;
+			$max = $itm->quantity - $itm->qty_done;
+		}
+		
+			if (check_num('Line'.$line, $min, $max)) {
+				$_SESSION['Items']->line_items[$line]->qty_dispatched =
 				  input_num('Line'.$line);
 			} else {
+				set_focus('Line'.$line);
 				$ok = 0;
 			}
 
@@ -281,6 +289,9 @@ if (isset($_POST['process_delivery']) && check_data() && check_qoh()) {
 	}
 }
 
+if (isset($_POST['Update']) || isset($_POST['_Location_update'])) {
+	$Ajax->activate('Items');
+}
 //------------------------------------------------------------------------------
 start_form(false, true);
 
@@ -314,7 +325,7 @@ if (!isset($_POST['Location'])) {
 	$_POST['Location'] = $_SESSION['Items']->Location;
 }
 label_cell(_("Delivery From"), "class='tableheader2'");
-locations_list_cells(null, 'Location',$_POST['Location'], false, true);
+locations_list_cells(null, 'Location', null, false, true);
 
 if (!isset($_POST['ship_via'])) {
 	$_POST['ship_via'] = $_SESSION['Items']->ship_via;
@@ -348,7 +359,7 @@ echo "</td></tr>";
 end_table(1); // outer table
 
 display_heading(_("Delivery Items"));
-
+div_start('Items');
 start_table("$table_style width=80%");
 $th = array(_("Item Code"), _("Item Description"), _("Ordered"), _("Units"), _("Delivered"),
 	_("This Delivery"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
@@ -381,11 +392,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) . "%";
 
@@ -399,11 +411,8 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
 	end_row();
 }
 
-$_POST['ChargeFreightCost'] = price_format($_SESSION['Items']->freight_cost);
-
-if (!check_num('ChargeFreightCost')) {
-		$_POST['ChargeFreightCost'] = price_format(0);
-}
+$_POST['ChargeFreightCost'] =  get_post('ChargeFreightCost', 
+	price_format($_SESSION['Items']->freight_cost));
 
 start_row();
 
@@ -434,9 +443,11 @@ policy_list_row(_("Action For Balance"), "bo_policy", null);
 textarea_row(_("Memo"), 'Comments', null, 50, 4);
 
 end_table(1);
-
-submit_center_first('Update', _("Update"));
-submit_center_last('process_delivery', _("Process Dispatch"));
+div_end();
+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();