Add/view on F4 in supplier/items selectors.

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index a6136e7c509964a4e20e2e1116b85ee581f834b6..67b3faf4c03d444fcae06b3090804df50497f6bb 100644 (file)
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -18,7 +18,7 @@ $new_item = get_post('stock_id')=='';
 
 if (isset($_GET['stock_id']))
 {
-       $stock_id = strtoupper($_GET['stock_id']);
+       $_POST['stock_id'] = $stock_id = strtoupper($_GET['stock_id']);
 }
 else if (isset($_POST['stock_id']))
 {
@@ -217,6 +217,12 @@ if (isset($_POST['delete']) && strlen($_POST['delete']) > 1)
                $Ajax->activate('_page_body');
        }
 }
+//-------------------------------------------------------------------------------------------- 
+
+if (isset($_POST['select']))
+{
+       context_return(array('stock_id' => $_POST['stock_id']));
+}
 
 //------------------------------------------------------------------------------------
 
@@ -376,7 +382,7 @@ if (!isset($_POST['NewStockID']) || $new_item)
 else 
 {
        submit_center_first('addupdate', _("Update Item"), '', true);
-
+       submit_return('select', _("Return"), _("Select this items and return to document entry."), true);
        submit_center_last('delete', _("Delete This Item"), '', true);
 }
 

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index be9dc188684e6b72fffbb90aebfcba76a766ecf7..b9bab552144b42600f6ad673df40c8ee690fbe36 100644 (file)
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -31,6 +31,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'])) 
 {
@@ -51,8 +71,31 @@ if (isset($_GET['AddedID']))
        
        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 +321,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 +376,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'])) {