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

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 9a4257ce..2d220c4f 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'])) {
@@ -60,11 +60,15 @@ if (list_updated('PersonDetailID')) {
 
 //--------------------------------------------------------------------------------------------------
 function line_start_focus() {
-  global 	$Ajax;
-
-  $Ajax->activate('items_table');
-  $Ajax->activate('footer');
-  set_focus('_code_id_edit');
+  	global 	$Ajax;
+
+    unset($_POST['amount']);
+    unset($_POST['dimension_id']);
+    unset($_POST['dimension2_id']);
+    unset($_POST['LineMemo']);
+  	$Ajax->activate('items_table');
+  	$Ajax->activate('footer');
+  	set_focus('_code_id_edit');
 }
 
 //-----------------------------------------------------------------------------------------------
@@ -153,7 +157,8 @@ function create_cart($type, $trans_no)
 		$bank_trans = db_fetch(get_bank_trans($type, $trans_no));
 		$_POST['bank_account'] = $bank_trans["bank_act"];
 		$_POST['PayType'] = $bank_trans["person_type_id"];
-		
+		$cart->reference = $bank_trans["ref"];
+
 		if ($bank_trans["person_type_id"] == PT_CUSTOMER)
 		{
 			$trans = get_customer_trans($trans_no, $type);	
@@ -174,7 +179,6 @@ function create_cart($type, $trans_no)
 
 		$cart->memo_ = get_comments_string($type, $trans_no);
 		$cart->tran_date = sql2date($bank_trans['trans_date']);
-		$cart->reference = $Refs->get($type, $trans_no);
 
 		$cart->original_amount = $bank_trans['amount'];
 		$result = get_gl_trans($type, $trans_no);
@@ -185,7 +189,6 @@ function create_cart($type, $trans_no)
 					// so we have to restore it from original gl amounts
 					$ex_rate = $bank_trans['amount']/$row['amount'];
 				} else {
-					$date = $row['tran_date'];
 					$cart->add_gl_item( $row['account'], $row['dimension_id'],
 						$row['dimension2_id'], $row['amount'], $row['memo_']);
 				}
@@ -197,7 +200,7 @@ function create_cart($type, $trans_no)
 			$cart->gl_items[$line_no]->amount *= $ex_rate;
 
 	} else {
-		$cart->reference = $Refs->get_next($cart->trans_type);
+		$cart->reference = $Refs->get_next($cart->trans_type, null, $cart->tran_date);
 		$cart->tran_date = new_doc_date();
 		if (!is_date_in_fiscalyear($cart->tran_date))
 			$cart->tran_date = end_fiscalyear();
@@ -213,7 +216,7 @@ function create_cart($type, $trans_no)
 
 function check_trans()
 {
-	global $Refs;
+	global $Refs, $systypes_array;
 
 	$input_error = 0;
 
@@ -241,20 +244,15 @@ function check_trans()
 	}
 	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."));
-		set_focus('ref');
-		$input_error = 1;
+		if (isset($trans['trans_no'])) {
+			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;
+		}	
 	}
-	elseif ($_POST['ref'] != $_SESSION['pay_items']->reference && !is_new_reference($_POST['ref'], $_SESSION['pay_items']->trans_type))
+	if (!check_reference($_POST['ref'], $_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id))
 	{
-		display_error( _("The entered reference is already in use."));
 		set_focus('ref');
 		$input_error = 1;
 	}
@@ -283,7 +281,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 +296,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_']);
@@ -387,7 +386,7 @@ if (isset($_POST['AddItem']))
 if (isset($_POST['UpdateItem']))
 	handle_update_item();
 
-if (isset($_POST['CancelItemChanges']))
+if (isset($_POST['CancelItemChanges']) || isset($_POST['Index']))
 	line_start_focus();
 
 if (isset($_POST['go']))
@@ -403,7 +402,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 +422,3 @@ end_form();
 
 end_page();
 
-?>