X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_trans_db.inc;h=eb6a3a1f16ebf3a85319a63034ec22afd6592e6d;hb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;hp=a2265bb91d01672426961cd7c9d751eeba01eb72;hpb=702a71dbe463765b5fd1892a982ede3e5f264dee;p=fa-stable.git diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc index a2265bb9..eb6a3a1f 100644 --- a/purchasing/includes/db/supp_trans_db.inc +++ b/purchasing/includes/db/supp_trans_db.inc @@ -10,17 +10,21 @@ See the License here . ***********************************************************************/ //------------------------------------------------------------------------------------------------------------- - -function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $supp_reference, - $amount, $amount_tax, $discount, $err_msg="", $rate=0) +// +// FIXME - this should be revised for transaction update case. +// +function write_supp_trans($type, $trans_no, $supplier_id, $date_, $due_date, $reference, $supp_reference, + $amount, $amount_tax, $discount, $err_msg="", $rate=0, $included=0, $tax_algorithm = null) { + $new = $trans_no==0; $date = date2sql($date_); if ($due_date == "") $due_date = "0000-00-00"; else $due_date = date2sql($due_date); - $trans_no = get_next_trans_no($type); + if ($new) + $trans_no = get_next_trans_no($type); $curr = get_supplier_currency($supplier_id); @@ -29,11 +33,12 @@ function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $sup $sql = "INSERT INTO ".TB_PREF."supp_trans (trans_no, type, supplier_id, tran_date, due_date, - reference, supp_reference, ov_amount, ov_gst, rate, ov_discount) "; + reference, supp_reference, ov_amount, ov_gst, rate, ov_discount, tax_included, tax_algorithm) "; $sql .= "VALUES (".db_escape($trans_no).", ".db_escape($type) .", ".db_escape($supplier_id).", '$date', '$due_date', ".db_escape($reference).", ".db_escape($supp_reference).", ".db_escape($amount) - .", ".db_escape($amount_tax).", ".db_escape($rate).", ".db_escape($discount).")"; + .", ".db_escape($amount_tax).", ".db_escape($rate).", ".db_escape($discount).", ".db_escape($included). + ", ".db_escape($tax_algorithm, true).")"; if ($err_msg == "") $err_msg = "Cannot insert a supplier transaction record"; @@ -46,41 +51,6 @@ function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $sup //------------------------------------------------------------------------------------------------------------- -function reinsert_supp_trans($type, $trans_no, $supplier_id, $date_, $due_date, $reference, $supp_reference, - $amount, $amount_tax, $discount, $err_msg="", $rate=0) -{ - if ($trans_no == '') - display_db_error('Invalid call to function reinsert_supp_trans'); - - $date = date2sql($date_); - if ($due_date == "") - $due_date = "0000-00-00"; - else - $due_date = date2sql($due_date); - - $curr = get_supplier_currency($supplier_id); - - if ($rate == 0) - $rate = get_exchange_rate_from_home_currency($curr, $date_); - - - $sql = "INSERT INTO ".TB_PREF."supp_trans (trans_no, type, supplier_id, tran_date, due_date, - reference, supp_reference, ov_amount, ov_gst, rate, ov_discount) "; - $sql .= "VALUES (".db_escape($trans_no).", ".db_escape($type) - .", ".db_escape($supplier_id).", '$date', '$due_date', - ".db_escape($reference).", ".db_escape($supp_reference).", ".db_escape($amount) - .", ".db_escape($amount_tax).", ".db_escape($rate).", ".db_escape($discount).")"; - - if ($err_msg == "") - $err_msg = "Cannot insert a supplier transaction record"; - - db_query($sql, $err_msg); - add_audit_trail($type, $trans_no, $date_); - - return $trans_no; -} -//------------------------------------------------------------------------------------------------------------- - function get_supp_trans($trans_no, $trans_type=-1) { $sql = "SELECT ".TB_PREF."supp_trans.*, (".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst+".TB_PREF."supp_trans.ov_discount) AS Total, @@ -184,7 +154,7 @@ function post_void_supp_trans($type, $type_no) return true; } - if ($type == SUPPRECEIVE) + if ($type == ST_SUPPRECEIVE) { return void_grn($type_no); } @@ -194,10 +164,10 @@ function post_void_supp_trans($type, $type_no) //---------------------------------------------------------------------------------------- -function get_sql_for_supplier_inquiry() +function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_id=ALL_TEXT) { - $date_after = date2sql($_POST['TransAfterDate']); - $date_to = date2sql($_POST['TransToDate']); + $date_after = date2sql($after_date); + $date_to = date2sql($to_date); $sql = "SELECT trans.type, trans.trans_no, @@ -210,34 +180,62 @@ function get_sql_for_supplier_inquiry() (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, - (ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount - trans.alloc) <= 0.005) AS Settled + (ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc <= ".FLOAT_COMP_DELTA.") AS Settled 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' AND trans.ov_amount != 0"; // exclude voided transactions - if ($_POST['supplier_id'] != ALL_TEXT) - $sql .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']); - if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT) + + $sql2 = "SELECT ".ST_SUPPRECEIVE." as type, + trans.id as trans_no, + trans.reference, + supplier.supp_name, + '' as supp_reference, + delivery_date as tran_date, + '' as due_date, + supplier.curr_code, + '' AS TotalAmount, + '' AS Allocated, + 0 as OverDue, + 1 as Settled + FROM ".TB_PREF."grn_batch as trans, ".TB_PREF."suppliers as supplier + WHERE supplier.supplier_id = trans.supplier_id + AND trans.delivery_date >= '$date_after' + AND trans.delivery_date <= '$date_to'"; + + if ($supplier_id != ALL_TEXT) { + $sql .= " AND trans.supplier_id = ".db_escape($supplier_id); + $sql2 .= " AND trans.supplier_id = ".db_escape($supplier_id); + } + if (($filter == '6')) + { + $sql = $sql2; + } + elseif (!isset($filter) || $filter == ALL_TEXT || $filter == '6') { + $sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr"; + } + + if (isset($filter) && $filter != ALL_TEXT) { - if (($_POST['filterType'] == '1')) + if (($filter == '1')) { $sql .= " AND (trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_BANKDEPOSIT.")"; } - elseif (($_POST['filterType'] == '2')) + elseif (($filter == '2')) { $sql .= " AND trans.type = ".ST_SUPPINVOICE." "; } - elseif ($_POST['filterType'] == '3') + elseif ($filter == '3') { $sql .= " AND (trans.type = ".ST_SUPPAYMENT." OR trans.type = ".ST_BANKPAYMENT.") "; } - elseif (($_POST['filterType'] == '4') || ($_POST['filterType'] == '5')) + elseif (($filter == '4') || ($filter == '5')) { $sql .= " AND trans.type = ".ST_SUPPCREDIT." "; } - if (($_POST['filterType'] == '2') || ($_POST['filterType'] == '5')) + if (($filter == '2') || ($filter == '5')) { $today = date2sql(Today()); $sql .= " AND trans.due_date < '$today' ";