X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_entry_items.php;h=8c64fee522db9f255c409ed5558799a7db16c7b3;hb=2aab14aed5938bc674997cff83c319bdf40490d6;hp=74469db9595e936e0bdb62af10b95e85319a8656;hpb=de320b43ef41373a90d9061483b6e8970947fdfa;p=fa-stable.git

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 74469db9..8c64fee5 100644
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -1,13 +1,11 @@
 <?php
 
 $page_security = 4;
-
 $path_to_root="..";
 include_once($path_to_root . "/purchasing/includes/po_class.inc");
-
 include_once($path_to_root . "/includes/session.inc");
-
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
+include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = '';
 if ($use_popup_windows)
@@ -31,6 +29,26 @@ check_db_has_suppliers(_("There are no suppliers defined in the system."));
 check_db_has_purchasable_items(_("There are no purchasable inventory items defined in the system."));
 
 //---------------------------------------------------------------------------------------------------------------
+if ($ret = context_restore()) {
+ // return from supplier/items editors
+	copy_from_cart();
+	if(isset($ret['supplier_id']))
+		$_POST['supplier_id'] = $ret['supplier_id'];
+	if(isset($ret['stock_id'])) {
+		$_POST['stock_id'] = $_POST['_stock_id_edit'] = $ret['stock_id'];
+		set_focus('qty');
+	}
+}
+if (isset($_POST['_supplier_id_editor'])) {
+	copy_to_cart();
+	context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], 'PO');
+}
+
+if (isset($_POST['_stock_id_editor'])) {
+	copy_to_cart();
+	context_call($path_to_root.'/inventory/manage/items.php?stock_id='.$_POST['stock_id'], 'PO');
+}
+//------------------------------------------------------------------------------
 
 if (isset($_GET['AddedID'])) 
 {
@@ -41,27 +59,32 @@ if (isset($_GET['AddedID']))
 		display_notification_centered(_("Purchase Order has been entered"));
 	else
 		display_notification_centered(_("Purchase Order has been updated") . " #$order_no");
-	display_note(get_trans_view_str($trans_type, $order_no, _("View this order")));
+	display_note(get_trans_view_str($trans_type, $order_no, _("&View this order")));
+	echo '<br>';
+	display_note(print_document_link($order_no, _("&Print This Order"), true, $trans_type));
 
-	hyperlink_params($path_to_root . "/purchasing/po_receive_items.php", _("Receive Items on this Purchase Order"), "PONumber=$order_no");
+	hyperlink_params($path_to_root . "/purchasing/po_receive_items.php", _("&Receive Items on this Purchase Order"), "PONumber=$order_no");
 
-	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Purchase Order"), "NewOrder=yes");
+	hyperlink_params($_SERVER['PHP_SELF'], _("Enter &Another Purchase Order"), "NewOrder=yes");
 	
-	hyperlink_no_params($path_to_root."/purchasing/inquiry/po_search.php", _("Select An Outstanding Purchase Order"));
+	hyperlink_no_params($path_to_root."/purchasing/inquiry/po_search.php", _("Select An &Outstanding Purchase Order"));
 	
 	display_footer_exit();	
 }
-
 //--------------------------------------------------------------------------------------------------
