X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_bank.php;h=613e0362240ed10599dbf61adf562f67301ac90b;hb=76ca9fef9bb510236a6a7740fa0f60eb7db384c9;hp=5ed202e7c2c43814556ce38e039e3ec051300633;hpb=9aa63ffb64fbf3fd1ed6a5863d06c1c11865f6f8;p=fa-stable.git

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 5ed202e7..613e0362 100644
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -69,7 +69,7 @@ if (isset($_GET['AddedID']))
 	$trans_no = $_GET['AddedID'];
 	$trans_type = ST_BANKPAYMENT;
 
-   	display_notification_centered(_("Payment $trans_no has been entered"));
+   	display_notification_centered(sprintf(_("Payment %d has been entered"), $trans_no));
 
 	display_note(get_gl_view_str($trans_type, $trans_no, _("&View the GL Postings for this Payment")));
 
@@ -101,7 +101,7 @@ if (isset($_GET['AddedDep']))
 	$trans_no = $_GET['AddedDep'];
 	$trans_type = ST_BANKDEPOSIT;
 
-   	display_notification_centered(_("Deposit $trans_no has been entered"));
+   	display_notification_centered(sprintf(_("Deposit %d has been entered"), $trans_no));
 
 	display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Postings for this Deposit")));
 
@@ -141,6 +141,7 @@ function create_cart($type, $trans_no)
 		unset ($_SESSION['pay_items']);
 	}
 	
+	check_is_closed($type, $trans_no);
 	$cart = new items_cart($type);
     $cart->order_id = $trans_no;
 
@@ -172,7 +173,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,14 +185,14 @@ 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;
-		
+
 	} else {
 		$cart->reference = $Refs->get_next($cart->trans_type);
 		$cart->tran_date = new_doc_date();
@@ -224,6 +225,15 @@ if (isset($_POST['Process']))
 		$input_error = 1;
 	}
 
+	$limit = get_bank_account_limit($_POST['bank_account'], $_POST['date_']);
+
+	if ($limit != null && (($limit - $_SESSION['pay_items']->original_amount) < $_SESSION['pay_items']->gl_items_total()))
+	{
+		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 (!$Refs->is_valid($_POST['ref']))
 	{
 		display_error( _("You must enter a reference."));
@@ -244,10 +254,10 @@ if (isset($_POST['Process']))
 	}
 	elseif (!is_date_in_fiscalyear($_POST['date_']))
 	{
-		display_error(_("The entered date is not in fiscal year."));
+		display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
 		set_focus('date_');
 		$input_error = 1;
-	}
+	} 
 
 	if (get_post('PayType')==PT_CUSTOMER && (!get_post('person_id') || !get_post('PersonDetailID'))) {
 		display_error(_("You have to select customer and customer branch."));