<?php
-
+/**********************************************************************
+ Copyright (C) FrontAccounting, LLC.
+ Released under the terms of the GNU General Public License, GPL,
+ as published by the Free Software Foundation, either version 3
+ of the License, or (at your option) any later version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
//-------------------------------------------------------------------------------------------------------------
-
-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)
{
+ $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);
$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 ($trans_no, $type, $supplier_id, '$date', '$due_date',
- ".db_escape($reference).", ".db_escape($supp_reference).", $amount, $amount_tax, $rate, $discount)";
+ 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).")";
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)
+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 == 22)
+ 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 == 22)
+ 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=$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 (isset($supplier_id))
+ $sql .= " AND trans.supplier_id=".db_escape($supplier_id);
- if ($trans_type > 0)
- $sql .= " AND ".TB_PREF."supp_trans.type=$trans_type ";
+ if ($trans_type > -1)
+ $sql .= " AND trans.type=".db_escape($trans_type);
- if ($trans_type == 22)
+ 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 =$trans_no
- AND ".TB_PREF."bank_trans.type=$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)
{
- if ($type == 25)
+ if ($type == ST_SUPPRECEIVE)
return exists_grn($type_no);
- $sql = "SELECT trans_no FROM ".TB_PREF."supp_trans WHERE type=$type
- AND trans_no=$type_no";
+ $sql = "SELECT trans_no FROM ".TB_PREF."supp_trans WHERE type=".db_escape($type)."
+ AND trans_no=".db_escape($type_no);
$result = db_query($sql, "Cannot retreive a supplier transaction");
return (db_num_rows($result) > 0);
function void_supp_trans($type, $type_no)
{
$sql = "UPDATE ".TB_PREF."supp_trans SET ov_amount=0, ov_discount=0, ov_gst=0,
- alloc=0 WHERE type=$type AND trans_no=$type_no";
+ alloc=0 WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
db_query($sql, "could not void supp transactions for type=$type and trans_no=$type_no");
}
//----------------------------------------------------------------------------------------
+function clear_supp_trans($type, $type_no)
+{
+ $sql = "DELETE FROM ".TB_PREF."supp_trans
+ WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
+
+ db_query($sql, "could not clear supp transactions for type=$type and trans_no=$type_no");
+}
+//----------------------------------------------------------------------------------------
+
function post_void_supp_trans($type, $type_no)
{
- if ($type == 22)
+ if ($type == ST_SUPPAYMENT)
{
void_supp_payment($type, $type_no);
return true;
}
- if ($type == 20 || $type == 21)
+ if ($type == ST_SUPPINVOICE || $type == ST_SUPPCREDIT)
{
void_supp_invoice($type, $type_no);
return true;
}
- if ($type == 25)
+ if ($type == ST_SUPPRECEIVE)
{
return void_grn($type_no);
}
//----------------------------------------------------------------------------------------
-?>
\ No newline at end of file
+function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_id=ALL_TEXT)
+{
+ $date_after = date2sql($after_date);
+ $date_to = date2sql($to_date);
+
+ $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,
+
+ 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 <= ".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.ov_amount != 0"; // exclude voided transactions
+
+ $sql2 = "SELECT ".ST_SUPPRECEIVE." as type,
+ trans.id as trans_no,
+ trans.reference,
+ supplier.supp_name,
+ 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, ".TB_PREF."purch_orders as po
+ WHERE supplier.supplier_id = trans.supplier_id
+ 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 ($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) {
+ $sql = "SELECT * FROM (($sql) UNION ($sql2)) as tr WHERE 1";
+ }
+
+ if (isset($filter) && $filter != ALL_TEXT)
+ {
+ if (($filter == '1'))
+ {
+ $sql .= " AND (trans.type = ".ST_SUPPINVOICE." OR trans.type = ".ST_BANKDEPOSIT.")";
+ }
+ elseif ($filter == '3')
+ {
+ $sql .= " AND (trans.type = ".ST_SUPPAYMENT." OR trans.type = ".ST_BANKPAYMENT.") ";
+ }
+ elseif (($filter == '4') || ($filter == '5'))
+ {
+ $sql .= " AND trans.type = ".ST_SUPPCREDIT." ";
+ }
+
+ if (($filter == '2') || ($filter == '5'))
+ {
+ $today = date2sql(Today());
+ $sql .= " AND trans.due_date < '$today' ";
+ }
+ }
+ return $sql;
+}
projects / fa-stable.git / blobdiff