X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fdb%2Fgl_db_bank_trans.inc;h=62900fc3ddeaac1bea4004b40047526eb3f406a9;hb=d970dc2362314b8c4787da86d3d7b8a8f40162f7;hp=59dbaa2322d178fa520dab093636449ef5f26f62;hpb=0025c69bbcdcf7445db44656a408c18832ac3a68;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 59dbaa23..62900fc3 100644
--- a/gl/includes/db/gl_db_bank_trans.inc
+++ b/gl/includes/db/gl_db_bank_trans.inc
@@ -65,18 +65,27 @@ function exists_bank_trans($type, $type_no)
 
 function get_bank_trans($type, $trans_no=null, $person_type_id=null, $person_id=null)
 {
-	$sql = "SELECT *, bank_account_name, account_code, bank_curr_code
-		FROM ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts
-		WHERE ".TB_PREF."bank_accounts.id=".TB_PREF."bank_trans.bank_act ";
+	$sql = "SELECT bt.*, act.*,
+		IFNULL(abs(dt.ov_amount), IFNULL(ABS(st.ov_amount), bt.amount)) settled_amount,
+		IFNULL(abs(dt.ov_amount/bt.amount), IFNULL(ABS(st.ov_amount/bt.amount), 1)) settle_rate,
+		IFNULL(debtor.curr_code, IFNULL(supplier.curr_code, act.bank_curr_code)) settle_curr
+
+		FROM ".TB_PREF."bank_trans bt
+				 LEFT JOIN ".TB_PREF."debtor_trans dt ON dt.type=bt.type AND dt.trans_no=bt.trans_no
+				 LEFT JOIN ".TB_PREF."debtors_master debtor ON debtor.debtor_no = dt.debtor_no
+				 LEFT JOIN ".TB_PREF."supp_trans st ON st.type=bt.type AND st.trans_no=bt.trans_no
+				 LEFT JOIN ".TB_PREF."suppliers supplier ON supplier.supplier_id = st.supplier_id,
+			 ".TB_PREF."bank_accounts act
+		WHERE act.id=bt.bank_act ";
 	if ($type != null)
-		$sql .= " AND type=".db_escape($type);
+		$sql .= " AND bt.type=".db_escape($type);
 	if ($trans_no != null)
-		$sql .= " AND ".TB_PREF."bank_trans.trans_no = ".db_escape($trans_no);
+		$sql .= " AND bt.trans_no = ".db_escape($trans_no);
 	if ($person_type_id != null)
-		$sql .= " AND ".TB_PREF."bank_trans.person_type_id = ".db_escape($person_type_id);
+		$sql .= " AND bt.person_type_id = ".db_escape($person_type_id);
 	if ($person_id != null)
-		$sql .= " AND ".TB_PREF."bank_trans.person_id = ".db_escape($person_id);
-	$sql .= " ORDER BY trans_date, ".TB_PREF."bank_trans.id";
+		$sql .= " AND bt.person_id = ".db_escape($person_id);
+	$sql .= " ORDER BY trans_date, bt.id";
 
 	return db_query($sql, "query for bank transaction");
 }
@@ -158,21 +167,28 @@ function void_bank_trans($type, $type_no, $nested=false)
 *	Returns null or transaction in conflict. Running balance is checked on daily basis only, to enable ID change after edition.
 *	$delta_amount - tested change in bank balance at $date.
 **/
-function check_bank_account_history($delta_amount, $bank_account, $date, $user=null)
+function check_bank_account_history($delta_amount, $bank_account, $date=null, $user=null)
 {
-	if ($delta_amount >= 0)
+	if ($delta_amount >= 0 && isset($date))
 		 return null;	// amount increese is always safe
 
-	$balance = get_bank_account_limit($bank_account, $date, $user);
+	$balance = $date ? get_bank_account_limit($bank_account, $date, $user) : 0;
 
-	if (!isset($balance))
+	if (!isset($balance) && isset($date))
 		return null;	// unlimited account
 
-	$date = date2sql($date);
-	$balance+= $delta_amount;
+	if (floatcmp($balance, -$delta_amount) < 0)
+		return array('amount' => $balance - $delta_amount, 'trans_date'=> $date);
 
-	$sql = "SELECT sum(amount) as amount FROM ".TB_PREF."bank_trans WHERE bank_act=".db_escape($bank_account)
-		." AND trans_date >= '$date' GROUP BY trans_date ORDER BY trans_date ASC";
+	$balance += $delta_amount;
+
+	$sql = "SELECT sum(amount) as amount, trans_date FROM ".TB_PREF."bank_trans WHERE bank_act=".db_escape($bank_account);
+	if ($date)
+	{
+		$date = date2sql($date);
+		$sql .= " AND trans_date > '$date'";
+	}
+	$sql .= " GROUP BY trans_date ORDER BY trans_date ASC";
 
 	$history = db_query($sql, "cannot retrieve cash account history");