X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=6a2c2b067e481fb8fef786df43fc745d21bcf072;hb=40db4214ac1a17dadc1aead2134f14744ffcc2fe;hp=95939b5d41268aaa579538dd75a12e86b197f724;hpb=ba80e275bd7d437b92dd62eec01d97e461c74bce;p=fa-stable.git

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 95939b5d..6a2c2b06 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.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 Sales Order
@@ -18,18 +28,14 @@ include_once($path_to_root . "/sales/includes/db/sales_types_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 $js = '';
 
-if ($ret = context_restore()) {
- // return from new customer add
-	copy_from_cart();
-	if(isset($ret['customer_id']))
-		$_POST['customer_id'] = $ret['customer_id'];
-	if(isset($ret['branch_id']))
-		$_POST['branch_id'] = $ret['branch_id'];
-}
-if (isset($_POST['_customer_id_editor'])) {
-	copy_to_cart(); //store context
-	context_call($path_to_root.'/sales/manage/customers.php?debtor_no='.$_POST['customer_id'], 'Items');
-}
+editor_redirect( array(
+	'customer_id' => $path_to_root.'/sales/manage/customers.php?debtor_no='.get_post('customer_id'),
+	'branch_id' => $path_to_root.'/sales/manage/customer_branches.php?branch_id='.get_post('branch_id'),
+	));
+
+editor_return( array(
+	'customer_id'=>'customer_id',
+	'branch_id'=>'branch_id'));
 
 if ($use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
@@ -66,17 +72,17 @@ page($_SESSION['page_title'], false, false, "", $js);
 
 if (isset($_GET['AddedID'])) {
 	$order_no = $_GET['AddedID'];
-
 	display_notification_centered(sprintf( _("Order # %d has been entered."),$order_no));
 
-	display_note(get_trans_view_str(30, $order_no, _("&View This Order")));
-	echo '<br>';
-	display_note(print_document_link($order_no, _("&Print This Order"), true, 30));
+	submenu_view(_("&View This Order"), 30, $order_no);
 
-	hyperlink_params($path_to_root . "/sales/customer_delivery.php",
-		_("Make &Delivery Against This Order"), "OrderNumber=$order_no");
+	submenu_print(_("&Print This Order"), 30, $order_no, 'prtopt');
+	set_focus('prtopt');
+	
+	submenu_option(_("Make &Delivery Against This Order"),
+		"/sales/customer_delivery.php?OrderNumber=$order_no");
 
-	hyperlink_params($_SERVER['PHP_SELF'], _("Enter a &New Order"), "NewOrder=0");
+	submenu_option(_("Enter a &New Order"),	$_SERVER['PHP_SELF']."?NewOrder=0");
 
 	display_footer_exit();
 
@@ -85,15 +91,16 @@ if (isset($_GET['AddedID'])) {
 
 	display_notification_centered(sprintf( _("Order # %d has been updated."),$order_no));
 
-	display_note(get_trans_view_str(30, $order_no, _("&View This Order")));
-	echo '<br>';
-	display_note(print_document_link($order_no, _("&Print This Order"), true, 30));
+	submenu_view(_("&View This Order"), 30, $order_no);
+
+	submenu_print(_("&Print This Order"), 30, $order_no, 'prtopt');
+	set_focus('prtopt');
 
-	hyperlink_params($path_to_root . "/sales/customer_delivery.php",
-		_("Confirm Order Quantities and Make &Delivery"), "OrderNumber=$order_no");
+	submenu_option(_("Confirm Order Quantities and Make &Delivery"),
+		"/sales/customer_delivery.php?OrderNumber=$order_no");
 
-	hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
-		_("Select A Different &Order"), "OutstandingOnly=1");
+	submenu_option(_("Select A Different &Order"),
+		"/sales/inquiry/sales_orders_view.php?OutstandingOnly=1");
 
 	display_footer_exit();
 
@@ -102,39 +109,43 @@ if (isset($_GET['AddedID'])) {
 
 	display_notification_centered(sprintf(_("Delivery # %d has been entered."),$delivery));
 
-	display_note(get_trans_view_str(13, $delivery, _("&View This Delivery")));
-	echo '<br>';
-	display_note(print_document_link($delivery, _("&Print Delivery Note"), true, 13));
+	submenu_view(_("&View This Delivery"), 13, $delivery);
 
-	hyperlink_params($path_to_root . "/sales/customer_invoice.php",
-	_("Make &Invoice Against This Delivery"), "DeliveryNumber=$delivery");
+	submenu_print(_("&Print Delivery Note"), 13, $delivery, 'prtopt');
+	set_focus('prtopt');
+
+	submenu_option(_("Make &Invoice Against This Delivery"),
+		"/sales/customer_invoice.php?DeliveryNumber=$delivery");
 
 	if ((isset($_GET['Type']) && $_GET['Type'] == 1))
-	hyperlink_params("inquiry/sales_orders_view.php",
-		_("Enter a New Template &Delivery"), "DeliveryTemplates=Yes");
+		submenu_option(_("Enter a New Template &Delivery"),
+			"inquiry/sales_orders_view.php?DeliveryTemplates=Yes");
 	else
-	hyperlink_params($_SERVER['PHP_SELF'], _("Enter a &New Delivery"), "NewDelivery=0");
+		submenu_option(_("Enter a &New Delivery"), 
+			$_SERVER['PHP_SELF']."?NewDelivery=0");
 
 	display_footer_exit();
 
 } elseif (isset($_GET['AddedDI'])) {
 	$invoice = $_GET['AddedDI'];
 
-	display_notification_centered(sprintf(_("Invoice # %d has been entered."),$invoice));
+	display_notification_centered(sprintf(_("Invoice # %d has been entered."), $invoice));
+
+	submenu_view(_("&View This Invoice"), 10, $invoice);
 
-	display_note(get_trans_view_str(10, $invoice, _("&View This Invoice")));
-	echo '<br>';
-	display_note(print_document_link($invoice, _("&Print Sales Invoice"), true, 10));
+	submenu_print(_("&Print Sales Invoice"), 10, $invoice, 'prtopt');
+	set_focus('prtopt');
 
 	if ((isset($_GET['Type']) && $_GET['Type'] == 1))
-	hyperlink_params("inquiry/sales_orders_view.php",
-		_("Enter a &New Template Invoice"), "InvoiceTemplates=Yes");
+		submenu_option(_("Enter a &New Template Invoice"), 
+			"inquiry/sales_orders_view.php?InvoiceTemplates=Yes");
 	else
-	hyperlink_params($_SERVER['PHP_SELF'], _("Enter a &New Direct Invoice"), "NewInvoice=0");
+		submenu_option(_("Enter a &New Direct Invoice"),
+			$_SERVER['PHP_SELF']."?NewInvoice=0");
 
 	display_footer_exit();
-}
-
+} else
+	check_edit_conflicts();
 //-----------------------------------------------------------------------------
 
 function copy_to_cart()
@@ -211,6 +222,7 @@ function copy_from_cart()
 		$_POST['dimension_id'] = $cart->dimension_id;
 		$_POST['dimension2_id'] = $cart->dimension2_id;
 	}	
+	$_POST['cart_id'] = $cart->cart_id;
 		
 }
 //--------------------------------------------------------------------------------
