X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsuppalloc_db.inc;h=cf996d602d0e72db63625d953053293cf3c60c11;hb=0dfa3ce0411c9d123d25d6a0079668e551a88b14;hp=b31adc52e0c28755ec3909a03eaf7c5bfe9b9d85;hpb=ddadb47f2620ce6902ad4694ce6512568862ba05;p=fa-stable.git diff --git a/purchasing/includes/db/suppalloc_db.inc b/purchasing/includes/db/suppalloc_db.inc index b31adc52..cf996d60 100644 --- a/purchasing/includes/db/suppalloc_db.inc +++ b/purchasing/includes/db/suppalloc_db.inc @@ -12,13 +12,15 @@ //---------------------------------------------------------------------------------------- function add_supp_allocation($amount, $trans_type_from, $trans_no_from, - $trans_type_to, $trans_no_to, $date_) + $trans_type_to, $trans_no_to, $person_id, $date_) { $date = date2sql($date_); $sql = "INSERT INTO ".TB_PREF."supp_allocations ( amt, date_alloc, - trans_type_from, trans_no_from, trans_no_to, trans_type_to) - VALUES ($amount, '$date', $trans_type_from, $trans_no_from, $trans_no_to, $trans_type_to)"; + trans_type_from, trans_no_from, trans_no_to, trans_type_to, person_id) + VALUES (".db_escape($amount).", '$date', " + .db_escape($trans_type_from).", ".db_escape($trans_no_from).", " + .db_escape($trans_no_to).", ".db_escape($trans_type_to).", ".db_escape($person_id).")"; db_query($sql, "A supplier allocation could not be added to the database"); } @@ -28,7 +30,7 @@ function add_supp_allocation($amount, $trans_type_from, $trans_no_from, function delete_supp_allocation($trans_id) { - $sql = "DELETE FROM ".TB_PREF."supp_allocations WHERE id = " . $trans_id; + $sql = "DELETE FROM ".TB_PREF."supp_allocations WHERE id = ".db_escape($trans_id); db_query($sql, "The existing allocation $trans_id could not be deleted"); } @@ -37,19 +39,29 @@ function delete_supp_allocation($trans_id) function get_supp_trans_allocation_balance($trans_type, $trans_no) { $sql = "SELECT (ov_amount+ov_gst-ov_discount-alloc) AS BalToAllocate - FROM ".TB_PREF."supp_trans WHERE trans_no=$trans_no AND type=$trans_type"; + FROM ".TB_PREF."supp_trans WHERE trans_no=" + .db_escape($trans_no)." AND type=".db_escape($trans_type); $result = db_query($sql,"calculate the allocation"); $myrow = db_fetch_row($result); - return $myrow[0]; + return $myrow ? $myrow[0] : 0; } //---------------------------------------------------------------------------------------- - -function update_supp_trans_allocation($trans_type, $trans_no, $alloc) +// Update supplier trans alloc field according to current status of supp_allocations +// +function update_supp_trans_allocation($trans_type, $trans_no, $person_id) { - $sql = "UPDATE ".TB_PREF."supp_trans SET alloc = alloc + $alloc - WHERE type=$trans_type AND trans_no = $trans_no"; + $sql = "UPDATE `".TB_PREF.($trans_type==ST_PURCHORDER ? 'purch_orders' : 'supp_trans')."` trans, + (SELECT person_id, sum(amt) amt from ".TB_PREF."supp_allocations + WHERE person_id=".db_escape($person_id)." AND ((trans_type_to=".db_escape($trans_type)." AND trans_no_to=".db_escape($trans_no).") + OR (trans_type_from=".db_escape($trans_type)." AND trans_no_from=".db_escape($trans_no)."))) allocated + SET + trans.alloc=IFNULL(allocated.amt, 0) + WHERE trans.supplier_id=person_id AND " . ($trans_type==ST_PURCHORDER ? + "trans.order_no=".db_escape($trans_no) + : "trans.type=".db_escape($trans_type)." AND trans.trans_no=".db_escape($trans_no)); + db_query($sql, "The supp transaction record could not be modified for the allocation against it"); } @@ -57,121 +69,250 @@ function update_supp_trans_allocation($trans_type, $trans_no, $alloc) function void_supp_allocations($type, $type_no, $date="") { - return clear_supp_alloctions($type, $type_no, $date); + return clear_supp_alloctions($type, $type_no, null, $date); } //------------------------------------------------------------------------------------------------------------- -function clear_supp_alloctions($type, $type_no, $date="") +function clear_supp_alloctions($type, $type_no, $person_id=null, $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) - OR (trans_type_to=$type AND trans_no_to=$type_no)"; - $result = db_query($sql, "could not void supp transactions for type=$type and trans_no=$type_no"); - - while ($row = db_fetch($result)) - { - $sql = "UPDATE ".TB_PREF."supp_trans SET alloc=alloc - " . $row['amt'] . " - WHERE (type= " . $row['trans_type_from'] . " AND trans_no=" . $row['trans_no_from'] . ") - OR (type=" . $row['trans_type_to'] . " AND trans_no=" . $row['trans_no_to'] . ")"; - //$sql = "UPDATE ".TB_PREF."supp_trans SET alloc=alloc - " . $row['amt'] . " - // WHERE type=" . $row['trans_type_to'] . " AND trans_no=" . $row['trans_no_to']; - db_query($sql, "could not clear allocation"); - // 2008-09-20 Joe Hunt - if ($date != "") - exchange_variation($type, $type_no, $row['trans_type_to'], $row['trans_no_to'], $date, - $row['amt'], PT_SUPPLIER, true); - ////////////////////// - } - + $sql = "UPDATE ".TB_PREF."supp_allocations ca + LEFT JOIN ".TB_PREF."supp_trans paym ON ca.trans_type_from=paym.type AND ca.trans_no_from=paym.trans_no AND ca.person_id=paym.supplier_id + LEFT JOIN ".TB_PREF."supp_trans st ON ca.trans_type_to=st.type AND ca.trans_no_to=st.trans_no AND ca.person_id=st.supplier_id + LEFT JOIN ".TB_PREF."purch_orders po ON ca.trans_type_to=".ST_PURCHORDER." AND ca.trans_no_to=po.order_no AND ca.person_id=po.supplier_id + SET paym.alloc=paym.alloc - ca.amt, + st.alloc=st.alloc - ca.amt, + po.alloc=po.alloc - ca.amt + WHERE ((ca.trans_type_from=".db_escape($type)." AND ca.trans_no_from=".db_escape($type_no).") + OR (ca.trans_type_to=".db_escape($type)." AND ca.trans_no_to=".db_escape($type_no)."))"; + if ($person_id) + $sql .= " AND ca.person_id=".db_escape($person_id); + db_query($sql, "could not clear allocation"); // remove any allocations for this transaction $sql = "DELETE FROM ".TB_PREF."supp_allocations - WHERE (trans_type_from=$type AND trans_no_from=$type_no) - OR (trans_type_to=$type AND trans_no_to=$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)."))"; + if ($person_id) + $sql .= " AND person_id=".db_escape($person_id); db_query($sql, "could not void supp transactions for type=$type and trans_no=$type_no"); } +//------------------------------------------------------------------------------------------------------------- -//---------------------------------------------------------------------------------------- -function get_alloc_supp_sql($extra_fields=null, $extra_conditions=null, $extra_tables=null) +function get_allocatable_from_supp_sql($supplier_id, $settled) { $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, trans.alloc, 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 "; + supplier.address, + round(abs(ov_amount+ov_gst+ov_discount)-alloc,6) <= 0 AS settled + FROM " + .TB_PREF."supp_trans as trans, " + .TB_PREF."suppliers as supplier" + ." WHERE trans.supplier_id=supplier.supplier_id + AND type IN(".ST_SUPPAYMENT.",".ST_SUPPCREDIT.",".ST_BANKPAYMENT.",".ST_JOURNAL.") AND (trans.ov_amount < 0)"; - $sql .= " FROM ".TB_PREF."supp_trans as trans, ".TB_PREF."suppliers as supplier"; - if ($extra_tables) - $sql .= " ,$extra_tables "; - - $sql .= " WHERE trans.supplier_id=supplier.supplier_id"; + if (!$settled) + $sql .= " AND (round(abs(ov_amount+ov_gst+ov_discount)-alloc,6) > 0)"; - if ($extra_conditions) - $sql .= " AND $extra_conditions "; + if ($supplier_id != null) + $sql .= " AND supplier.supplier_id = ".db_escape($supplier_id); return $sql; } +function get_allocatable_purch_orders($supplier_id = null, $trans_no=null, $type=null) +{ + $due_dates = "SELECT order_no, MIN(delivery_date) as date + FROM ".TB_PREF."purch_order_details det + GROUP BY det.order_no"; + $sql = "SELECT + ".ST_PURCHORDER." as type, + porder.order_no as trans_no, + porder.reference, + porder.ord_date, + supplier.supp_name AS DebtorName, + supplier.curr_code, + total as Total, + porder.alloc, + due_dates.date as due_date, + supplier.address, + amt, + requisition_no as supp_ref + FROM ".TB_PREF."purch_orders as porder + LEFT JOIN ".TB_PREF."suppliers as supplier ON porder.supplier_id = supplier.supplier_id + LEFT JOIN ".TB_PREF."supp_allocations as alloc + ON porder.order_no = alloc.trans_no_to AND alloc.trans_type_to=".ST_PURCHORDER." AND alloc.person_id=porder.supplier_id + LEFT JOIN ".TB_PREF."grn_batch as grn ON porder.order_no = grn.purch_order_no + LEFT JOIN ($due_dates) due_dates ON due_dates.order_no=porder.order_no + WHERE total>0"; + + if ($trans_no != null and $type != null) + { + $sql .= " AND alloc.trans_no_from=".db_escape($trans_no)." + AND alloc.trans_type_from=".db_escape($type); + } + else + { + $sql .= " AND ISNULL(grn.purch_order_no)"; // only sales orders no yet received + } + if ($supplier_id) + $sql .= " AND porder.supplier_id=".db_escape($supplier_id); + + $sql .= " GROUP BY porder.order_no, grn.purch_order_no"; + + return $sql; +} //------------------------------------------------------------------------------------------------------------- -function get_allocatable_from_supp_sql($supplier_id, $settled) +function get_allocatable_to_supp_transactions($supplier_id=null, $trans_no=null, $type=null) { - $settled_sql = ""; - if (!$settled) + $sql = "SELECT + trans.type, + trans.trans_no, + 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, + trans.alloc, + trans.due_date, + trans.supplier_id, + amt, + supp_reference + + FROM ".TB_PREF."supp_trans as trans + LEFT JOIN ".TB_PREF."supp_allocations as alloc + ON trans.trans_no = alloc.trans_no_to AND trans.type = alloc.trans_type_to AND alloc.person_id=trans.supplier_id," + .TB_PREF."suppliers as supplier + WHERE + trans.supplier_id=supplier.supplier_id"; + if ($supplier_id) + $sql .= " AND supplier.supplier_id=".db_escape($supplier_id); + + if ($trans_no != null and $type != null) { - $settled_sql = "AND round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) > 0"; + $sql .= " AND alloc.trans_no_from=".db_escape($trans_no)." + AND alloc.trans_type_from=".db_escape($type); + } + else + { + $sql .= " AND round(ov_amount+ov_gst+ov_discount-alloc,6) > 0 + AND trans.type NOT IN (".implode(',',array(ST_SUPPAYMENT, ST_BANKPAYMENT)).")"; + $sql .= " GROUP BY type, trans_no"; } - $supp_sql = ""; - if ($supplier_id != null) - $supp_sql = " AND trans.supplier_id = $supplier_id"; - - $sql = get_alloc_supp_sql("round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) <= 0 AS settled", - "(type=".ST_SUPPAYMENT." OR type=".ST_SUPPCREDIT." OR type=".ST_BANKPAYMENT.") AND (ov_amount < 0) " . $settled_sql . $supp_sql); + $orders = get_allocatable_purch_orders($supplier_id, $trans_no, $type); + $sql = "($sql ORDER BY trans_no) \nUNION \n($orders)"; - return $sql; + return db_query($sql." ORDER BY due_date", "Cannot retreive alloc to transactions"); } //------------------------------------------------------------------------------------------------------------- -function get_allocatable_to_supp_transactions($supplier_id, $trans_no=null, $type=null) +function get_allocatable_from_supp_transactions($supplier_id, $trans_no=null, $type=null) { - if ($trans_no != null && $type!= null) + $sql = "SELECT + trans.type, + trans.trans_no, + 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, + trans.alloc, + trans.due_date, + trans.supplier_id, + supplier.address, + amt, + supp_reference + FROM ".TB_PREF."supp_trans as trans," + .TB_PREF."suppliers as supplier," + .TB_PREF."supp_allocations as alloc + WHERE trans.supplier_id=supplier.supplier_id + AND trans.trans_no = alloc.trans_no_from + AND trans.type = alloc.trans_type_from + AND trans.supplier_id = alloc.person_id"; + + if ($trans_no != null and $type != null) { - $sql = get_alloc_supp_sql("amt, supp_reference", "trans.trans_no = alloc.trans_no_to - AND trans.type = alloc.trans_type_to - AND alloc.trans_no_from=$trans_no - AND alloc.trans_type_from=$type - AND trans.supplier_id=$supplier_id", - "".TB_PREF."supp_allocations as alloc"); + $sql .= " AND alloc.trans_no_to=".db_escape($trans_no)." + AND alloc.trans_type_to=".db_escape($type); } 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=$supplier_id"); + $sql .= " AND round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) > 0 + AND trans.type NOT IN (".implode(',',array(ST_SUPPAYMENT,ST_BANKPAYMENT)).")"; + $sql .= " GROUP BY type, trans_no"; } - - 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']); -?> \ No newline at end of file + $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 + LEFT JOIN ".TB_PREF."voided as v + ON trans.trans_no=v.id AND trans.type=v.type," + .TB_PREF."suppliers as supplier + WHERE supplier.supplier_id = trans.supplier_id + AND trans.tran_date >= '$date_after' + AND trans.tran_date <= '$date_to' + AND ISNULL(v.date_)"; + + 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')) // invoices + { + $sql .= " AND trans.type = ".ST_SUPPINVOICE." "; + } + elseif ($_POST['filterType'] == '3') // payments + { + $sql .= " AND trans.type = ".ST_SUPPAYMENT." "; + } + elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5')) // credits + { + $sql .= " AND trans.type = ".ST_SUPPCREDIT." "; + } + + if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5')) // overdude + { + $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; +}