X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fsales_order_entry.php;h=8805dfdac4473fb9d0fe7cb03e894d0ee32b70a7;hb=13aa48ccc9265df336a1805d2e4709365f19c956;hp=4d85035946d618611016c262871251a0f653d610;hpb=fed6bc04a7b050a0b69136a332e92ee651812487;p=fa-stable.git diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php index 4d850359..8805dfda 100644 --- a/sales/sales_order_entry.php +++ b/sales/sales_order_entry.php @@ -18,6 +18,19 @@ include_once($path_to_root . "/sales/includes/db/sales_types_db.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); $js = ''; +if ($ret = context_restore()) { + // return from new customer add + copy_from_cart(); + if(isset($ret['customer_id'])) + $_POST['customer_id'] = $ret['customer_id']; + if(isset($ret['branch_id'])) + $_POST['branch_id'] = $ret['branch_id']; +} +if (isset($_POST['_customer_id_editor'])) { + copy_to_cart(); //store context + context_call($path_to_root.'/sales/manage/customers.php?debtor_no='.$_POST['customer_id'], 'Items'); +} + if ($use_popup_windows) { $js .= get_js_open_window(900, 500); } @@ -53,7 +66,6 @@ page($_SESSION['page_title'], false, false, "", $js); if (isset($_GET['AddedID'])) { $order_no = $_GET['AddedID']; - print_hidden_script(30); display_notification_centered(sprintf( _("Order # %d has been entered."),$order_no)); @@ -70,7 +82,6 @@ if (isset($_GET['AddedID'])) { } elseif (isset($_GET['UpdatedID'])) { $order_no = $_GET['UpdatedID']; - print_hidden_script(30); display_notification_centered(sprintf( _("Order # %d has been updated."),$order_no)); @@ -88,7 +99,6 @@ if (isset($_GET['AddedID'])) { } elseif (isset($_GET['AddedDN'])) { $delivery = $_GET['AddedDN']; - print_hidden_script(13); display_notification_centered(sprintf(_("Delivery # %d has been entered."),$delivery)); @@ -109,7 +119,6 @@ if (isset($_GET['AddedID'])) { } elseif (isset($_GET['AddedDI'])) { $invoice = $_GET['AddedDI']; - print_hidden_script(10); display_notification_centered(sprintf(_("Invoice # %d has been entered."),$invoice)); @@ -232,7 +241,8 @@ function can_process() { set_focus('delivery_date'); return false; } - if (date1_greater_date2($_SESSION['Items']->document_date, $_POST['delivery_date'])) { + //if (date1_greater_date2($_SESSION['Items']->document_date, $_POST['delivery_date'])) { + if (date1_greater_date2($_POST['OrderDate'], $_POST['delivery_date'])) { display_error(_("The requested delivery date is before the date of the order.")); set_focus('delivery_date'); return false; @@ -254,7 +264,10 @@ if (isset($_POST['ProcessOrder']) && can_process()) { $so_type = $_SESSION['Items']->so_type; $_SESSION['Items']->write(1); - + if (count($messages)) { // abort on failure or error messages are lost + $Ajax->activate('_page_body'); + display_footer_exit(); + } $trans_no = key($_SESSION['Items']->trans_no); $trans_type = $_SESSION['Items']->trans_type; @@ -274,7 +287,6 @@ if (isset($_POST['ProcessOrder']) && can_process()) { function check_item_data() { - if (!check_num('qty', 0) || !check_num('Disc', 0, 100)) { display_error( _("The item could not be updated because you are attempting to set the quantity ordered to less than 0, or the discount percent to more than 100.")); set_focus('qty'); @@ -289,6 +301,20 @@ function check_item_data() set_focus('qty'); display_error(_("You attempting to make the quantity ordered a quantity less than has already been delivered. The quantity delivered cannot be modified retrospectively.")); return false; + } // Joe Hunt added 2008-09-22 ------------------------- + elseif ($_SESSION['Items']->trans_type!=30 && !sys_prefs::allow_negative_stock() && + is_inventory_item($_POST['stock_id'])) + { + $qoh = get_qoh_on_date($_POST['stock_id'], $_POST['Location'], $_POST['OrderDate']); + if (input_num('qty') > $qoh) + { + $stock = get_item($_POST['stock_id']); + display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:") . + " " . $stock['stock_id'] . " - " . $stock['description'] . " - " . + _("Quantity On Hand") . " = " . number_format2($qoh, get_qty_dec($_POST['stock_id']))); + return false; + } + return true; } return true; } @@ -302,7 +328,6 @@ function handle_update_item() input_num('qty'), input_num('price'), input_num('Disc') / 100 ); } - copy_from_cart(); line_start_focus(); } @@ -336,9 +361,8 @@ function handle_new_item() function handle_cancel_order() { - global $path_to_root; + global $path_to_root, $Ajax; - if ($_POST['CancelOrder'] != "") { if ($_SESSION['Items']->trans_type == 13) { display_note(_("Direct delivery entry has been cancelled as requested."), 1); @@ -352,19 +376,23 @@ function handle_cancel_order() if ($_SESSION['Items']->trans_no != 0) { if (sales_order_has_deliveries(key($_SESSION['Items']->trans_no))) display_error(_("This order cannot be cancelled because some of it has already been invoiced or dispatched. However, the line item quantities may be modified.")); - else + else { delete_sales_order(key($_SESSION['Items']->trans_no)); - } display_note(_("This sales order has been cancelled as requested."), 1); hyperlink_params($path_to_root . "/sales/sales_order_entry.php", _("Enter a New Sales Order"), SID . "&NewOrder=Yes"); + } + } else { + processing_end(); + meta_forward($path_to_root.'/index.php?application=orders'); } - processing_end(); - br(1); - end_page(); - exit; } + $Ajax->activate('_page_body'); + processing_end(); + br(1); + end_page(); + exit; } //-------------------------------------------------------------------------------- @@ -411,7 +439,7 @@ if (isset($_POST['UpdateItem'])) if (isset($_POST['AddItem'])) handle_new_item(); -if (isset($_POST['CancelItemChanges']) || isset($_POST['UpdateItem'])) { +if (isset($_POST['CancelItemChanges'])) { line_start_focus(); } @@ -458,14 +486,15 @@ if ($customer_error == "") { if ($_SESSION['Items']->trans_no == 0) { submit_center_first('ProcessOrder', $porder, - _('Check entered data and save document'), true); + _('Check entered data and save document'), true, 'confirm.png'); } else { submit_center_first('ProcessOrder', $corder, - _('Validate changes and update document'), true); + _('Validate changes and update document'), true, 'confirm.png'); } submit_center_last('CancelOrder', $cancelorder, - _('Cancels document entry or removes sales order when editing an old document')); + _('Cancels document entry or removes sales order when editing an old document'), + true, 'escape.png'); } else { display_error($customer_error); }