@@ -221,8 +233,8 @@ function line_start_focus() {
   $Ajax->activate('items_table');
   set_focus('_stock_id_edit');
 }
-//--------------------------------------------------------------------------------
 
+//--------------------------------------------------------------------------------
 function can_process() {
 	if (!is_date($_POST['OrderDate'])) {
 		display_error(_("The entered date is invalid."));
@@ -294,7 +306,7 @@ if (isset($_POST['ProcessOrder']) && can_process()) {
 	}
 	$trans_no = key($_SESSION['Items']->trans_no);
 	$trans_type = $_SESSION['Items']->trans_type;
-
+	new_doc_date($_SESSION['Items']->document_date);
 	processing_end();
 	if ($modified) {
 		meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no");
@@ -350,7 +362,7 @@ function handle_update_item()
 	if ($_POST['UpdateItem'] != '' && check_item_data()) {
 		$_SESSION['Items']->update_cart_item($_POST['LineNo'],
 		 input_num('qty'), input_num('price'),
-		 input_num('Disc') / 100 );
+		 input_num('Disc') / 100, $_POST['item_description'] );
 	}
   line_start_focus();
 }
@@ -389,13 +401,12 @@ function  handle_cancel_order()
 
 
 	if ($_SESSION['Items']->trans_type == 13) {
-			display_note(_("Direct delivery entry has been cancelled as requested."), 1);
-			hyperlink_params($path_to_root . "/sales/sales_order_entry.php",
-					_("Enter a New Sales Delivery"), SID . "&NewDelivery=0");
+		display_note(_("Direct delivery entry has been cancelled as requested."), 1);
+		submenu_option(_("Enter a New Sales Delivery"),	$_SERVER['PHP_SELF']."?NewDelivery=0");
+
 	} elseif ($_SESSION['Items']->trans_type == 10) {
-			display_note(_("Direct invoice entry has been cancelled as requested."), 1);
-			hyperlink_params($path_to_root . "/sales/sales_order_entry.php",
-					_("Enter a New Sales Delivery"), SID . "&NewDelivery=0");
+		display_note(_("Direct invoice entry has been cancelled as requested."), 1);
+		submenu_option(_("Enter a New Sales Invoice"),	$_SERVER['PHP_SELF']."?NewInvoice=0");
 	} else {
 		if ($_SESSION['Items']->trans_no != 0) {
 			if (sales_order_has_deliveries(key($_SESSION['Items']->trans_no)))
@@ -404,12 +415,11 @@ function  handle_cancel_order()
 				delete_sales_order(key($_SESSION['Items']->trans_no));
 
 			display_note(_("This sales order has been cancelled as requested."), 1);
-				hyperlink_params($path_to_root . "/sales/sales_order_entry.php",
-				_("Enter a New Sales Order"), SID . "&NewOrder=Yes");
+			submenu_option(_("Enter a New Sales Order"), $_SERVER['PHP_SELF']."?NewOrder=Yes");
 			}
 		} else {
 			processing_end();
-			meta_forward($path_to_root.'/index.php?application=orders');
+			meta_forward($path_to_root.'/index.php','application=orders');
 		}
 	}
 	$Ajax->activate('_page_body');
