Fixed include file issue in sales order entry.

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

diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index 298d1b07793e1b6dd105cdb5276eb75cf88da8b9..a1e0e55249f9a216052e206d1426552930705a0f 100644 (file)
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_inquiry.php
@@ -20,7 +20,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 $js = "";
 if ($use_popup_windows)
        $js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 page(_($help_context = "Customer Allocation Inquiry"), false, false, "", $js);
 
@@ -95,7 +95,7 @@ function alloc_link($row)
        $link = 
        pager_link(_("Allocation"),
                "/sales/allocations/customer_allocate.php?trans_no=" . $row["trans_no"] 
-               ."&trans_type=" . $row["type"], ICON_MONEY);
+               ."&trans_type=" . $row["type"]."&debtor_no=" . $row["debtor_no"], ICON_ALLOC);
 
        if ($row["type"] == ST_CUSTCREDIT && $row['TotalAmount'] > 0)
        {
@@ -103,12 +103,12 @@ function alloc_link($row)
                return $link;
        }
        elseif (($row["type"] == ST_CUSTPAYMENT || $row["type"] == ST_BANKDEPOSIT) &&
-               (floatcmp($row['TotalAmount'], $row['Allocated']) > 0))
+               (floatcmp($row['TotalAmount'], $row['Allocated']) >= 0))
        {
                /*its a receipt  which could have an allocation*/
                return $link;
        }
-       elseif ($row["type"] == ST_CUSTPAYMENT && $row['TotalAmount'] < 0)
+       elseif ($row["type"] == ST_CUSTPAYMENT && $row['TotalAmount'] <= 0)
        {
                /*its a negative receipt */
                return '';
@@ -136,7 +136,8 @@ function fmt_credit($row)
 }
 //------------------------------------------------------------------------------------------------
 
-$sql = get_sql_for_customer_allocation_inquiry();
+$sql = get_sql_for_customer_allocation_inquiry(get_post('TransAfterDate'), get_post('TransToDate'),
+               get_post('customer_id'), get_post('filterType'), check_value('showSettled'));
 
 //------------------------------------------------------------------------------------------------
 $cols = array(