Changes up to 2.3.7 merged into unstable branch.

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

diff --git a/gl/includes/db/gl_db_bank_accounts.inc b/gl/includes/db/gl_db_bank_accounts.inc
index a92195041a9adc3ce3ddb86a57b4e43be10bf888..1669d20005656ccff82c445f0f24dd4881870ea7 100644 (file)
--- a/gl/includes/db/gl_db_bank_accounts.inc
+++ b/gl/includes/db/gl_db_bank_accounts.inc
@@ -315,6 +315,24 @@ function get_default_bank_account($curr)
 
        return db_fetch($result);
 }
+
+function get_default_customer_bank_account($cust_id)
+{
+       $sql = "SELECT curr_code FROM ".TB_PREF."debtors_master WHERE debtor_no=".db_escape($cust_id);
+       $result = db_query($sql, "could not retreive default customer currency code");
+       $row = db_fetch_row($result);
+       $ba = get_default_bank_account($row[0]);
+       return $ba['id'];
+}
+
+function get_default_supplier_bank_account($supplier_id)
+{
+       $sql = "SELECT curr_code FROM ".TB_PREF."suppliers WHERE supplier_id=".db_escape($supplier_id);
+       $result = db_query($sql, "could not retreive default supplier currency code");
+       $row = db_fetch_row($result);
+       $ba = get_default_bank_account($row[0]);
+       return $ba['id'];
+}
 //---------------------------------------------------------------------------------------------
 //
 //     This function returns current allowed bank payment limit, or null if limit is not set.
@@ -327,7 +345,7 @@ function get_bank_account_limit($account, $date, $user=null)
        $bankacc = get_bank_account($account);
        if ($bankacc['account_type'] != BT_CASH)
                return null;
-       return get_balance_before_for_bank_account($account, add_days($date,1));
+       return max(0, get_balance_before_for_bank_account($account, add_days($date,1))); // in case of manco made before the check was implemented
 }
 
 ?>
\ No newline at end of file