X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_trans_db.inc;h=52071cc601cd55d32d716803e16c73cd39d2e8d2;hb=80dd97a37f674cc3691fa04af4c29607067566b2;hp=b38e787ab03eea1683779edddc0d88cf1ff3cdc6;hpb=5928cc0bb4164cfd1dfc77f279f6b12d7806294f;p=fa-stable.git diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc index b38e787a..52071cc6 100644 --- a/purchasing/includes/db/supp_trans_db.inc +++ b/purchasing/includes/db/supp_trans_db.inc @@ -1,113 +1,101 @@ . +***********************************************************************/ //------------------------------------------------------------------------------------------------------------- -function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $supp_reference, - $amount, $amount_tax, $discount, $err_msg="") +function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $supp_reference, + $amount, $amount_tax, $discount, $err_msg="", $rate=0) { $date = date2sql($date_); - $due_date = date2sql($due_date); - - $trans_no = get_next_trans_no($type); + if ($due_date == "") + $due_date = "0000-00-00"; + else + $due_date = date2sql($due_date); + + $trans_no = get_next_trans_no($type); $curr = get_supplier_currency($supplier_id); - $rate = get_exchange_rate_from_home_currency($curr, $date_); + + 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, + $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)"; - + if ($err_msg == "") $err_msg = "Cannot insert a supplier transaction record"; - - db_query($sql, $err_msg); - return $trans_no; + 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, + $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 "; - - if ($trans_type == 22) + + if ($trans_type == 22) { // 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_trans_types.name AS BankTransType, ".TB_PREF."bank_trans.amount AS BankAmount, - ".TB_PREF."bank_trans.ref "; - } - - $sql .= " FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers "; + $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 "; + } - if ($trans_type == 22) + $sql .= " FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers "; + + if ($trans_type == 22) { // it's a payment so also get the bank account - $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts, ".TB_PREF."bank_trans_types "; - } - - $sql .= " WHERE ".TB_PREF."supp_trans.trans_no=$trans_no + $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts"; + } + + $sql .= " WHERE ".TB_PREF."supp_trans.trans_no=$trans_no AND ".TB_PREF."supp_trans.supplier_id=".TB_PREF."suppliers.supplier_id"; - + if ($trans_type > 0) - $sql .= " AND ".TB_PREF."supp_trans.type=$trans_type "; - - if ($trans_type == 22) + $sql .= " AND ".TB_PREF."supp_trans.type=$trans_type "; + + if ($trans_type == 22) { // 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_trans_types.id = ".TB_PREF."bank_trans.bank_trans_type_id - AND ".TB_PREF."bank_accounts.account_code=".TB_PREF."bank_trans.bank_act "; - } - + AND ".TB_PREF."bank_trans.type=$trans_type + AND ".TB_PREF."bank_accounts.id=".TB_PREF."bank_trans.bank_act "; + } + $result = db_query($sql, "Cannot retreive a supplier transaction"); - - if (db_num_rows($result) == 0) + + if (db_num_rows($result) == 0) { // can't return nothing display_db_error("no supplier trans found for given params", $sql, true); exit; } - - if (db_num_rows($result) > 1) + + if (db_num_rows($result) > 1) { // can't return multiple display_db_error("duplicate supplier transactions found for given params", $sql, true); exit; - } - - return db_fetch($result); -} - -//---------------------------------------------------------------------------------------- + } -function get_supplier_transactions($extra_fields=null, $extra_conditions=null, $extra_tables=null) -{ - $sql = "SELECT ".TB_PREF."supp_trans.*, - ov_amount+ov_gst+ov_discount AS Total, - ".TB_PREF."suppliers.supp_name, ".TB_PREF."suppliers.address, - ".TB_PREF."suppliers.curr_code "; - - if ($extra_fields) - $sql .= ", $extra_fields "; - - $sql .= " FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers "; - if ($extra_tables) - $sql .= " ,$extra_tables "; - - $sql .= " WHERE ".TB_PREF."supp_trans.supplier_id=".TB_PREF."suppliers.supplier_id"; - - if ($extra_conditions) - $sql .= " AND $extra_conditions "; - - $sql .= " ORDER BY trans_no"; - - return db_query($sql, "Cannot retreive supplier transactions"); + return db_fetch($result); } //---------------------------------------------------------------------------------------- @@ -116,21 +104,21 @@ function exists_supp_trans($type, $type_no) { if ($type == 25) return exists_grn($type_no); - + $sql = "SELECT trans_no FROM ".TB_PREF."supp_trans WHERE type=$type AND trans_no=$type_no"; - $result = db_query($sql, "Cannot retreive a supplier transaction"); - - return (db_num_rows($result) > 0); + $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, + $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"; - + db_query($sql, "could not void supp transactions for type=$type and trans_no=$type_no"); } @@ -138,24 +126,24 @@ function void_supp_trans($type, $type_no) function post_void_supp_trans($type, $type_no) { - if ($type == 22) + if ($type == 22) { void_supp_payment($type, $type_no); return true; } - - if ($type == 20 || $type == 21) + + if ($type == 20 || $type == 21) { void_supp_invoice($type, $type_no); - return true; + return true; } - - if ($type == 25) + + if ($type == 25) { return void_grn($type_no); - } - - return false; + } + + return false; } //----------------------------------------------------------------------------------------