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

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index be9dc188..ec3f619b 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)
@@ -41,18 +48,44 @@ 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));
+	display_note(print_document_link($order_no, _("&Email This Order"), true, $trans_type, false, "", "", 1),0, 1);
 
-	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;
 
@@ -102,12 +135,15 @@ function handle_cancel_po()
 	if($_SESSION['PO']->order_no != 0)
 	{
 		delete_po($_SESSION['PO']->order_no);
-	}	
+	} else {
+		unset($_SESSION['PO']);
+		meta_forward($path_to_root.'/index.php','application=AP');
+	}
 
 	$_SESSION['PO']->clear_items();
 	$_SESSION['PO'] = new purch_order;
 
-	display_note(_("This purchase order has been cancelled."), 0, 1);
+	display_notification(_("This purchase order has been cancelled."));
 
 	hyperlink_params($path_to_root . "/purchasing/po_entry_items.php", _("Enter a new purchase order"), "NewOrder=Yes");
 	echo "<br>";
@@ -278,20 +314,14 @@ 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)
 		{ 
 			
 			/*its a new order to be inserted */
 			$order_no = add_po($_SESSION['PO']);
-			 
+			new_doc_date($_SESSION['PO']->orig_order_date); 
 			unset($_SESSION['PO']);
 			 
         	meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no");	
@@ -338,14 +368,8 @@ 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'])) {
@@ -357,7 +381,7 @@ if (isset($_GET['NewOrder']))
 
 //---------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 display_po_header($_SESSION['PO']);
 echo "<br>";
@@ -373,13 +397,13 @@ div_start('controls', 'items_table');
 if ($_SESSION['PO']->order_has_items()) 
 {
 	if ($_SESSION['PO']->order_no)
-		submit_center_first('Commit', _("Update Order"), '', true);
+		submit_center_first('Commit', _("Update Order"), '', 'default');
 	else
-		submit_center_first('Commit', _("Place Order"), '', true);
+		submit_center_first('Commit', _("Place Order"), '', 'default');
 	submit_center_last('CancelOrder', _("Cancel Order")); 	
 }
 else
-	submit_center('CancelOrder', _("Cancel Order")); 	
+	submit_center('CancelOrder', _("Cancel Order"), true, false, 'cancel');
 div_end();
 //---------------------------------------------------------------------------------------------------