Fixed payments reallocation for prepayment orders; blocked edition for open prepaymen...

[fa-stable.git] / sales / inquiry / sales_orders_view.php

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index 7955d6c41e44b861d6d6c55a5fbbbb809ae75947..f275bc7055c2957c14781c143f64188631ef6cf6 100644 (file)
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -71,34 +71,11 @@ else
 }
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 600);
 if (user_use_date_picker())
        $js .= get_js_date_picker();
 page($_SESSION['page_title'], false, false, "", $js);
-
-if (isset($_GET['selected_customer']))
-{
-       $selected_customer = $_GET['selected_customer'];
-}
-elseif (isset($_POST['selected_customer']))
-{
-       $selected_customer = $_POST['selected_customer'];
-}
-else
-       $selected_customer = -1;
-
-//---------------------------------------------------------------------------------------------
-
-if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
-       ($_POST['SelectStockFromList'] != ALL_TEXT))
-{
-       $selected_stock_item = $_POST['SelectStockFromList'];
-}
-else
-{
-       unset($selected_stock_item);
-}
 //---------------------------------------------------------------------------------------------
 //     Query format functions
 //
@@ -129,12 +106,10 @@ function edit_link($row)
 {
        global $page_nested;
 
-       if ($page_nested)
+       if (is_prepaid_order_open($row['order_no']))
                return '';
-       global $trans_type;
-       $modify = ($trans_type == ST_SALESORDER ? "ModifyOrderNumber" : "ModifyQuotationNumber");
-  return pager_link( _("Edit"),
-    "/sales/sales_order_entry.php?$modify=" . $row['order_no'], ICON_EDIT);
+
+       return $page_nested ? '' : trans_editor_link($row['trans_type'], $row['order_no']);
 }
 
 function dispatch_link($row)
@@ -177,7 +152,8 @@ function order_link($row)
 function tmpl_checkbox($row)
 {
        global $trans_type, $page_nested;
-       if ($trans_type == ST_SALESQUOTE)
+
+       if ($trans_type == ST_SALESQUOTE || !check_sales_order_type($row['order_no']))
                return '';
 
        if ($page_nested)
@@ -223,8 +199,8 @@ if (get_post('_OrderNumber_changed') || get_post('_OrderReference_changed')) //
        $disable = get_post('OrderNumber') !== '' || get_post('OrderReference') !== '';
 
        if ($show_dates) {
-                       $Ajax->addDisable(true, 'OrdersAfterDate', $disable);
-                       $Ajax->addDisable(true, 'OrdersToDate', $disable);
+               $Ajax->addDisable(true, 'OrdersAfterDate', $disable);
+               $Ajax->addDisable(true, 'OrdersToDate', $disable);
        }
 
        $Ajax->activate('orders_tbl');
@@ -238,7 +214,7 @@ ref_cells(_("#:"), 'OrderNumber', '',null, '', true);
 ref_cells(_("Ref"), 'OrderReference', '',null, '', true);
 if ($show_dates)
 {
-       date_cells(_("from:"), 'OrdersAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
+       date_cells(_("from:"), 'OrdersAfterDate', '', null, -user_transaction_days());
        date_cells(_("to:"), 'OrdersToDate', '', null, 1);
 }
 locations_list_cells(_("Location:"), 'StockLocation', null, true, true);
@@ -252,7 +228,7 @@ if($show_dates) {
 }
 stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true, true);
 
-if (!@$_GET['popup'])
+if (!$page_nested)
        customer_list_cells(_("Select a customer: "), 'customer_id', null, true, true);
 if ($trans_type == ST_SALESQUOTE)
        check_cells(_("Show All:"), 'show_all');
@@ -267,8 +243,9 @@ end_table(1);
 //---------------------------------------------------------------------------------------------
 //     Orders inquiry table
 //
-$sql = get_sql_for_sales_orders_view($selected_customer, $trans_type, $_POST['OrderNumber'], $_POST['order_view_mode'],
-       @$selected_stock_item, @$_POST['OrdersAfterDate'], @$_POST['OrdersToDate'], @$_POST['OrderReference'], $_POST['StockLocation'], $_POST['customer_id']);
+$sql = get_sql_for_sales_orders_view($trans_type, get_post('OrderNumber'), get_post('order_view_mode'),
+       get_post('SelectStockFromList'), get_post('OrdersAfterDate'), get_post('OrdersToDate'), get_post('OrderReference'), get_post('StockLocation'),
+       get_post('customer_id'));
 
 if ($trans_type == ST_SALESORDER)
        $cols = array(
@@ -299,7 +276,6 @@ else
                _("Currency") => array('align'=>'center')
        );
 if ($_POST['order_view_mode'] == 'OutstandingOnly') {
-       //array_substitute($cols, 3, 1, _("Cust Order Ref"));
        array_append($cols, array(
                array('insert'=>true, 'fun'=>'dispatch_link'),
                array('insert'=>true, 'fun'=>'edit_link')));