Removed obsolete stock_move.person_id field and related handling.

[fa-stable.git] / gl / includes / db / gl_db_bank_trans.inc

diff --git a/gl/includes/db/gl_db_bank_trans.inc b/gl/includes/db/gl_db_bank_trans.inc
index 59dbaa2322d178fa520dab093636449ef5f26f62..c37256111028535fdfec181591aa94938d40eec0 100644 (file)
--- 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");
 }
@@ -93,6 +102,7 @@ function get_bank_trans_for_bank_account($bank_account, $from, $to)
                AND ISNULL(v.date_)
                AND trans_date >= '$from'
                AND trans_date <= '$to'
+               AND amount != 0
                ORDER BY trans_date, t.id";
 
        return db_query($sql,"The transactions for '" . $bank_account . "' could not be retrieved");
@@ -158,28 +168,38 @@ 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'=> date2sql($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");
 
        while ($trans = db_fetch($history)) {
                $balance += $trans['amount'];
                if ($balance < 0)
+               {
+                       $trans['amount'] = $balance;
                        return $trans;
+               }
        }
 
        return null;
@@ -199,4 +219,3 @@ function check_void_bank_trans($type, $type_no)
        return true;
 }
 
-?>