X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=8805dfdac4473fb9d0fe7cb03e894d0ee32b70a7;hb=4c16d92ae1e1032f23e029d7d2f901a65a4223bc;hp=1b204354a7fc05ffeb6bc3957202685ac9c80209;hpb=8f6db6a1dc29f18e980a0b7ebee3319071aa2fb1;p=fa-stable.git diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php index 1b204354..8805dfda 100644 --- a/sales/sales_order_entry.php +++ b/sales/sales_order_entry.php @@ -11,17 +11,30 @@ $path_to_root=".."; include_once($path_to_root . "/sales/includes/cart_class.inc"); include_once($path_to_root . "/includes/session.inc"); -include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/sales/includes/sales_ui.inc"); include_once($path_to_root . "/sales/includes/ui/sales_order_ui.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); 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'); +} -$js = get_js_form_entry("StockID2", "stock_id", "qty"); if ($use_popup_windows) { $js .= get_js_open_window(900, 500); } + if ($use_date_picker) { $js .= get_js_date_picker(); } @@ -49,12 +62,10 @@ if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) { } 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)); @@ -71,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)); @@ -89,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)); @@ -110,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)); @@ -136,12 +144,12 @@ function copy_to_cart() if ($cart->trans_type!=30) { $cart->reference = $_POST['ref']; } - $cart->Comments = str_replace("'", "\\'", $_POST['Comments']); + $cart->Comments = $_POST['Comments']; $cart->document_date = $_POST['OrderDate']; $cart->due_date = $_POST['delivery_date']; $cart->cust_ref = $_POST['cust_ref']; - $cart->freight_cost = $_POST['freight_cost']; + $cart->freight_cost = input_num('freight_cost'); $cart->deliver_to = $_POST['deliver_to']; $cart->delivery_address = $_POST['delivery_address']; $cart->phone = $_POST['phone']; @@ -170,7 +178,7 @@ function copy_from_cart() $_POST['OrderDate'] = $cart->document_date; $_POST['delivery_date'] = $cart->due_date; $_POST['cust_ref'] = $cart->cust_ref; - $_POST['freight_cost'] = $cart->freight_cost; + $_POST['freight_cost'] = price_format($cart->freight_cost); $_POST['deliver_to'] = $cart->deliver_to; $_POST['delivery_address'] = $cart->delivery_address; @@ -179,54 +187,71 @@ function copy_from_cart() $_POST['ship_via'] = $cart->ship_via; $_POST['customer_id'] = $cart->customer_id; + $_POST['branch_id'] = $cart->Branch; $_POST['sales_type'] = $cart->sales_type; } +//-------------------------------------------------------------------------------- +function line_start_focus() { + global $Ajax; + + $Ajax->activate('items_table'); + set_focus('_stock_id_edit'); +} //-------------------------------------------------------------------------------- function can_process() { if (!is_date($_POST['OrderDate'])) { display_error(_("The entered date is invalid.")); + set_focus('OrderDate'); return false; } if ($_SESSION['Items']->trans_type!=30 && !is_date_in_fiscalyear($_POST['OrderDate'])) { display_error(_("The entered date is not in fiscal year")); + set_focus('OrderDate'); return false; } if (count($_SESSION['Items']->line_items) == 0) { display_error(_("You must enter at least one non empty item line.")); + set_focus('AddItem'); return false; } if (strlen($_POST['deliver_to']) <= 1) { display_error(_("You must enter the person or company to whom delivery should be made to.")); + set_focus('deliver_to'); return false; } if (strlen($_POST['delivery_address']) <= 1) { display_error( _("You should enter the street address in the box provided. Orders cannot be accepted without a valid street address.")); + set_focus('delivery_address'); return false; } if ($_POST['freight_cost'] == "") - $_POST['freight_cost'] = 0; + $_POST['freight_cost'] = price_format(0); - if (!is_numeric($_POST['freight_cost'])) { + if (!check_num('freight_cost',0)) { display_error(_("The shipping cost entered is expected to be numeric.")); + set_focus('freight_cost'); return false; } if (!is_date($_POST['delivery_date'])) { display_error(_("The delivery date is invalid.")); + 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; } if ($_SESSION['Items']->trans_type != 30 && !references::is_valid($_POST['ref'])) { display_error(_("You must enter a reference.")); + set_focus('ref'); return false; } - return true; } @@ -239,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; @@ -259,18 +287,34 @@ if (isset($_POST['ProcessOrder']) && can_process()) { function check_item_data() { - if (!is_numeric($_POST['qty']) || $_POST['qty'] < 0 || $_POST['Disc'] > 100 || $_POST['Disc'] < 0) { + 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'); return false; - } elseif (!is_numeric($_POST['price']) || $_POST['price'] < 0) { - - display_error( _("Price for item must be entered and can not be less then 0")); + } elseif (!check_num('price', 0)) { + display_error( _("Price for item must be entered and can not be less than 0")); + set_focus('price'); return false; } elseif (isset($_POST['LineNo']) && isset($_SESSION['Items']->line_items[$_POST['LineNo']]) - && $_SESSION['Items']->line_items[$_POST['LineNo']]->qty_done > $_POST['qty']) { + && !check_num('qty', $_SESSION['Items']->line_items[$_POST['LineNo']]->qty_done)) { + 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; } @@ -280,45 +324,45 @@ function check_item_data() function handle_update_item() { if ($_POST['UpdateItem'] != '' && check_item_data()) { - $_SESSION['Items']->update_cart_item($_POST['LineNo'], $_POST['qty'], - $_POST['price'], ($_POST['Disc'] / 100)); + $_SESSION['Items']->update_cart_item($_POST['LineNo'], + input_num('qty'), input_num('price'), + input_num('Disc') / 100 ); } + line_start_focus(); } //-------------------------------------------------------------------------------- -function handle_delete_item() +function handle_delete_item($line_no) { - if ($_GET['Delete'] != ""){ - $line_no = $_GET['Delete']; - if ($_SESSION['Items']->some_already_delivered($line_no) == 0) { - $_SESSION['Items']->remove_from_cart($line_no); - } else { - display_error(_("This item cannot be deleted because some of it has already been delivered.")); - } - } + if ($_SESSION['Items']->some_already_delivered($line_no) == 0) { + $_SESSION['Items']->remove_from_cart($line_no); + } else { + display_error(_("This item cannot be deleted because some of it has already been delivered.")); + } + line_start_focus(); } //-------------------------------------------------------------------------------- function handle_new_item() { + if (!check_item_data()) { return; } - add_to_order($_SESSION['Items'], $_POST['stock_id'], $_POST['qty'], - $_POST['price'], $_POST['Disc'] / 100); - - $_POST['StockID2'] = $_POST['stock_id'] = ""; + add_to_order($_SESSION['Items'], $_POST['stock_id'], input_num('qty'), + input_num('price'), input_num('Disc') / 100); + $_POST['_stock_id_edit'] = $_POST['stock_id'] = ""; + line_start_focus(); } //-------------------------------------------------------------------------------- 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); @@ -332,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; } //-------------------------------------------------------------------------------- @@ -360,8 +408,11 @@ function create_cart($type, $trans_no) $doc = new Cart(30, array($trans_no)); $doc->trans_type = $type; $doc->trans_no = 0; - - $doc->due_date = $doc->document_date = Today(); + $doc->document_date = Today(); // 2006-06-15. Added so Invoices and Deliveries get current day + if ($type == 10) + $doc->due_date = get_invoice_duedate($doc->customer_id, $doc->document_date); + else + $doc->due_date = $doc->document_date; $doc->reference = references::get_next($doc->trans_type); $doc->Comments=''; foreach($doc->line_items as $line_no => $line) { @@ -370,7 +421,6 @@ function create_cart($type, $trans_no) $_SESSION['Items'] = $doc; } else $_SESSION['Items'] = new Cart($type,array($trans_no)); - copy_from_cart(); } @@ -379,8 +429,9 @@ function create_cart($type, $trans_no) if (isset($_POST['CancelOrder'])) handle_cancel_order(); -if (isset($_GET['Delete'])) - handle_delete_item(); +$id = find_submit('Delete'); +if ($id!=-1) + handle_delete_item($id); if (isset($_POST['UpdateItem'])) handle_update_item(); @@ -388,8 +439,11 @@ if (isset($_POST['UpdateItem'])) if (isset($_POST['AddItem'])) handle_new_item(); -//-------------------------------------------------------------------------------- +if (isset($_POST['CancelItemChanges'])) { + line_start_focus(); +} +//-------------------------------------------------------------------------------- check_db_has_stock_items(_("There are no inventory items defined in the system.")); check_db_has_customer_branches(_("There are no customers, or there are no customers with branches. Please define customers and customer branches.")); @@ -430,16 +484,21 @@ if ($customer_error == "") { end_table(1); if ($_SESSION['Items']->trans_no == 0) { - submit_center_first('ProcessOrder', $porder); + + submit_center_first('ProcessOrder', $porder, + _('Check entered data and save document'), true, 'confirm.png'); } else { - submit_center_first('ProcessOrder', $corder); + submit_center_first('ProcessOrder', $corder, + _('Validate changes and update document'), true, 'confirm.png'); } - submit_center_last('CancelOrder', $cancelorder); + submit_center_last('CancelOrder', $cancelorder, + _('Cancels document entry or removes sales order when editing an old document'), + true, 'escape.png'); } else { display_error($customer_error); } end_form(); -//-------------------------------------------------------------------------------- end_page(); + ?> \ No newline at end of file