//-------------------------------------------------------------------------------------------------------------
-function get_supp_trans($trans_no, $trans_type=-1)
+function get_supp_trans($trans_no, $trans_type=-1, $supplier_id=null)
{
- $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,
- ".TB_PREF."suppliers.supp_name AS supplier_name, ".TB_PREF."suppliers.curr_code AS SupplierCurrCode ";
+ $sql = "SELECT trans.*, (trans.ov_amount+trans.ov_gst+trans.ov_discount) AS Total,
+ supplier.supp_name AS supplier_name, supplier.curr_code AS curr_code ";
- if ($trans_type == ST_SUPPAYMENT)
+ if ($trans_type == ST_SUPPAYMENT || $trans_type == ST_BANKPAYMENT)
{
// it's a payment so also get the bank account
- $sql .= ", ".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name, ".TB_PREF."bank_accounts.bank_curr_code,
- ".TB_PREF."bank_accounts.account_type AS BankTransType, ".TB_PREF."bank_trans.amount AS BankAmount,
- ".TB_PREF."bank_trans.ref ";
+ $sql .= ", account.bank_name, account.bank_account_name, account.bank_curr_code,
+ account.account_type AS BankTransType, bank_trans.amount AS bank_amount,
+ bank_trans.ref ";
}
- $sql .= " FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers ";
+ $sql .= " FROM ".TB_PREF."supp_trans trans,"
+ .TB_PREF."suppliers supplier";
- if ($trans_type == ST_SUPPAYMENT)
+ if ($trans_type == ST_SUPPAYMENT || $trans_type == ST_BANKPAYMENT)
{
// it's a payment so also get the bank account
- $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts";
+ $sql .= ", "
+ .TB_PREF."bank_trans bank_trans,"
+ .TB_PREF."bank_accounts account";
}
- $sql .= " WHERE ".TB_PREF."supp_trans.trans_no=".db_escape($trans_no)."
- AND ".TB_PREF."supp_trans.supplier_id=".TB_PREF."suppliers.supplier_id";
+ $sql .= " WHERE trans.trans_no=".db_escape($trans_no)."
+ AND trans.supplier_id=supplier.supplier_id";
- if ($trans_type > 0)
- $sql .= " AND ".TB_PREF."supp_trans.type=".db_escape($trans_type);
+ if (isset($supplier_id))
+ $sql .= " AND trans.supplier_id=".db_escape($supplier_id);
- if ($trans_type == ST_SUPPAYMENT)
+ if ($trans_type > -1)
+ $sql .= " AND trans.type=".db_escape($trans_type);
+
+ if ($trans_type == ST_SUPPAYMENT || $trans_type == ST_BANKPAYMENT)
{
// it's a payment so also get the bank account
- $sql .= " AND ".TB_PREF."bank_trans.trans_no =".db_escape($trans_no)."
- AND ".TB_PREF."bank_trans.type=".db_escape($trans_type)."
- AND ".TB_PREF."bank_accounts.id=".TB_PREF."bank_trans.bank_act ";
+ $sql .= " AND bank_trans.trans_no =".db_escape($trans_no)."
+ AND bank_trans.type=".db_escape($trans_type)."
+ AND account.id=bank_trans.bank_act ";
}
$result = db_query($sql, "Cannot retreive a supplier transaction");
display_db_error("duplicate supplier transactions found for given params", $sql, true);
exit;
}
-
return db_fetch($result);
}
+
+//----------------------------------------------------------------------------------------
+
+function get_supp_payment_before($supplier_id, $date)
+{
+ $sql = "SELECT "
+ . TB_PREF . "supp_trans.trans_no,"
+ . TB_PREF . "supp_trans.type,"
+ . TB_PREF . "supp_trans.supplier_id,"
+ . TB_PREF . "supp_trans.tran_date,"
+ . TB_PREF . "supp_trans.ov_amount,"
+ . TB_PREF . "bank_trans.ref AS bank_ref,"
+ . TB_PREF . "bank_trans.amount AS bank_amount,"
+ . TB_PREF . "bank_accounts.id AS bank_id,"
+ . TB_PREF . "bank_accounts.bank_name,"
+ . TB_PREF . "bank_accounts.bank_account_name,"
+ . TB_PREF . "bank_accounts.bank_curr_code "
+ . "FROM "
+ . TB_PREF . "supp_trans,"
+ . TB_PREF . "bank_trans,"
+ . TB_PREF . "bank_accounts "
+ . "WHERE "
+ . TB_PREF . "supp_trans.supplier_id='" . $supplier_id . "' "
+ . "AND " . TB_PREF . "supp_trans.tran_date<'" . $date . "' "
+ . "AND " . TB_PREF . "supp_trans.type=" . ST_SUPPAYMENT . " "
+ . "AND " . TB_PREF . "supp_trans.trans_no=" . TB_PREF . "bank_trans.trans_no "
+ . "AND " . TB_PREF . "supp_trans.type=" . TB_PREF . "bank_trans.type "
+ . "AND " . TB_PREF . "bank_accounts.id=" . TB_PREF . "bank_trans.bank_act "
+ . "ORDER BY "
+ . TB_PREF . "supp_trans.tran_date DESC "
+ . "LIMIT 1 "
+ ;
+
+ $result = db_query($sql, "Cannot retreive a previous supplier payment");
+
+ if (db_num_rows($result) == 0)
+ {
+ return false;
+ }
+
+ return db_fetch($result);
+}
+
//----------------------------------------------------------------------------------------
function exists_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,
trans.tran_date,
trans.due_date,
supplier.curr_code,
- (trans.ov_amount + trans.ov_gst + trans.ov_discount) AS TotalAmount,
+ (trans.ov_amount + trans.ov_gst + trans.ov_discount) AS TotalAmount,
+
+ IF (trans.type=".ST_SUPPINVOICE." OR trans.type=".ST_BANKDEPOSIT."
+ OR (trans.type=".ST_JOURNAL." AND (trans.ov_amount + trans.ov_gst + trans.ov_discount)>0), 1, -1)*
+ (ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc) Balance,
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
$sql2 = "SELECT ".ST_SUPPRECEIVE." as type,
trans.id as trans_no,
trans.reference,
supplier.supp_name,
- '' as supp_reference,
+ po.requisition_no AS supp_reference,
delivery_date as tran_date,
'' as due_date,
supplier.curr_code,
+ 0 as Balance,
'' AS TotalAmount,
'' AS Allocated,
0 as OverDue,
1 as Settled
- FROM ".TB_PREF."grn_batch as trans, ".TB_PREF."suppliers as supplier
+ FROM ".TB_PREF."grn_batch as trans, ".TB_PREF."suppliers as supplier, ".TB_PREF."purch_orders as po
WHERE supplier.supplier_id = trans.supplier_id
- AND trans.delivery_date >= '$date_after'
- AND trans.delivery_date <= '$date_to'";
+ AND trans.purch_order_no = po.order_no";
+
+ if ($filter == '2')
+ $sql .= " AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_discount) - trans.alloc>".FLOAT_COMP_DELTA;
+ else {
+ $sql .= " AND trans.tran_date >= '$date_after'
+ AND trans.tran_date <= '$date_to'";
+ $sql2 .= " AND trans.delivery_date >= '$date_after'
+ AND trans.delivery_date <= '$date_to'";
+ }
- if ($_POST['supplier_id'] != ALL_TEXT) {
- $sql .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']);
- $sql2 .= " AND trans.supplier_id = ".db_escape($_POST['supplier_id']);
+ if ($supplier_id != ALL_TEXT) {
+ $sql .= " AND trans.supplier_id = ".db_escape($supplier_id);
+ $sql2 .= " AND trans.supplier_id = ".db_escape($supplier_id);
}
- if (($_POST['filterType'] == '6'))
+ if (($filter == '6'))
{
$sql = $sql2;
}
- elseif (!isset($_POST['filterType']) || $_POST['filterType'] == ALL_TEXT || $_POST['filterType'] == '6') {
- $sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr";
+ elseif (!isset($filter) || $filter == ALL_TEXT) {
+ $sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr WHERE 1";
}
- if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
+ 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'))
- {
- $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' ";
}
return $sql;
}
-?>
\ No newline at end of file
projects / fa-stable.git / blobdiff