@@ -422,7 +432,7 @@ function  handle_cancel_order()
 //--------------------------------------------------------------------------------
 
 function create_cart($type, $trans_no)
-{
+{ 
 	processing_start();
 	$doc_type = $type;
 
@@ -432,7 +442,7 @@ function create_cart($type, $trans_no)
 		$doc = new Cart(30, array($trans_no));
 		$doc->trans_type = $type;
 		$doc->trans_no = 0;
-		$doc->document_date = Today(); // 2006-06-15. Added so Invoices and Deliveries get current day
+		$doc->document_date = new_doc_date();
 		if ($type == 10) {
 			$doc->due_date = get_invoice_duedate($doc->customer_id, $doc->document_date);
 			$doc->pos = user_pos();
@@ -499,7 +509,9 @@ if ($_SESSION['Items']->trans_type == 10) {
 	$porder = _("Place Order");
 	$corder = _("Commit Order Changes");
 }
-start_form(false, true);
+start_form();
+
+hidden('cart_id');
 
 $customer_error = display_order_header($_SESSION['Items'],
 	($_SESSION['Items']->any_already_delivered() == 0), $idate);
@@ -517,15 +529,15 @@ if ($customer_error == "") {
 	if ($_SESSION['Items']->trans_no == 0) {
 
 		submit_center_first('ProcessOrder', $porder,
-		    _('Check entered data and save document'), true, ICON_OK);
+		    _('Check entered data and save document'), 'default');
+		submit_js_confirm('CancelOrder', _('You are about to void this Sales Order.\nDo you want to continue?'));
 	} else {
 		submit_center_first('ProcessOrder', $corder,
-		    _('Validate changes and update document'), true, ICON_OK);
+		    _('Validate changes and update document'), 'default');
 	}
 
 	submit_center_last('CancelOrder', $cancelorder,
-	   _('Cancels document entry or removes sales order when editing an old document'),
-	   true, ICON_CANCEL);
+	   _('Cancels document entry or removes sales order when editing an old document'));
 } else {
 	display_error($customer_error);
 }