New files from unstable branch

[fa-stable.git] / purchasing / includes / db / suppalloc_db.inc

diff --git a/purchasing/includes/db/suppalloc_db.inc b/purchasing/includes/db/suppalloc_db.inc
index 9fbe6fa1b932828759b40c25613bd5c2c1bdd0a7..f9eed1a86c0a9caf6decb11fc4d9c8dd4f1e1429 100644 (file)
--- a/purchasing/includes/db/suppalloc_db.inc
+++ b/purchasing/includes/db/suppalloc_db.inc
@@ -69,7 +69,7 @@ function clear_supp_alloctions($type, $type_no, $date="")
 {
        // clear any allocations for this transaction
        $sql = "SELECT * FROM ".TB_PREF."supp_allocations
-               WHERE (trans_type_from=$type AND trans_no_from=$type_no)
+               WHERE (trans_type_from=".db_escape($type)." AND trans_no_from=".db_escape($type_no).")
                OR (trans_type_to=".db_escape($type)." AND trans_no_to=".db_escape($type_no).")";
        $result = db_query($sql, "could not void supp transactions for type=$type and trans_no=$type_no");
 
@@ -176,5 +176,58 @@ function get_allocatable_to_supp_transactions($supplier_id, $trans_no=null, $typ
        return db_query($sql." ORDER BY trans_no", "Cannot retreive alloc to transactions");
 }
 
+function get_sql_for_supplier_allocation_inquiry()
+{
+       $date_after = date2sql($_POST['TransAfterDate']);
+       $date_to = date2sql($_POST['TransToDate']);
 
+    $sql = "SELECT 
+               trans.type, 
+               trans.trans_no,
+               trans.reference, 
+               supplier.supp_name, 
+               trans.supp_reference,
+       trans.tran_date, 
+               trans.due_date,
+               supplier.curr_code, 
+       (trans.ov_amount + trans.ov_gst  + trans.ov_discount) AS TotalAmount, 
+               trans.alloc AS Allocated,
+               ((trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_SUPPCREDIT.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
+       FROM "
+                       .TB_PREF."supp_trans as trans, "
+                       .TB_PREF."suppliers as supplier
+       WHERE supplier.supplier_id = trans.supplier_id
+       AND trans.tran_date >= '$date_after'
+       AND trans.tran_date <= '$date_to'";
+
+       if ($_POST['supplier_id'] != ALL_TEXT)
+               $sql .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']);
+       if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
+       {
+               if (($_POST['filterType'] == '1') || ($_POST['filterType'] == '2'))
+               {
+                       $sql .= " AND trans.type = ".ST_SUPPINVOICE." ";
+               }
+               elseif ($_POST['filterType'] == '3')
+               {
+                       $sql .= " AND trans.type = ".ST_SUPPAYMENT." ";
+               }
+               elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5'))
+               {
+                       $sql .= " AND trans.type = ".ST_SUPPCREDIT." ";
+               }
+
+               if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5'))
+               {
+                       $today =  date2sql(Today());
+                       $sql .= " AND trans.due_date < '$today' ";
+               }
+       }
+
+       if (!check_value('showSettled'))
+       {
+               $sql .= " AND (round(abs(ov_amount + ov_gst + ov_discount) - alloc,6) != 0) ";
+       }
+       return $sql;
+}
 ?>
\ No newline at end of file