X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_delivery.php;h=f4ffe9158752fb13b318e8d68acde9fb8b7cc7a9;hb=c99c4da3f3a009e48b536dc1cc5268d566dfc6cb;hp=22349507cdfa01b7bbfa34b3f04701d1c01df65e;hpb=2383d33373d6ddec06906658a0ed6398077c1147;p=fa-stable.git

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 22349507..f4ffe915 100644
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -13,8 +13,8 @@
 //
 //	Entry/Modify Delivery Note against Sales Order
 //
-$page_security = 2;
-$path_to_root="..";
+$page_security = 'SA_SALESDELIVERY';
+$path_to_root = "..";
 
 include_once($path_to_root . "/sales/includes/cart_class.inc");
 include_once($path_to_root . "/includes/session.inc");
@@ -49,9 +49,10 @@ if (isset($_GET['AddedID'])) {
 
 	display_notification_centered(sprintf(_("Delivery # %d has been entered."),$dispatch_no));
 
-	display_note(get_customer_trans_view_str(13, $dispatch_no, _("&View This Delivery")), 0, 1);
+	display_note(get_customer_trans_view_str(ST_CUSTDELIVERY, $dispatch_no, _("&View This Delivery")), 0, 1);
 
-	display_note(print_document_link($dispatch_no, _("&Print Delivery Note"), true, 13));
+	display_note(print_document_link($dispatch_no, _("&Print Delivery Note"), true, ST_CUSTDELIVERY));
+	display_note(print_document_link($dispatch_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "", "", 1), 1);
 
 	display_note(get_gl_view_str(13, $dispatch_no, _("View the GL Journal Entries for this Dispatch")),1);
 
@@ -67,9 +68,9 @@ if (isset($_GET['AddedID'])) {
 
 	display_notification_centered(sprintf(_('Delivery Note # %d has been updated.'),$delivery_no));
 
-	display_note(get_trans_view_str(13, $delivery_no, _("View this delivery")));
+	display_note(get_trans_view_str(ST_CUSTDELIVERY, $delivery_no, _("View this delivery")));
 	echo '<br>';
-	display_note(print_document_link($delivery_no, _("Print this delivery"), true, 13));
+	display_note(print_document_link($delivery_no, _("Print this delivery"), true, ST_CUSTDELIVERY));
 
 	hyperlink_params($path_to_root . "/sales/customer_invoice.php", _("Confirm Delivery and Invoice"), "DeliveryNumber=$delivery_no");
 
@@ -81,7 +82,7 @@ if (isset($_GET['AddedID'])) {
 
 if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
 
-	$ord = new Cart(30, $_GET['OrderNumber'], true);
+	$ord = new Cart(ST_SALESORDER, $_GET['OrderNumber'], true);
 
 	/*read in all the selected order into the Items cart  */
 
@@ -91,18 +92,18 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
 		die ("<br><b>" . _("This order has no items. There is nothing to delivery.") . "</b>");
 	}
 
-	$ord->trans_type = 13;
+	$ord->trans_type = ST_CUSTDELIVERY;
 	$ord->src_docs = $ord->trans_no;
 	$ord->order_no = key($ord->trans_no);
 	$ord->trans_no = 0;
-	$ord->reference = references::get_next(13);
+	$ord->reference = $Refs->get_next(ST_CUSTDELIVERY);
 	$ord->document_date = new_doc_date();
 	$_SESSION['Items'] = $ord;
 	copy_from_cart();
 
 } elseif (isset($_GET['ModifyDelivery']) && $_GET['ModifyDelivery'] > 0) {
 
-	$_SESSION['Items'] = new Cart(13,$_GET['ModifyDelivery']);
+	$_SESSION['Items'] = new Cart(ST_CUSTDELIVERY,$_GET['ModifyDelivery']);
 
 	if ($_SESSION['Items']->count_items() == 0) {
 		hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
@@ -139,6 +140,8 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
 
 function check_data()
 {
+	global $Refs;
+
 	if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate']))	{
 		display_error(_("The entered date of delivery is invalid."));
 		set_focus('DispatchDate');
@@ -158,13 +161,13 @@ function check_data()
 	}
 
 	if ($_SESSION['Items']->trans_no==0) {
-		if (!references::is_valid($_POST['ref'])) {
+		if (!$Refs->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)) {
+		if ($_SESSION['Items']->trans_no==0 && !is_new_reference($_POST['ref'], ST_CUSTDELIVERY)) {
 			display_error(_("The entered reference is already in use."));
 			set_focus('ref');
 			return false;
@@ -219,6 +222,7 @@ function copy_from_cart()
 	$_POST['Location'] = $cart->Location;
 	$_POST['Comments'] = $cart->Comments;
 	$_POST['cart_id'] = $cart->cart_id;
+	$_POST['ref'] = $cart->reference;
 }
 //------------------------------------------------------------------------------
 
@@ -262,7 +266,9 @@ function check_quantities()
 
 function check_qoh()
 {
-	if (!sys_prefs::allow_negative_stock())	{
+	global $SysPrefs;
+
+	if (!$SysPrefs->allow_negative_stock())	{
 		foreach ($_SESSION['Items']->line_items as $itm) {
 
 			if ($itm->qty_dispatched && has_stock_holding($itm->mb_flag)) {
@@ -322,15 +328,15 @@ end_row();
 start_row();
 
 //if (!isset($_POST['ref']))
-//	$_POST['ref'] = references::get_next(13);
+//	$_POST['ref'] = $Refs->get_next(ST_CUSTDELIVERY);
 
 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'");
 }
 
-label_cells(_("For Sales Order"), get_customer_trans_view_str(systypes::sales_order(), $_SESSION['Items']->order_no), "class='tableheader2'");
+label_cells(_("For Sales Order"), get_customer_trans_view_str(ST_SALESORDER, $_SESSION['Items']->order_no), "class='tableheader2'");
 
 label_cells(_("Sales Type"), $_SESSION['Items']->sales_type_name, "class='tableheader2'");
 end_row();
@@ -396,7 +402,7 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
 	}
 	// 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) ||
+	if ($SysPrefs->allow_negative_stock() || !has_stock_holding($ln_itm->mb_flag) ||
 		$ln_itm->qty_dispatched == 0) {
 		$show_qoh = false;
 	}