Fixed include file issue in sales order entry.

[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 91b4d670b3b601bb9bdbcd480217ed1c23d10440..7955d6c41e44b861d6d6c55a5fbbbb809ae75947 100644 (file)
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -73,7 +73,7 @@ else
 $js = "";
 if ($use_popup_windows)
        $js .= get_js_open_window(900, 600);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 page($_SESSION['page_title'], false, false, "", $js);
 
@@ -109,7 +109,7 @@ function check_overdue($row)
                return (date1_greater_date2(Today(), sql2date($row['delivery_date'])));
        else
                return ($row['type'] == 0
-                       && date1_greater_date2(Today(), sql2date($row['ord_date']))
+                       && date1_greater_date2(Today(), sql2date($row['delivery_date']))
                        && ($row['TotDelivered'] < $row['TotQuantity']));
 }
 
@@ -128,7 +128,7 @@ function prt_link($row)
 function edit_link($row) 
 {
        global $page_nested;
-       
+
        if ($page_nested)
                return '';
        global $trans_type;
@@ -201,27 +201,17 @@ function invoice_prep_link($row)
                "/sales/customer_invoice.php?InvoicePrepayments=" .$row['order_no'], ICON_DOC) : '';
 }
 
-//---------------------------------------------------------------------------------------------
-// Update db record if respective checkbox value has changed.
-//
-function change_tpl_flag($id)
+$id = find_submit('_chgtpl');
+if ($id != -1)
 {
-       global  $Ajax;
-       
-       $sql = "UPDATE ".TB_PREF."sales_orders SET type = !type WHERE order_no=$id";
-
-       db_query($sql, "Can't change sales order type");
+       sales_order_set_template($id, check_value('chgtpl'.$id));
        $Ajax->activate('orders_tbl');
 }
 
-$id = find_submit('_chgtpl');
-if ($id != -1)
-       change_tpl_flag($id);
-
 if (isset($_POST['Update']) && isset($_POST['last'])) {
        foreach($_POST['last'] as $id => $value)
                if ($value != check_value('chgtpl'.$id))
-                       change_tpl_flag($id);
+                       sales_order_set_template($id, !check_value('chgtpl'.$id));
 }
 
 $show_dates = !in_array($_POST['order_view_mode'], array('OutstandingOnly', 'InvoiceTemplates', 'DeliveryTemplates'));
@@ -261,6 +251,7 @@ if($show_dates) {
        start_row();
 }
 stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true, true);
+
 if (!@$_GET['popup'])
        customer_list_cells(_("Select a customer: "), 'customer_id', null, true, true);
 if ($trans_type == ST_SALESQUOTE)