X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_bank_trans.inc;h=f11a56987358dead57b1803f65fb1fa8ff4bea71;hb=b9fc3611d1d90d06499ea0d77ef21f1a2835f14b;hp=ad369861053d2dc6c47c4f2b62d2cadfe7db7ee7;hpb=54d84ff9a67620ab38c676cdbcf87853632724f0;p=fa-stable.git

diff --git a/gl/includes/db/gl_db_bank_trans.inc b/gl/includes/db/gl_db_bank_trans.inc
index ad369861..f11a5698 100644
--- a/gl/includes/db/gl_db_bank_trans.inc
+++ b/gl/includes/db/gl_db_bank_trans.inc
@@ -32,7 +32,7 @@ function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_,
 	}
 	else
 		$amount_bank = $amount;
-
+	$amount_bank = round2($amount_bank, user_price_dec());	
 
 	// Also store the rate to the home
 	//$BankToHomeCurrencyRate = get_exchange_rate_to_home_currency($bank_account_currency, $date_);
@@ -83,6 +83,35 @@ function get_bank_trans($type, $trans_no=null, $person_type_id=null, $person_id=
 
 //----------------------------------------------------------------------------------------
 
+function get_bank_trans_for_bank_account($bank_account, $from, $to)
+{
+	$from = date2sql($from);
+	$to = date2sql($to);
+	$sql = "SELECT t.* FROM "
+		.TB_PREF."bank_trans t LEFT JOIN ".TB_PREF."voided v ON t.type=v.type AND t.trans_no=v.id
+		WHERE t.bank_act = ".db_escape($bank_account) . "
+		AND ISNULL(v.date_)
+		AND trans_date >= '$from'
+		AND trans_date <= '$to'
+		ORDER BY trans_date, t.id";
+
+	return db_query($sql,"The transactions for '" . $bank_account . "' could not be retrieved");
+}
+
+//----------------------------------------------------------------------------------------
+
+function get_balance_before_for_bank_account($bank_account, $from)
+{
+	$from = date2sql($from);
+	$sql = "SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE bank_act="
+		.db_escape($bank_account) . "
+		AND trans_date < '$from'";
+	$before_qty = db_query($sql, "The starting balance on hand could not be calculated");
+	$bfw_row = db_fetch_row($before_qty);
+	return $bfw_row[0];
+}
+//----------------------------------------------------------------------------------------
+
 function get_gl_trans_value($account, $type, $trans_no)
 {
 	$sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE account="
@@ -99,6 +128,7 @@ function get_gl_trans_value($account, $type, $trans_no)
 
 function void_bank_trans($type, $type_no, $nested=false)
 {
+
 	if (!$nested)
 		begin_transaction();
 
@@ -123,6 +153,49 @@ function void_bank_trans($type, $type_no, $nested=false)
 		commit_transaction();
 }
 
-//----------------------------------------------------------------------------------
+/**
+*	Check account history to find transaction which would exceed authorized overdraft for given account.
+*	Returns null or transaction in conflict.
+*	$delta_amount - tested change in bank balance at $date.
+**/
+function check_bank_account_history($delta_amount, $bank_account, $date, $user=null)
+{
+	if ($delta_amount >= 0)
+		 return null;	// amount increese is always safe
+
+	$balance = get_bank_account_limit($bank_account, $date, $user);
+
+	if (!isset($balance))
+		return null;	// unlimited account
+
+	$date = date2sql($date);
+	$balance+= $delta_amount;
+
+	$sql = "SELECT * FROM ".TB_PREF."bank_trans WHERE bank_act=".db_escape($bank_account)." AND trans_date > '$date' ORDER BY trans_date ASC, id ASC";
+
+	$history = db_query($sql, "cannot retrieve cash account history");
+
+	while ($trans = db_fetch($history)) {
+		$balance += $trans['amount'];
+		if ($balance < 0)
+			return $trans;
+	}
+
+	return null;
+}
+
+/**
+*	Check bank transfer, deposit or customer deposit before voiding.
+**/
+function check_void_bank_trans($type, $type_no)
+{
+	$moves = get_bank_trans($type, $type_no);
+	while ($trans = db_fetch($moves)) {
+		if ($trans['amount'] > 0) { // skip transfer input part
+			return check_bank_account_history(-$trans['amount'], $trans['bank_act'], sql2date($trans['trans_date'])) == null;
+		}
+	}
+	return true;
+}
 
-?>
\ No newline at end of file
+?>