X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fgl_bank.php;h=b965f1d50aefa0a8e05945d262111153d712bf53;hb=11109ad9f0e6af3f59d72731a95e473e72fb308b;hp=9a4257cec3f4c1fa731bef4dd8ed3d295ff72592;hpb=fa43a9c974d05b77517a0d8e3e510ef4a088632e;p=fa-stable.git

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 9a4257ce..b965f1d5 100644
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -25,9 +25,9 @@ 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)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
 
 if (isset($_GET['NewPayment'])) {
@@ -283,7 +283,7 @@ function check_trans()
 	if (!db_has_currency_rates(get_bank_account_currency($_POST['bank_account']), $_POST['date_'], true))
 		$input_error = 1;
 
-	if (in_array(get_post('PayType'), array(PT_SUPPLIER, PT_CUSTOMER)) && (input_num('settled_amount') <= 0)) {
+	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;
@@ -298,13 +298,14 @@ if (isset($_POST['Process']) && !check_trans())
 	$_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, input_num('settled_amount', null));
 
-	add_new_exchange_rate(get_bank_account_currency(get_post('bank_account')), get_post('date_'), input_num('_ex_rate'));
 	$trans_type = $trans[0];
    	$trans_no = $trans[1];
 	new_doc_date($_POST['date_']);
@@ -403,7 +404,7 @@ 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 ?
@@ -423,4 +424,3 @@ end_form();
 
 end_page();
 
-?>