X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_entry_items.php;h=2cb5a364d1b3b530e35df356bc220ea85cfa42da;hb=916c3a6fd1dfd8dcf19ff5eb70e49b3bf3c5a338;hp=be9dc188684e6b72fffbb90aebfcba76a766ecf7;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index be9dc188..2cb5a364 100644
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -1,13 +1,20 @@
 <?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>.
+***********************************************************************/
 $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 +38,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,18 +68,43 @@ 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 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_cart()
+{
+	$_SESSION['PO']->supplier_id = $_POST['supplier_id'];	
+	$_SESSION['PO']->orig_order_date = $_POST['OrderDate'];
+	$_SESSION['PO']->reference = $_POST['ref'];
+	$_SESSION['PO']->requisition_no = $_POST['Requisition'];
+	$_SESSION['PO']->Comments = $_POST['Comments'];	
+	$_SESSION['PO']->Location = $_POST['StkLocation'];
+	$_SESSION['PO']->delivery_address = $_POST['delivery_address'];
+}
 //--------------------------------------------------------------------------------------------------
+
 function line_start_focus() {
   global 	$Ajax;
 
@@ -278,13 +330,7 @@ function handle_commit_order()
 
 	if (can_commit())
 	{
-		$_SESSION['PO']->supplier_id = $_POST['supplier_id'];	
-		$_SESSION['PO']->orig_order_date = $_POST['OrderDate'];
-		$_SESSION['PO']->reference = $_POST['ref'];
-		$_SESSION['PO']->requisition_no = $_POST['Requisition'];
-		$_SESSION['PO']->Comments = $_POST['Comments'];	
-		$_SESSION['PO']->Location = $_POST['StkLocation'];
-		$_SESSION['PO']->delivery_address = $_POST['delivery_address'];
+		copy_to_cart();
 
 		if ($_SESSION['PO']->order_no == 0)
 		{ 
@@ -339,13 +385,7 @@ if (isset($_GET['ModifyOrderNumber']) && $_GET['ModifyOrderNumber'] != "")
 	/*read in all the selected order into the Items cart  */
 	read_po($_SESSION['PO']->order_no, $_SESSION['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;	
+	copy_from_cart();
 }
 
 if (isset($_POST['CancelUpdate']) || isset($_POST['UpdateLine'])) {