X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=23cbd79a10a2ed31f3bf1478eb9ee29660932012;hb=95303d7b5280820af76ddbd8908b120813f1e763;hp=1d11585f6e7bac0b5786dccc452197c30e6a0410;hpb=a4db318fa0c84e099e0970ca82e36215782d661e;p=fa-stable.git

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 1d11585f..23cbd79a 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -1,13 +1,13 @@
 <?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.
+	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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 //-----------------------------------------------------------------------------
 //
@@ -47,11 +47,12 @@ page($_SESSION['page_title'], false, false, "", $js);
 if (isset($_GET['AddedID'])) {
 	$dispatch_no = $_GET['AddedID'];
 
-	display_notification(_("Dispatch processed:") . ' '.$_GET['AddedID'], true);
+	display_notification_centered(sprintf(_("Delivery # %d has been entered."),$dispatch_no));
 
-	display_note(get_customer_trans_view_str(13, $dispatch_no, _("View this dispatch")), 0, 1);
+	display_note(get_customer_trans_view_str(13, $dispatch_no, _("&View This Delivery")), 0, 1);
 
-	display_note(print_document_link($dispatch_no, _("Print this delivery"), true, 13));
+	display_note(print_document_link($dispatch_no, _("&Print Delivery Note"), true, 13));
+	display_note(print_document_link($dispatch_no, _("&Email Delivery Note"), true, 13, false, "", "", 1),0, 1);
 
 	display_note(get_gl_view_str(13, $dispatch_no, _("View the GL Journal Entries for this Dispatch")),1);
 
@@ -96,7 +97,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();
 
@@ -128,8 +129,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
 	check_edit_conflicts();
 
 	if (!check_quantities()) {
-		display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity
-			not dispatched on sales order."));
+		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"));
@@ -220,6 +220,7 @@ function copy_from_cart()
 	$_POST['Location'] = $cart->Location;
 	$_POST['Comments'] = $cart->Comments;
 	$_POST['cart_id'] = $cart->cart_id;
+	$_POST['ref'] = $cart->reference;
 }
 //------------------------------------------------------------------------------
 
@@ -293,6 +294,7 @@ if (isset($_POST['process_delivery']) && check_data() && check_qoh()) {
 	$newdelivery = ($dn->trans_no == 0);
 
 	copy_to_cart();
+	if ($newdelivery) new_doc_date($dn->document_date);
 	$delivery_no = $dn->write($bo_policy);
 
 	processing_end();
@@ -307,7 +309,7 @@ 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);
@@ -325,7 +327,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', '', null, "class='tableheader2'");
 } else {
 	label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
 }
@@ -350,12 +352,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();
@@ -367,7 +369,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', '', null, 0, 0, 0, "class='tableheader2'");
 end_table();
 
 echo "</td></tr>";
@@ -470,7 +472,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();