X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_bank.php;h=17547fb2114914a6e9ecf8d6b581b560f20ea1c2;hb=33e8c8d4cc6ace088b9a94a28b5c081e46f2ea81;hp=f83030168373d3fbfea942aee2b6ed3238d05985;hpb=fa29d5d6dada814e5e684d6c76476cd56173399f;p=fa-stable.git

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index f8303016..17547fb2 100644
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -22,6 +22,7 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/gl/includes/ui/gl_bank_ui.inc");
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 include_once($path_to_root . "/gl/includes/gl_ui.inc");
+include_once($path_to_root . "/admin/db/attachments_db.inc");
 
 $js = '';
 if ($use_popup_windows)
@@ -77,6 +78,8 @@ if (isset($_GET['AddedID']))
 
 	hyperlink_params($_SERVER['PHP_SELF'], _("Enter A &Deposit"), "NewDeposit=yes");
 
+	hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$trans_no");
+
 	display_footer_exit();
 }
 
@@ -85,7 +88,7 @@ if (isset($_GET['UpdatedID']))
 	$trans_no = $_GET['UpdatedID'];
 	$trans_type = ST_BANKPAYMENT;
 
-   	display_notification_centered(_("Payment $trans_no has been modified"));
+   	display_notification_centered(sprintf(_("Payment %d has been modified"), $trans_no));
 
 	display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Postings for this Payment")));
 
@@ -116,7 +119,7 @@ if (isset($_GET['UpdatedDep']))
 	$trans_no = $_GET['UpdatedDep'];
 	$trans_type = ST_BANKDEPOSIT;
 
-   	display_notification_centered(_("Deposit $trans_no has been modified"));
+   	display_notification_centered(sprintf(_("Deposit %d has been modified"), $trans_no));
 
 	display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Postings for this Deposit")));
 
@@ -140,7 +143,7 @@ function create_cart($type, $trans_no)
 	{
 		unset ($_SESSION['pay_items']);
 	}
-	
+
 	$cart = new items_cart($type);
     $cart->order_id = $trans_no;
 
@@ -172,7 +175,7 @@ function create_cart($type, $trans_no)
 		$cart->tran_date = sql2date($bank_trans['trans_date']);
 		$cart->reference = $Refs->get($type, $trans_no);
 
-		$gl_amount = 0;
+		$cart->original_amount = $bank_trans['amount'];
 		$result = get_gl_trans($type, $trans_no);
 		if ($result) {
 			while ($row = db_fetch($result)) {
@@ -184,10 +187,10 @@ function create_cart($type, $trans_no)
 					$date = $row['tran_date'];
 					$cart->add_gl_item( $row['account'], $row['dimension_id'],
 						$row['dimension2_id'], $row['amount'], $row['memo_']);
-					$gl_amount += $row['amount'];
 				}
 			}
 		}
+
 		// apply exchange rate
 		foreach($cart->gl_items as $line_no => $line)
 			$cart->gl_items[$line_no]->amount *= $ex_rate;
@@ -226,13 +229,21 @@ if (isset($_POST['Process']))
 
 	$limit = get_bank_account_limit($_POST['bank_account'], $_POST['date_']);
 
-	if ($limit != null && ($limit < $_SESSION['pay_items']->gl_items_total()))
+	$amnt_chg = -$_SESSION['pay_items']->gl_items_total()-$_SESSION['pay_items']->original_amount;
+
+	if ($limit != null && ($limit + $amnt_chg < 0))
 	{
-		display_error(sprintf(_("The total bank amount exceeds allowed limit (%s)."), price_format($limit)));
+		display_error(sprintf(_("The total bank amount exceeds allowed limit (%s)."), price_format($limit-$_SESSION['pay_items']->original_amount)));
 		set_focus('code_id');
 		$input_error = 1;
 	}
+	if ($trans = check_bank_account_history($amnt_chg, $_POST['bank_account'], $_POST['date_'])) {
 
+		display_error(sprintf(_("The bank transaction would result in exceed of authorized overdraft limit for transaction: %s #%s on %s."),
+			$systypes_array[$trans['type']], $trans['trans_no'], sql2date($trans['trans_date'])));
+		set_focus('amount');
+		$input_error = 1;
+	}
 	if (!$Refs->is_valid($_POST['ref']))
 	{
 		display_error( _("You must enter a reference."));
@@ -267,6 +278,8 @@ if (isset($_POST['Process']))
 		set_focus('person_id');
 		$input_error = 1;
 	}
+	if (!db_has_currency_rates(get_bank_account_currency($_POST['bank_account']), $_POST['date_'], true))
+		$input_error = 1;
 
 	if ($input_error == 1)
 		unset($_POST['Process']);
@@ -283,7 +296,7 @@ if (isset($_POST['Process']))
 		$_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id, $_POST['bank_account'],
 		$_SESSION['pay_items'], $_POST['date_'],
 		$_POST['PayType'], $_POST['person_id'], get_post('PersonDetailID'),
-		$_POST['ref'], $_POST['memo_'], false);
+		$_POST['ref'], $_POST['memo_'], true);
 
 	$trans_type = $trans[0];
    	$trans_no = $trans[1];