X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=4df319c7641413d2a10dd6657f4b8e33d218985b;hb=f58466eea31b624deacaf5e5cd4b9de7995e0373;hp=09fc84f772c86c35cd40c44f824aa3b875ea8347;hpb=e1c22a904052bae141ace1ebdaaf2b81d9111139;p=fa-stable.git diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php index 09fc84f7..4df319c7 100644 --- a/sales/sales_order_entry.php +++ b/sales/sales_order_entry.php @@ -1,13 +1,13 @@ . + See the License here . ***********************************************************************/ //----------------------------------------------------------------------------- // @@ -28,15 +28,6 @@ include_once($path_to_root . "/sales/includes/db/sales_types_db.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); $js = ''; -editor_redirect( array( - 'customer_id' => $path_to_root.'/sales/manage/customers.php?debtor_no='.get_post('customer_id'), - 'branch_id' => $path_to_root.'/sales/manage/customer_branches.php?branch_id='.get_post('branch_id'), - )); - -editor_return( array( - 'customer_id'=>'customer_id', - 'branch_id'=>'branch_id')); - if ($use_popup_windows) { $js .= get_js_open_window(900, 500); } @@ -70,19 +61,26 @@ if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) { page($_SESSION['page_title'], false, false, "", $js); //----------------------------------------------------------------------------- +if (list_updated('branch_id')) { + // when branch is selected via external editor also customer can change + $br = get_branch(get_post('branch_id')); + $_POST['customer_id'] = $br['debtor_no']; + $Ajax->activate('customer_id'); +} + if (isset($_GET['AddedID'])) { $order_no = $_GET['AddedID']; - display_notification_centered(sprintf( _("Order # %d has been entered."),$order_no)); - display_note(get_trans_view_str(30, $order_no, _("&View This Order"))); - echo '
'; - display_note(print_document_link($order_no, _("&Print This Order"), true, 30)); + submenu_view(_("&View This Order"), 30, $order_no); - hyperlink_params($path_to_root . "/sales/customer_delivery.php", - _("Make &Delivery Against This Order"), "OrderNumber=$order_no"); + submenu_print(_("&Print This Order"), 30, $order_no, 'prtopt'); + set_focus('prtopt'); + + submenu_option(_("Make &Delivery Against This Order"), + "/sales/customer_delivery.php?OrderNumber=$order_no"); - hyperlink_params($_SERVER['PHP_SELF'], _("Enter a &New Order"), "NewOrder=0"); + submenu_option(_("Enter a &New Order"), "/sales/sales_order_entry.php?NewOrder=0"); display_footer_exit(); @@ -91,15 +89,16 @@ if (isset($_GET['AddedID'])) { display_notification_centered(sprintf( _("Order # %d has been updated."),$order_no)); - display_note(get_trans_view_str(30, $order_no, _("&View This Order"))); - echo '
'; - display_note(print_document_link($order_no, _("&Print This Order"), true, 30)); + submenu_view(_("&View This Order"), 30, $order_no); - hyperlink_params($path_to_root . "/sales/customer_delivery.php", - _("Confirm Order Quantities and Make &Delivery"), "OrderNumber=$order_no"); + submenu_print(_("&Print This Order"), 30, $order_no, 'prtopt'); + set_focus('prtopt'); - hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php", - _("Select A Different &Order"), "OutstandingOnly=1"); + submenu_option(_("Confirm Order Quantities and Make &Delivery"), + "/sales/customer_delivery.php?OrderNumber=$order_no"); + + submenu_option(_("Select A Different &Order"), + "/sales/inquiry/sales_orders_view.php?OutstandingOnly=1"); display_footer_exit(); @@ -108,40 +107,47 @@ if (isset($_GET['AddedID'])) { display_notification_centered(sprintf(_("Delivery # %d has been entered."),$delivery)); - display_note(get_trans_view_str(13, $delivery, _("&View This Delivery"))); - echo '
'; - display_note(print_document_link($delivery, _("&Print Delivery Note"), true, 13)); + submenu_view(_("&View This Delivery"), 13, $delivery); + + submenu_print(_("&Print Delivery Note"), 13, $delivery, 'prtopt'); + set_focus('prtopt'); - hyperlink_params($path_to_root . "/sales/customer_invoice.php", - _("Make &Invoice Against This Delivery"), "DeliveryNumber=$delivery"); + display_note(get_gl_view_str(13, $delivery, _("View the GL Journal Entries for this Dispatch")),0, 1); + + submenu_option(_("Make &Invoice Against This Delivery"), + "/sales/customer_invoice.php?DeliveryNumber=$delivery"); if ((isset($_GET['Type']) && $_GET['Type'] == 1)) - hyperlink_params("inquiry/sales_orders_view.php", - _("Enter a New Template &Delivery"), "DeliveryTemplates=Yes"); + submenu_option(_("Enter a New Template &Delivery"), + "/sales/inquiry/sales_orders_view.php?DeliveryTemplates=Yes"); else - hyperlink_params($_SERVER['PHP_SELF'], _("Enter a &New Delivery"), "NewDelivery=0"); + submenu_option(_("Enter a &New Delivery"), + "/sales/sales_order_entry.php?NewDelivery=0"); display_footer_exit(); } elseif (isset($_GET['AddedDI'])) { $invoice = $_GET['AddedDI']; - display_notification_centered(sprintf(_("Invoice # %d has been entered."),$invoice)); + display_notification_centered(sprintf(_("Invoice # %d has been entered."), $invoice)); + + submenu_view(_("&View This Invoice"), 10, $invoice); - display_note(get_trans_view_str(10, $invoice, _("&View This Invoice"))); - echo '
'; - display_note(print_document_link($invoice, _("&Print Sales Invoice"), true, 10)); + submenu_print(_("&Print Sales Invoice"), 10, $invoice, 'prtopt'); + set_focus('prtopt'); + + display_note(get_gl_view_str(10, $invoice, _("View the GL &Journal Entries for this Invoice")),0, 1); if ((isset($_GET['Type']) && $_GET['Type'] == 1)) - hyperlink_params("inquiry/sales_orders_view.php", - _("Enter a &New Template Invoice"), "InvoiceTemplates=Yes"); + submenu_option(_("Enter a &New Template Invoice"), + "/sales/inquiry/sales_orders_view.php?InvoiceTemplates=Yes"); else - hyperlink_params($_SERVER['PHP_SELF'], _("Enter a &New Direct Invoice"), "NewInvoice=0"); + submenu_option(_("Enter a &New Direct Invoice"), + "/sales/sales_order_entry.php?NewInvoice=0"); display_footer_exit(); } else check_edit_conflicts(); - //----------------------------------------------------------------------------- function copy_to_cart() @@ -229,8 +235,8 @@ function line_start_focus() { $Ajax->activate('items_table'); set_focus('_stock_id_edit'); } -//-------------------------------------------------------------------------------- +//-------------------------------------------------------------------------------- function can_process() { if (!is_date($_POST['OrderDate'])) { display_error(_("The entered date is invalid.")); @@ -302,7 +308,7 @@ if (isset($_POST['ProcessOrder']) && can_process()) { } $trans_no = key($_SESSION['Items']->trans_no); $trans_type = $_SESSION['Items']->trans_type; - + new_doc_date($_SESSION['Items']->document_date); processing_end(); if ($modified) { meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no"); @@ -356,8 +362,6 @@ function check_item_data() function handle_update_item() { if ($_POST['UpdateItem'] != '' && check_item_data()) { - //alert("description=".$_POST['item_description']); - //$_SESSION['items']->line_items[$_POST['LineNo']]->item_description = $_POST['item_description']; $_SESSION['Items']->update_cart_item($_POST['LineNo'], input_num('qty'), input_num('price'), input_num('Disc') / 100, $_POST['item_description'] ); @@ -399,13 +403,12 @@ function handle_cancel_order() if ($_SESSION['Items']->trans_type == 13) { - display_note(_("Direct delivery entry has been cancelled as requested."), 1); - hyperlink_params($path_to_root . "/sales/sales_order_entry.php", - _("Enter a New Sales Delivery"), SID . "&NewDelivery=0"); + display_note(_("Direct delivery entry has been cancelled as requested."), 1); + submenu_option(_("Enter a New Sales Delivery"), $_SERVER['PHP_SELF']."?NewDelivery=0"); + } elseif ($_SESSION['Items']->trans_type == 10) { - display_note(_("Direct invoice entry has been cancelled as requested."), 1); - hyperlink_params($path_to_root . "/sales/sales_order_entry.php", - _("Enter a New Sales Delivery"), SID . "&NewDelivery=0"); + display_note(_("Direct invoice entry has been cancelled as requested."), 1); + submenu_option(_("Enter a New Sales Invoice"), $_SERVER['PHP_SELF']."?NewInvoice=0"); } else { if ($_SESSION['Items']->trans_no != 0) { if (sales_order_has_deliveries(key($_SESSION['Items']->trans_no))) @@ -414,12 +417,11 @@ function handle_cancel_order() 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"); + submenu_option(_("Enter a New Sales Order"), $_SERVER['PHP_SELF']."?NewOrder=Yes"); } } else { processing_end(); - meta_forward($path_to_root.'/index.php?application=orders'); + meta_forward($path_to_root.'/index.php','application=orders'); } } $Ajax->activate('_page_body'); @@ -432,7 +434,7 @@ function handle_cancel_order() //-------------------------------------------------------------------------------- function create_cart($type, $trans_no) -{ +{ processing_start(); $doc_type = $type; @@ -442,7 +444,7 @@ function create_cart($type, $trans_no) $doc = new Cart(30, array($trans_no)); $doc->trans_type = $type; $doc->trans_no = 0; - $doc->document_date = Today(); // 2006-06-15. Added so Invoices and Deliveries get current day + $doc->document_date = new_doc_date(); if ($type == 10) { $doc->due_date = get_invoice_duedate($doc->customer_id, $doc->document_date); $doc->pos = user_pos(); @@ -509,7 +511,8 @@ if ($_SESSION['Items']->trans_type == 10) { $porder = _("Place Order"); $corder = _("Commit Order Changes"); } -start_form(false, true); +start_form(); + hidden('cart_id'); $customer_error = display_order_header($_SESSION['Items'], @@ -528,15 +531,15 @@ if ($customer_error == "") { if ($_SESSION['Items']->trans_no == 0) { submit_center_first('ProcessOrder', $porder, - _('Check entered data and save document'), true, ICON_OK); + _('Check entered data and save document'), 'default'); + submit_js_confirm('CancelOrder', _('You are about to void this Sales Order.\nDo you want to continue?')); } else { submit_center_first('ProcessOrder', $corder, - _('Validate changes and update document'), true, ICON_OK); + _('Validate changes and update document'), 'default'); } submit_center_last('CancelOrder', $cancelorder, - _('Cancels document entry or removes sales order when editing an old document'), - true, ICON_CANCEL); + _('Cancels document entry or removes sales order when editing an old document')); } else { display_error($customer_error); }