X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=9d710729de24b5d2e7d2fff09f6ae783d4f38247;hb=231addc23887aa8b906dca18ea0b2a6fe63c3c39;hp=3c275dbbf9aeeab2ce0148491699d1633209fea0;hpb=b6af4ea4c99734cfd051395289107bbba5a405e9;p=fa-stable.git

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 3c275dbb..9d710729 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 General Public License, GPL, 
+	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/gpl-3.0.html>.
+***********************************************************************/
 //-----------------------------------------------------------------------------
 //
 //	Entry/Modify Delivery Note against Sales Order
@@ -86,7 +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();
+	$ord->document_date = new_doc_date();
 	$_SESSION['Items'] = $ord;
 	copy_from_cart();
 
@@ -114,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');
+}
 
 //-----------------------------------------------------------------------------
 
@@ -206,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;
 }
 //------------------------------------------------------------------------------
 
@@ -279,6 +293,7 @@ if (isset($_POST['process_delivery']) && check_data() && check_qoh()) {
 	$newdelivery = ($dn->trans_no == 0);
 
 	copy_to_cart();
+	if ($new_delivery) new_doc_date($dn->document_date);
 	$delivery_no = $dn->write($bo_policy);
 
 	processing_end();
@@ -293,7 +308,8 @@ if (isset($_POST['Update']) || isset($_POST['_Location_update'])) {
 	$Ajax->activate('Items');
 }
 //------------------------------------------------------------------------------
-start_form(false, true);
+start_form();
+hidden('cart_id');
 
 start_table("$table_style2 width=80%", 5);
 echo "<tr><td>"; // outer table
@@ -335,12 +351,12 @@ shippers_list_cells(null, 'ship_via', $_POST['ship_via']);
 
 // set this up here cuz it's used to calc qoh
 if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate'])) {
-	$_POST['DispatchDate'] = Today();
+	$_POST['DispatchDate'] = new_doc_date();
 	if (!is_date_in_fiscalyear($_POST['DispatchDate'])) {
 		$_POST['DispatchDate'] = end_fiscalyear();
 	}
 }
-date_cells(_("Date"), 'DispatchDate', '', $_POST['DispatchDate'], 0, 0, 0, "class='tableheader2'");
+date_cells(_("Date"), 'DispatchDate', '', $_SESSION['Items']->trans_no==0, 0, 0, 0, "class='tableheader2'");
 end_row();
 
 end_table();
@@ -352,12 +368,20 @@ 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', '', null, 0, 0, 0, "class='tableheader2'");
 end_table();
 
 echo "</td></tr>";
 end_table(1); // outer table
 
+$row = get_customer_to_order($_SESSION['Items']->customer_id);
+if ($row['dissallow_invoices'] == 1)
+{
+	display_error(_("The selected customer account is currently on hold. Please contact the credit control personnel to discuss."));
+	end_form();
+	end_page();
+	exit();
+}	
 display_heading(_("Delivery Items"));
 div_start('Items');
 start_table("$table_style width=80%");
@@ -447,7 +471,7 @@ 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);
+  _('Check entered data and save document'), 'default');
 
 end_form();