Stable merged into unstable again (due to failure on binary file during previous...

[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 987a640db957073acbe105afc56b416e9f22740b..6091e42e9092901d9ba2b50ffd990be80c126281 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");
 
@@ -103,8 +103,8 @@ function get_alloc_supp_sql($extra_fields=null, $extra_conditions=null, $extra_t
        $sql = "SELECT
                trans.type,
                trans.trans_no,
-               trans.reference,
-               trans.tran_date,
+               IF(trans.supp_reference='',trans.reference,trans.supp_reference) as reference,
+               trans.tran_date,
                supplier.supp_name, 
                supplier.curr_code, 
                ov_amount+ov_gst+ov_discount AS Total,
@@ -112,11 +112,7 @@ function get_alloc_supp_sql($extra_fields=null, $extra_conditions=null, $extra_t
                trans.due_date,
                trans.supplier_id,
                supplier.address";
-/*     $sql = "SELECT trans.*,
-               ov_amount+ov_gst+ov_discount AS Total,
-               supplier.supp_name, supplier.address,
-               supplier.curr_code ";
-*/
+
        if ($extra_fields)
                $sql .= ", $extra_fields ";
 
@@ -170,11 +166,89 @@ function get_allocatable_to_supp_transactions($supplier_id, $trans_no=null, $typ
        {
                $sql = get_alloc_supp_sql(null, "round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) > 0
                        AND trans.type != ".ST_SUPPAYMENT."
-                       AND trans.supplier_id=$supplier_id");
+                       AND trans.supplier_id=".db_escape($supplier_id));
+       }
+
+       return db_query($sql." ORDER BY due_date", "Cannot retreive alloc to transactions");
+}
+
+//-------------------------------------------------------------------------------------------------------------
+
+function get_allocatable_from_supp_transactions($supplier_id, $trans_no=null, $type=null)
+{
+       if ($trans_no != null && $type!= null)
+       {
+               $sql = get_alloc_supp_sql("amt, supp_reference", "trans.trans_no = alloc.trans_no_from
+                       AND trans.type = alloc.trans_type_from
+                       AND alloc.trans_no_to=".db_escape($trans_no)."
+                       AND alloc.trans_type_to=".db_escape($type)."
+                       AND trans.supplier_id=".db_escape($supplier_id),
+                       TB_PREF."supp_allocations as alloc");
+       }
+       else
+       {
+               $sql = get_alloc_supp_sql(null, "round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) > 0
+                       AND trans.type != ".ST_SUPPAYMENT."
+                       AND trans.supplier_id=".db_escape($supplier_id));
        }
 
-       return db_query($sql." ORDER BY trans_no", "Cannot retreive alloc to transactions");
+       return db_query($sql." ORDER BY due_date", "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,
+               trans.supplier_id
+       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