// 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)
+ $amount, $amount_tax, $discount, $err_msg="", $rate=0, $included=0)
{
$new = $trans_no==0;
$date = date2sql($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, tax_included, tax_algorithm) ";
+ reference, supp_reference, ov_amount, ov_gst, rate, ov_discount, tax_included) ";
$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($included).
- ", ".db_escape($tax_algorithm, true).")";
+ .", ".db_escape($amount_tax).", ".db_escape($rate).", ".db_escape($discount).", ".db_escape($included).")";
if ($err_msg == "")
$err_msg = "Cannot insert a supplier transaction record";
//-------------------------------------------------------------------------------------------------------------
-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 ";
+ ".TB_PREF."suppliers.supp_name AS supplier_name, ".TB_PREF."suppliers.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_accounts.account_type AS BankTransType, ".TB_PREF."bank_trans.amount AS bank_amount,
".TB_PREF."bank_trans.ref ";
}
$sql .= " FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers ";
- 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 .= " WHERE ".TB_PREF."supp_trans.trans_no=".db_escape($trans_no)."
AND ".TB_PREF."supp_trans.supplier_id=".TB_PREF."suppliers.supplier_id";
- if ($trans_type > 0)
+ if (isset($supplier_id))
+ $sql .= " AND ".TB_PREF."supp_trans.supplier_id=".db_escape($supplier_id);
+
+ if ($trans_type > -1)
$sql .= " AND ".TB_PREF."supp_trans.type=".db_escape($trans_type);
- 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 .= " AND ".TB_PREF."bank_trans.trans_no =".db_escape($trans_no)."
display_db_error("duplicate supplier transactions found for given params", $sql, true);
exit;
}
-
return db_fetch($result);
}
+
//----------------------------------------------------------------------------------------
function exists_supp_trans($type, $type_no)
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,
'' 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.purch_order_no = po.order_no
AND trans.delivery_date >= '$date_after'
AND trans.delivery_date <= '$date_to'";
$sql = $sql2;
}
elseif (!isset($filter) || $filter == ALL_TEXT || $filter == '6') {
- $sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr";
+ $sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr WHERE 1";
}
if (isset($filter) && $filter != ALL_TEXT)
}
return $sql;
}
-?>
\ No newline at end of file