X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_entry_items.php;h=ec3f619b5bdfce68702d019e19b91b22ec049647;hb=7e8c90ee7e898a9181f62f387ccb92158f47f59c;hp=74469db9595e936e0bdb62af10b95e85319a8656;hpb=de320b43ef41373a90d9061483b6e8970947fdfa;p=fa-stable.git
diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 74469db9..ec3f619b 100644
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -1,13 +1,20 @@
.
+***********************************************************************/
$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,27 +48,33 @@ 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 '
';
+ 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 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 +84,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() {
@@ -128,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 "
";
@@ -259,14 +269,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 +284,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,17 +311,17 @@ function can_commit()
function handle_commit_order()
{
- copy_to_po();
if (can_commit())
{
+ 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");
@@ -334,34 +344,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,33 +368,20 @@ 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;
-}
//---------------------------------------------------------------------------------------------------
-start_form(false, true);
+start_form();
display_po_header($_SESSION['PO']);
echo "
";
@@ -412,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"));
+ submit_center_first('Commit', _("Update Order"), '', 'default');
else
- submit_center_first('Commit', _("Place Order"));
+ 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();
//---------------------------------------------------------------------------------------------------