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

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 17547fb2..5bc7cecd 100644
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -60,6 +60,7 @@ function line_start_focus() {
   global 	$Ajax;
 
   $Ajax->activate('items_table');
+  $Ajax->activate('footer');
   set_focus('_code_id_edit');
 }
 
@@ -130,9 +131,6 @@ if (isset($_GET['UpdatedDep']))
 	display_footer_exit();
 }
 
-if (isset($_POST['_date__changed'])) {
-	$Ajax->activate('_ex_rate');
-}
 //--------------------------------------------------------------------------------------------------
 
 function create_cart($type, $trans_no)
@@ -210,8 +208,9 @@ function create_cart($type, $trans_no)
 }
 //-----------------------------------------------------------------------------------------------
 
-if (isset($_POST['Process']))
+function check_trans()
 {
+	global $Refs;
 
 	$input_error = 0;
 
@@ -231,7 +230,7 @@ if (isset($_POST['Process']))
 
 	$amnt_chg = -$_SESSION['pay_items']->gl_items_total()-$_SESSION['pay_items']->original_amount;
 
-	if ($limit != null && ($limit + $amnt_chg < 0))
+	if ($limit !== null && floatcmp($limit, -$amnt_chg) < 0)
 	{
 		display_error(sprintf(_("The total bank amount exceeds allowed limit (%s)."), price_format($limit-$_SESSION['pay_items']->original_amount)));
 		set_focus('code_id');
@@ -281,22 +280,28 @@ if (isset($_POST['Process']))
 	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']);
+	if (isset($_POST['settled_amount']) && in_array(get_post('PayType'), array(PT_SUPPLIER, PT_CUSTOMER)) && (input_num('settled_amount') <= 0)) {
+		display_error(_("Settled amount have to be positive number."));
+		set_focus('person_id');
+		$input_error = 1;
+	}
+	return $input_error;
 }
 
-if (isset($_POST['Process']))
+if (isset($_POST['Process']) && !check_trans())
 {
 	begin_transaction();
-	
+
 	$_SESSION['pay_items'] = &$_SESSION['pay_items'];
 	$new = $_SESSION['pay_items']->order_id == 0;
 
+	add_new_exchange_rate(get_bank_account_currency(get_post('bank_account')), get_post('date_'), input_num('_ex_rate'));
+
 	$trans = write_bank_transaction(
 		$_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_'], true);
+		$_POST['ref'], $_POST['memo_'], true, input_num('settled_amount', null));
 
 	$trans_type = $trans[0];
    	$trans_no = $trans[1];
@@ -304,9 +309,9 @@ if (isset($_POST['Process']))
 
 	$_SESSION['pay_items']->clear_items();
 	unset($_SESSION['pay_items']);
-	
+
 	commit_transaction();
-	
+
 	if ($new)
 		meta_forward($_SERVER['PHP_SELF'], $trans_type==ST_BANKPAYMENT ?
 			"AddedID=$trans_no" : "AddedDep=$trans_no");
@@ -326,6 +331,12 @@ function check_item_data()
 		set_focus('amount');
 		return false;
 	}
+	if (isset($_POST['_ex_rate']) && input_num('_ex_rate') <= 0)
+	{
+		display_error( _("The exchange rate cannot be zero or a negative number."));
+		set_focus('_ex_rate');
+		return false;
+	}
 
 	return true;
 }
@@ -390,12 +401,12 @@ start_form();
 
 display_bank_header($_SESSION['pay_items']);
 
-start_table(TABLESTYLE2, "width=90%", 10);
+start_table(TABLESTYLE2, "width='90%'", 10);
 start_row();
 echo "<td>";
 display_gl_items($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ?
 	_("Payment Items"):_("Deposit Items"), $_SESSION['pay_items']);
-gl_options_controls();
+gl_options_controls($_SESSION['pay_items']);
 echo "</td>";
 end_row();
 end_table(1);