X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_entry_items.php;h=ec3f619b5bdfce68702d019e19b91b22ec049647;hb=7e8c90ee7e898a9181f62f387ccb92158f47f59c;hp=8c64fee522db9f255c409ed5558799a7db16c7b3;hpb=68372f2a08f5a862375c04862c8ccb56df830b4b;p=fa-stable.git
diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 8c64fee5..ec3f619b 100644
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$page_security = 4;
$path_to_root="..";
include_once($path_to_root . "/purchasing/includes/po_class.inc");
@@ -29,26 +38,6 @@ 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']))
{
@@ -62,6 +51,7 @@ if (isset($_GET['AddedID']))
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");
@@ -145,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 "
";
@@ -328,7 +321,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 +368,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 +381,7 @@ if (isset($_GET['NewOrder']))
//---------------------------------------------------------------------------------------------------
-start_form(false, true);
+start_form();
display_po_header($_SESSION['PO']);
echo "
";
@@ -404,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();
//---------------------------------------------------------------------------------------------------