Print link class fixed

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

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index e965c493dfc1a68c33bb33f956cfc85221fc9c9e..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,17 +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")),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 +136,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