-function line_start_focus() {
-  global 	$Ajax;
 
-  $Ajax->activate('items_table');
-  set_focus('_stock_id_edit');
+function copy_from_cart()
+{
+	$_POST['supplier_id'] = $_SESSION['PO']->supplier_id;	
+	$_POST['OrderDate'] = $_SESSION['PO']->orig_order_date;	
+    $_POST['Requisition'] = $_SESSION['PO']->requisition_no;
+    $_POST['ref'] = $_SESSION['PO']->reference;
+	$_POST['Comments'] = $_SESSION['PO']->Comments;
+    $_POST['StkLocation'] = $_SESSION['PO']->Location;
+    $_POST['delivery_address'] = $_SESSION['PO']->delivery_address;	
 }
-//--------------------------------------------------------------------------------------------------
 
-function copy_to_po()
+function copy_to_cart()
 {
 	$_SESSION['PO']->supplier_id = $_POST['supplier_id'];	
 	$_SESSION['PO']->orig_order_date = $_POST['OrderDate'];
@@ -71,20 +94,14 @@ function copy_to_po()
 	$_SESSION['PO']->Location = $_POST['StkLocation'];
 	$_SESSION['PO']->delivery_address = $_POST['delivery_address'];
 }
-
 //--------------------------------------------------------------------------------------------------
 
-function copy_from_po()
-{
-	$_POST['supplier_id'] = $_SESSION['PO']->supplier_id;	
-	$_POST['OrderDate'] = $_SESSION['PO']->orig_order_date;	
-    $_POST['Requisition'] = $_SESSION['PO']->requisition_no;
-    $_POST['ref'] = $_SESSION['PO']->reference;
-	$_POST['Comments'] = $_SESSION['PO']->Comments;
-    $_POST['StkLocation'] = $_SESSION['PO']->Location;
-    $_POST['delivery_address'] = $_SESSION['PO']->delivery_address;	
-}
+function line_start_focus() {
+  global 	$Ajax;
 
+  $Ajax->activate('items_table');
+  set_focus('_stock_id_edit');
+}
 //--------------------------------------------------------------------------------------------------
 
 function unset_form_variables() {
@@ -259,14 +276,14 @@ function can_commit()
 	
 	if (!$_SESSION['PO']->order_no) 
 	{
-    	if (!references::is_valid($_SESSION['PO']->reference)) 
+    	if (!references::is_valid(get_post('ref'))) 
     	{
     		display_error(_("There is no reference entered for this purchase order."));
 			set_focus('ref');
     		return false;
     	} 
     	
-    	if (!is_new_reference($_SESSION['PO']->reference, systypes::po())) 
+    	if (!is_new_reference(get_post('ref'), systypes::po())) 
     	{
     		display_error(_("The entered reference is already in use."));
 			set_focus('ref');
@@ -274,14 +291,14 @@ function can_commit()
     	}
 	}
 	
-	if ($_SESSION['PO']->delivery_address == "")
+	if (get_post('delivery_address') == '')
 	{
 		display_error(_("There is no delivery address specified."));
 		set_focus('delivery_address');
 		return false;
 	} 
 	
-	if (!isset($_SESSION['PO']->Location) || $_SESSION['PO']->Location == "")
+	if (get_post('StkLocation') == '')
 	{
 		display_error(_("There is no location specified to move any items into."));
 		set_focus('StkLocation');
@@ -301,10 +318,10 @@ function can_commit()
 
 function handle_commit_order()
 {
-	copy_to_po();
 
 	if (can_commit())
 	{
+		copy_to_cart();
 
 		if ($_SESSION['PO']->order_no == 0)
 		{ 
@@ -334,34 +351,22 @@ $id = find_submit('Delete');
 if ($id != -1)
 	handle_delete_item($id);
 
-if (isset($_POST['Delete']) || isset($_POST['Edit']))
-{
-	copy_from_po();
-}
-	
 if (isset($_POST['Commit']))
 {
 	handle_commit_order();
 }
 if (isset($_POST['UpdateLine']))
-{
-	copy_to_po();
 	handle_update_item();
-}
+
 if (isset($_POST['EnterLine']))
-{
-	copy_to_po();
 	handle_add_new_item();
-} 
+
 if (isset($_POST['CancelOrder'])) 
-{
 	handle_cancel_po();
-}
+
 if (isset($_POST['CancelUpdate']))
-{
-	copy_to_po();
 	unset_form_variables();
-}
+
 if (isset($_GET['ModifyOrderNumber']) && $_GET['ModifyOrderNumber'] != "")
 {
 	create_new_po();
@@ -370,29 +375,16 @@ if (isset($_GET['ModifyOrderNumber']) && $_GET['ModifyOrderNumber'] != "")
 
 	/*read in all the selected order into the Items cart  */
 	read_po($_SESSION['PO']->order_no, $_SESSION['PO']);
-	copy_from_po();
+
+	copy_from_cart();
 }
+
 if (isset($_POST['CancelUpdate']) || isset($_POST['UpdateLine'])) {
 	line_start_focus();
 }
 
-//--------------------------------------------------------------------------------
-
 if (isset($_GET['NewOrder']))
-{
 	create_new_po();
-} 
-else 
-{
-	if (!isset($_POST['supplier_id']))
-		$_POST['supplier_id'] = $_SESSION['PO']->supplier_id;
-	if (!isset($_POST['OrderDate']))		
-		$_POST['OrderDate'] = $_SESSION['PO']->orig_order_date;
-	if (!isset($_POST['Requisition']))		
-		$_POST['Requisition'] = $_SESSION['PO']->requisition_no;
-	if (!isset($_POST['Comments']))		
-		$_POST['Comments'] = $_SESSION['PO']->Comments;
-}
 
 //---------------------------------------------------------------------------------------------------
 
@@ -412,9 +404,9 @@ div_start('controls', 'items_table');
 if ($_SESSION['PO']->order_has_items()) 
 {
 	if ($_SESSION['PO']->order_no)
-		submit_center_first('Commit', _("Update Order"));
+		submit_center_first('Commit', _("Update Order"), '', true);
 	else
-		submit_center_first('Commit', _("Place Order"));
+		submit_center_first('Commit', _("Place Order"), '', true);
 	submit_center_last('CancelOrder', _("Cancel Order")); 	
 }
 else