Popup editors now available as option for some list selectors.

[fa-stable.git] / sales / sales_order_entry.php

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index c63e0f2fc745ddad56426ce053f6ab812c67b0de..4df319c7641413d2a10dd6657f4b8e33d218985b 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -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,6 +61,13 @@ 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));
@@ -82,7 +80,7 @@ if (isset($_GET['AddedID'])) {
        submenu_option(_("Make &Delivery Against This Order"),
                "/sales/customer_delivery.php?OrderNumber=$order_no");
 
-       submenu_option(_("Enter a &New Order"), $_SERVER['PHP_SELF']."?NewOrder=0");
+       submenu_option(_("Enter a &New Order"), "/sales/sales_order_entry.php?NewOrder=0");
 
        display_footer_exit();
 
@@ -114,15 +112,17 @@ if (isset($_GET['AddedID'])) {
        submenu_print(_("&Print Delivery Note"), 13, $delivery, 'prtopt');
        set_focus('prtopt');
 
+       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))
                submenu_option(_("Enter a New Template &Delivery"),
-                       "inquiry/sales_orders_view.php?DeliveryTemplates=Yes");
+                       "/sales/inquiry/sales_orders_view.php?DeliveryTemplates=Yes");
        else
                submenu_option(_("Enter a &New Delivery"), 
-                       $_SERVER['PHP_SELF']."?NewDelivery=0");
+                       "/sales/sales_order_entry.php?NewDelivery=0");
 
        display_footer_exit();
 
@@ -136,17 +136,18 @@ if (isset($_GET['AddedID'])) {
        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))
                submenu_option(_("Enter a &New Template Invoice"), 
-                       "inquiry/sales_orders_view.php?InvoiceTemplates=Yes");
+                       "/sales/inquiry/sales_orders_view.php?InvoiceTemplates=Yes");
        else
                submenu_option(_("Enter a &New Direct Invoice"),
-                       $_SERVER['PHP_SELF']."?NewInvoice=0");
+                       "/sales/sales_order_entry.php?NewInvoice=0");
 
        display_footer_exit();
 } else
        check_edit_conflicts();
-
 //-----------------------------------------------------------------------------
 
 function copy_to_cart()
@@ -234,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."));
@@ -361,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'] );
@@ -422,7 +421,7 @@ function  handle_cancel_order()
                        }
                } 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');
@@ -435,7 +434,7 @@ function  handle_cancel_order()
 //--------------------------------------------------------------------------------
 
 function create_cart($type, $trans_no)
-{
+{ 
        processing_start();
        $doc_type = $type;
 
@@ -513,6 +512,7 @@ if ($_SESSION['Items']->trans_type == 10) {
        $corder = _("Commit Order Changes");
 }
 start_form();
+
 hidden('cart_id');
 
 $customer_error = display_order_header($_SESSION['Items'],
@@ -532,6 +532,7 @@ if ($customer_error == "") {
 
                submit_center_first('ProcessOrder', $porder,
                    _('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'), 'default');