Fixes in sales reports to use debtor_trans.tax_included field instead of trans_tax_de...

[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 badd4b1899b3137f67c43eb4fd63a8fd60ba0e55..45815855d05b5c4471fd73730b2e8d0f271e8519 100644 (file)
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_inquiry.php
@@ -22,7 +22,7 @@ if ($use_popup_windows)
        $js .= get_js_open_window(900, 500);
 if ($use_date_picker)
        $js .= get_js_date_picker();
-page(_("Customer Allocation Inquiry"), false, false, "", $js);
+page(_($help_context = "Customer Allocation Inquiry"), false, false, "", $js);
 
 if (isset($_GET['customer_id']))
 {
@@ -36,12 +36,12 @@ if (!isset($_POST['customer_id']))
 
 start_form();
 
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
 start_row();
 
 customer_list_cells(_("Select a customer: "), 'customer_id', $_POST['customer_id'], true);
 
-date_cells(_("from:"), 'TransAfterDate', '', null, -30);
+date_cells(_("from:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
 date_cells(_("to:"), 'TransToDate', '', null, 1);
 
 cust_allocations_list_cells(_("Type:"), 'filterType', null);
@@ -112,7 +112,10 @@ function alloc_link($row)
        {
                /*its a negative receipt */
                return '';
-       }
+       } elseif ($row["type"] == ST_SALESINVOICE && ($row['TotalAmount'] - $row['Allocated']) > 0)
+               return pager_link(_("Payment"),
+                       "/sales/customer_payments.php?customer_id=".$row["debtor_no"]."&SInvoice=" . $row["trans_no"], ICON_MONEY);
+
 }
 
 function fmt_debit($row)
@@ -133,70 +136,8 @@ function fmt_credit($row)
 }
 //------------------------------------------------------------------------------------------------
 
-  $data_after = date2sql($_POST['TransAfterDate']);
-  $date_to = date2sql($_POST['TransToDate']);
-
-  $sql = "SELECT 
-               trans.type,
-               trans.order_,
-               trans.trans_no,
-               trans.reference,
-               trans.tran_date,
-               trans.due_date,
-               debtor.name,
-               debtor.curr_code,
-       (trans.ov_amount + trans.ov_gst + trans.ov_freight 
-                       + trans.ov_freight_tax + trans.ov_discount)     AS TotalAmount,
-               trans.alloc AS Allocated,
-               ((trans.type = ".ST_SALESINVOICE.")
-                       AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
-       FROM "
-                       .TB_PREF."debtor_trans as trans, "
-                       .TB_PREF."debtors_master as debtor
-       WHERE debtor.debtor_no = trans.debtor_no
-                       AND (trans.ov_amount + trans.ov_gst + trans.ov_freight 
-                               + trans.ov_freight_tax + trans.ov_discount != 0)
-               AND trans.tran_date >= '$data_after'
-               AND trans.tran_date <= '$date_to'";
-
-       if ($_POST['customer_id'] != ALL_TEXT)
-               $sql .= " AND trans.debtor_no = ".db_escape($_POST['customer_id']);
-
-       if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
-       {
-               if ($_POST['filterType'] == '1' || $_POST['filterType'] == '2')
-               {
-                       $sql .= " AND trans.type = ".ST_SALESINVOICE." ";
-               }
-               elseif ($_POST['filterType'] == '3')
-               {
-                       $sql .= " AND trans.type = " . ST_CUSTPAYMENT;
-               }
-               elseif ($_POST['filterType'] == '4')
-               {
-                       $sql .= " AND trans.type = ".ST_CUSTCREDIT." ";
-               }
-
-       if ($_POST['filterType'] == '2')
-       {
-               $today =  date2sql(Today());
-               $sql .= " AND trans.due_date < '$today'
-                               AND (round(abs(trans.ov_amount + "
-                               ."trans.ov_gst + trans.ov_freight + "
-                               ."trans.ov_freight_tax + trans.ov_discount) - trans.alloc,6) > 0) ";
-       }
-       }else
-       {
-           $sql .= " AND trans.type <> ".ST_CUSTDELIVERY." ";
-       }
-
-
-       if (!check_value('showSettled'))
-       {
-               $sql .= " AND (round(abs(trans.ov_amount + trans.ov_gst + "
-               ."trans.ov_freight + trans.ov_freight_tax + "
-               ."trans.ov_discount) - trans.alloc,6) != 0) ";
-       }
+$sql = get_sql_for_customer_allocation_inquiry();
+
 //------------------------------------------------------------------------------------------------
 
 $cols = array(