X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_entry_items.php;h=09fc0663bb9c47ba6082d83e52c538ed2d268924;hb=11e485e4a7c5f12c9424713b7330815a9cc5e4ae;hp=c17dccaa760e154cfcccfe5ac39cbd91e060f31f;hpb=4d4371fb200bb27fd6b680ebd2d1aaa450a0be7e;p=fa-stable.git diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php index c17dccaa..09fc0663 100644 --- a/purchasing/po_entry_items.php +++ b/purchasing/po_entry_items.php @@ -9,8 +9,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 4; -$path_to_root=".."; +$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"); @@ -38,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'])) { @@ -68,9 +48,11 @@ 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"))); - echo '
'; - 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"); @@ -340,7 +322,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"); @@ -387,7 +369,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(); }