Rerun
authorJoe Hunt <joe.hunt.consulting@gmail.com>
Mon, 25 Jan 2010 23:29:14 +0000 (23:29 +0000)
committerJoe Hunt <joe.hunt.consulting@gmail.com>
Mon, 25 Jan 2010 23:29:14 +0000 (23:29 +0000)
sales/sales_order_entry.php

index 0b578aef8e75e857fe6d0141b9765e3c7fc827ca..164f143b25890c66546aa160ea66cadc20b05ff1 100644 (file)
@@ -495,11 +495,11 @@ function  handle_cancel_order()
 
 
        if ($_SESSION['Items']->trans_type == ST_CUSTDELIVERY) {
-               display_note(_("Direct delivery entry has been cancelled as requested."), 1);
+               display_notification(_("Direct delivery entry has been cancelled as requested."), 1);
                submenu_option(_("Enter a New Sales Delivery"), "/sales/sales_order_entry.php?NewDelivery=1");
 
        } elseif ($_SESSION['Items']->trans_type == ST_SALESINVOICE) {
-               display_note(_("Direct invoice entry has been cancelled as requested."), 1);
+               display_notification(_("Direct invoice entry has been cancelled as requested."), 1);
                submenu_option(_("Enter a New Sales Invoice"),  "/sales/sales_order_entry.php?NewInvoice=1");
        } else {
                if ($_SESSION['Items']->trans_no != 0) {
@@ -510,12 +510,12 @@ function  handle_cancel_order()
                                delete_sales_order(key($_SESSION['Items']->trans_no), $_SESSION['Items']->trans_type);
                                if ($_SESSION['Items']->trans_type == ST_SALESQUOTE)
                                {
-                                       display_note(_("This sales quotation has been cancelled as requested."), 1);
+                                       display_notification(_("This sales quotation has been cancelled as requested."), 1);
                                        submenu_option(_("Enter a New Sales Quotation"), "/sales/sales_order_entry.php?NewQuotation=Yes");
                                }
                                else
                                {
-                                       display_note(_("This sales order has been cancelled as requested."), 1);
+                                       display_notification(_("This sales order has been cancelled as requested."), 1);
                                        submenu_option(_("Enter a New Sales Order"), "/sales/sales_order_entry.php?NewOrder=Yes");
                                }
                        }       
@@ -632,7 +632,6 @@ if ($_SESSION['Items']->trans_type == ST_SALESINVOICE) {
 start_form();
 
 hidden('cart_id');
-
 $customer_error = display_order_header($_SESSION['Items'],
        ($_SESSION['Items']->any_already_delivered() == 0), $idate);