X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=d87c165a0d3e7f025f77455f7090fc5f2c04a7ff;hb=2d1dd90519889016d984813c98ad44a7e5d58325;hp=8365cc819a4e1bc0f2cb77fc6af1e61d59247d9e;hpb=b809585cf0244647799c9cecd52a380cb7ea32e0;p=fa-stable.git

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 8365cc81..d87c165a 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -1,4 +1,14 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU Affero General Public License,
+	AGPL, as published by the Free Software Foundation, either version 
+	3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 //-----------------------------------------------------------------------------
 //
 //	Entry/Modify Delivery Note against Sales Order
@@ -36,7 +46,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 +64,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));
 
@@ -88,6 +96,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();
 
@@ -115,14 +124,17 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
 	end_page();
 	exit;
 
-} elseif (!check_quantities()) {
-	display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity
-		not dispatched on sales order."));
+} else {
+	check_edit_conflicts();
 
-} elseif(!check_num('ChargeFreightCost', 0))
-	display_error(_("Freight cost cannot be less than zero"));
-	set_focus('ChargeFreightCost');
+	if (!check_quantities()) {
+		display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity
+			not dispatched on sales order."));
 
+	} elseif(!check_num('ChargeFreightCost', 0))
+		display_error(_("Freight cost cannot be less than zero"));
+		set_focus('ChargeFreightCost');
+}
 
 //-----------------------------------------------------------------------------
 
@@ -207,6 +219,7 @@ function copy_from_cart()
 	$_POST['due_date'] = $cart->due_date;
 	$_POST['Location'] = $cart->Location;
 	$_POST['Comments'] = $cart->Comments;
+	$_POST['cart_id'] = $cart->cart_id;
 }
 //------------------------------------------------------------------------------
 
@@ -295,6 +308,7 @@ if (isset($_POST['Update']) || isset($_POST['_Location_update'])) {
 }
 //------------------------------------------------------------------------------
 start_form(false, true);
+hidden('cart_id');
 
 start_table("$table_style2 width=80%", 5);
 echo "<tr><td>"; // outer table
@@ -367,13 +381,13 @@ $th = array(_("Item Code"), _("Item Description"), _("Ordered"), _("Units"), _("
 table_header($th);
 $k = 0;
 $has_marked = false;
-$show_qoh = true;
 
 foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
 	if ($ln_itm->quantity==$ln_itm->qty_done) {
 		continue; //this line is fully delivered
 	}
 	// if it's a non-stock item (eg. service) don't show qoh
+	$show_qoh = true;
 	if (sys_prefs::allow_negative_stock() || !has_stock_holding($ln_itm->mb_flag) ||
 		$ln_itm->qty_dispatched == 0) {
 		$show_qoh = false;
@@ -412,11 +426,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();