Fixed link bugs in sales order entry and optimized a couple of functions in ui_contro...

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 560ec67018de62450388e20508af4c37db2c3063..54bf119bbba11f1d21d88c6f93aff4f64989e4da 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+28-Jun-2009 Joe Hunt
+# Fixed link bugs in sales order entry and optimized a couple of functions in ui_controls.inc
+$ /includes/ui/ui_controls.inc
+  /sales/sales_order_entry.php
+  
 27-Jun-2009 Joe Hunt
 # Corrections to default COAs.
 $ /sql/alter2.2.sql

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 322296df5465fd869254a8529fc96da432c98669..559d1751b9eda8fcce0de7037cd1b4507550388b 100644 (file)
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -188,20 +188,17 @@ function menu_link($url, $label, $id=null)
 function submenu_option($title, $url, $id=null)
 {
        global $path_to_root;
-       display_note(menu_link($path_to_root . $url, $title, $id));
-       echo '<br>';
+       display_note(menu_link($path_to_root . $url, $title, $id), 0, 1);
 }
 
 function submenu_view($title, $type, $number, $id=null)
 {
-       display_note(get_trans_view_str($type, $number, $title, false, 'menu_option', $id));
-       echo '<br>';
+       display_note(get_trans_view_str($type, $number, $title, false, 'menu_option', $id), 0, 1);
 }
 
 function submenu_print($title, $type, $number, $id=null)
 {
-       display_note(print_document_link($number, $title, true, $type, false, 'menu_option', $id));
-       echo '<br>';
+       display_note(print_document_link($number, $title, true, $type, false, 'menu_option', $id), 0, 1);
 }
 //-----------------------------------------------------------------------------------
 

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index e965c493dfc1a68c33bb33f956cfc85221fc9c9e..f19b3cb6f6f9a96dc433f0ec6dcfaa40f8521eaa 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -82,7 +82,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,17 +114,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")),1);
+       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();
 
@@ -138,14 +138,14 @@ 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")),1);
+       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