X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_entry_items.php;h=5a7958d28d9295ba6941b311c6f481dcc2bc4388;hb=e67a7d7074ceb37291846e68f8c5683bb93560ab;hp=1619bb49813a4bc7c68adffa8bc0f5f25982e030;hpb=43aa0abba82e8fa1f770b3b798875e7cae1e4b78;p=fa-stable.git

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 1619bb49..5a7958d2 100644
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -1,7 +1,16 @@
 <?php
-
-$page_security = 4;
-$path_to_root="..";
+/**********************************************************************
+    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 = 'SA_PURCHASEORDER';
+$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");
@@ -15,11 +24,11 @@ if ($use_date_picker)
 
 if (isset($_GET['ModifyOrderNumber'])) 
 {
-	page(_("Modify Purchase Order #") . $_GET['ModifyOrderNumber'], false, false, "", $js);
+	page(_($help_context = "Modify Purchase Order #") . $_GET['ModifyOrderNumber'], false, false, "", $js);
 } 
 else 
 {
-	page(_("Purchase Order Entry"), false, false, "", $js);
+	page(_($help_context = "Purchase Order Entry"), false, false, "", $js);
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -29,45 +38,27 @@ 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'])) 
 {
 	$order_no = $_GET['AddedID'];
-	$trans_type = systypes::po();	
+	$trans_type = ST_PURCHORDER;	
 
 	if (!isset($_GET['Updated']))
 		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")));
-	echo '<br>';
-	display_note(print_document_link($order_no, _("Print This Order"), true, $trans_type));
+	display_note(get_trans_view_str($trans_type, $order_no, _("&View this order")), 0, 1);
+
+	display_note(print_document_link($order_no, _("&Print This Order"), true, $trans_type), 0, 1);
+
+	display_note(print_document_link($order_no, _("&Email This Order"), true, $trans_type, false, "", "", 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();	
 }
@@ -145,12 +136,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>";
@@ -163,9 +157,12 @@ function handle_cancel_po()
 
 function check_data()
 {
-    if (!check_num('qty',0))
+	$dec = get_qty_dec($_POST['stock_id']);
+	$min = 1 / pow(10, $dec);
+    if (!check_num('qty',$min))
     {
-	   	display_error(_("The quantity of the order item must be numeric and not less than zero."));
+    	$min = number_format2($min, $dec);
+	   	display_error(_("The quantity of the order item must be numeric and not less than ").$min);
 		set_focus('qty');
 	   	return false;
     }
@@ -191,19 +188,21 @@ function handle_update_item()
 {
 	$allow_update = check_data(); 
 
-	if ($allow_update && 
-		($_SESSION['PO']->line_items[$_POST['line_no']]->qty_inv > input_num('qty') ||
-		$_SESSION['PO']->line_items[$_POST['line_no']]->qty_received > input_num('qty')))
+	if ($allow_update)
 	{
-		display_error(_("You are attempting to make the quantity ordered a quantity less than has already been invoiced or received.  This is prohibited.") .
-			"<br>" . _("The quantity received can only be modified by entering a negative receipt and the quantity invoiced can only be reduced by entering a credit note against this item."));
-		set_focus('qty');
-		return;
-	}
+		if ($_SESSION['PO']->line_items[$_POST['line_no']]->qty_inv > input_num('qty') ||
+			$_SESSION['PO']->line_items[$_POST['line_no']]->qty_received > input_num('qty'))
+		{
+			display_error(_("You are attempting to make the quantity ordered a quantity less than has already been invoiced or received.  This is prohibited.") .
+				"<br>" . _("The quantity received can only be modified by entering a negative receipt and the quantity invoiced can only be reduced by entering a credit note against this item."));
+			set_focus('qty');
+			return;
+		}
 	
-	$_SESSION['PO']->update_order_item($_POST['line_no'], input_num('qty'), input_num('price'),
-  		$_POST['req_del_date']);
-	unset_form_variables();
+		$_SESSION['PO']->update_order_item($_POST['line_no'], input_num('qty'), input_num('price'),
+  			$_POST['req_del_date']);
+		unset_form_variables();
+	}	
     line_start_focus();
 }
 
@@ -219,24 +218,18 @@ function handle_add_new_item()
 		{
 		    foreach ($_SESSION['PO']->line_items as $order_item) 
 		    {
-
     			/* do a loop round the items on the order to see that the item
     			is not already on this order */
-   			    if (($order_item->stock_id == $_POST['stock_id']) && 
-   			    	($order_item->Deleted == false)) 
+   			    if (($order_item->stock_id == $_POST['stock_id'])) 
    			    {
-				  	$allow_update = false;
-				  	display_error(_("The selected item is already on this order."));
+					display_warning(_("The selected item is already on this order."));
 			    }
 		    } /* end of the foreach loop to look for pre-existing items of the same code */
 		}
 
 		if ($allow_update == true)
 		{
-		   	$sql = "SELECT description, units, mb_flag
-				FROM ".TB_PREF."stock_master WHERE stock_id = '". $_POST['stock_id'] . "'";
-
-		    $result = db_query($sql,"The stock details for " . $_POST['stock_id'] . " could not be retrieved");
+			$result = get_short_info($_POST['stock_id']);
 
 		    if (db_num_rows($result) == 0)
 		    {
@@ -267,6 +260,8 @@ function handle_add_new_item()
 
 function can_commit()
 {
+	global $Refs;
+
 	if (!is_date($_POST['OrderDate'])) 
 	{
 		display_error(_("The entered order date is invalid."));
@@ -276,14 +271,14 @@ function can_commit()
 	
 	if (!$_SESSION['PO']->order_no) 
 	{
-    	if (!references::is_valid(get_post('ref'))) 
+    	if (!$Refs->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(get_post('ref'), systypes::po())) 
+    	if (!is_new_reference(get_post('ref'), ST_PURCHORDER)) 
     	{
     		display_error(_("The entered reference is already in use."));
 			set_focus('ref');
@@ -328,7 +323,7 @@ function handle_commit_order()
 			
 			/*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");	
@@ -375,7 +370,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']);
-
+	
 	copy_from_cart();
 }
 
@@ -388,7 +383,7 @@ if (isset($_GET['NewOrder']))
 
 //---------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 display_po_header($_SESSION['PO']);
 echo "<br>";
@@ -404,13 +399,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();
 //---------------------------------------------------------------------------------------------------