X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fbank_transfer.php;h=35e7743e3a6b3e0ea7df04e5f33ad95325cadc34;hb=e991002080c10bc5172a4a1fd18ca634ae81c1b3;hp=a11352a6ebbca0370942f572425476588d8f54c5;hpb=0d191c7bff92b9a9bbc44dab48855477edb99ebf;p=fa-stable.git

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index a11352a6..35e7743e 100644
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -21,7 +21,7 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 include_once($path_to_root . "/gl/includes/gl_ui.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 if (user_use_date_picker())
 	$js .= get_js_date_picker();
@@ -86,15 +86,18 @@ function gl_payment_controls($trans_no)
 			$_POST['ToBankAccount'] = $to_trans['bank_act'];
 			$_POST['target_amount'] = price_format($to_trans['amount']);
 			$_POST['amount'] = price_format(-$from_trans['amount']);
+			$_POST['dimension_id'] = $to_trans['dimension_id'];
+			$_POST['dimension2_id'] = $to_trans['dimension2_id'];
 		} else {
-			$_POST['ref'] = $Refs->get_next(ST_BANKTRANSFER);
+			$_POST['ref'] = $Refs->get_next(ST_BANKTRANSFER, null, get_post('DatePaid'));
 			$_POST['memo_'] = '';
 			$_POST['FromBankAccount'] = 0;
 			$_POST['ToBankAccount'] = 0;
 			$_POST['amount'] = 0;
+			$_POST['dimension_id'] = 0;
+			$_POST['dimension2_id'] = 0;
 		}
 	}
-	$home_currency = get_company_currency();
 
 	start_form();
 
@@ -115,7 +118,14 @@ function gl_payment_controls($trans_no)
 	}
     date_row(_("Transfer Date:"), 'DatePaid', '', true, 0, 0, 0, null, true);
 
-	ref_row(_("Reference:"), 'ref', '', $_POST['ref']);
+    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKTRANSFER, null, get_post('DatePaid')), false, ST_BANKTRANSFER,
+    	array('date' => get_post('DatePaid')));
+	$dim = get_company_pref('use_dimension');
+	if ($dim > 0)
+		dimensions_list_row(_("Dimension").":", 'dimension_id', 
+			null, true, ' ', false, 1, false);
+	else
+		hidden('dimension_id', 0);
 
 	table_section(2);
 
@@ -133,6 +143,11 @@ function gl_payment_controls($trans_no)
 		amount_row(_("Amount:"), 'amount');
 		amount_row(_("Bank Charge:"), 'charge');
 	}
+	if ($dim > 1)
+		dimensions_list_row(_("Dimension")." 2:", 'dimension2_id', 
+			null, true, ' ', false, 2, false);
+	else
+		hidden('dimension2_id', 0);
 
     textarea_row(_("Memo:"), 'memo_', null, 40,4);
 
@@ -183,6 +198,7 @@ function check_valid_entries($trans_no)
 
 	$amnt_tr = input_num('charge') + input_num('amount');
 
+	$problemTransaction = null;
 	if ($trans_no) {
 		$problemTransaction = check_bank_transfer( $trans_no, $_POST['FromBankAccount'], $_POST['ToBankAccount'], $_POST['DatePaid'],
 			$amnt_tr, input_num('target_amount', $amnt_tr));
@@ -232,15 +248,8 @@ function check_valid_entries($trans_no)
 		set_focus('charge');
 		return false;
 	}
-	if (!$Refs->is_valid($_POST['ref'])) 
-	{
-		display_error(_("You must enter a reference."));
-		set_focus('ref');
-		return false;
-	}
 
-	if (! $trans_no && ! is_new_reference($_POST['ref'], ST_BANKTRANSFER)) {
-		display_error(_("The entered reference is already in use."));
+	if (!check_reference($_POST['ref'], ST_BANKTRANSFER, $trans_no)) {
 		set_focus('ref');
 		return false;
 	}
@@ -279,10 +288,12 @@ function bank_transfer_handle_submit()
 {
 	$trans_no = array_key_exists('_trans_no', $_POST) ?  $_POST['_trans_no'] : null;
 	if ($trans_no) {
-		$trans_no = update_bank_transfer($trans_no, $_POST['FromBankAccount'], $_POST['ToBankAccount'], $_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_'], input_num('charge'), input_num('target_amount'));
+		$trans_no = update_bank_transfer($trans_no, $_POST['FromBankAccount'], $_POST['ToBankAccount'], $_POST['DatePaid'],	input_num('amount'), 
+			$_POST['ref'], $_POST['memo_'], $_POST['dimension_id'], $_POST['dimension2_id'], input_num('charge'), input_num('target_amount'));
 	} else {
 		new_doc_date($_POST['DatePaid']);
-		$trans_no = add_bank_transfer($_POST['FromBankAccount'], $_POST['ToBankAccount'], $_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_'], input_num('charge'), input_num('target_amount'));
+		$trans_no = add_bank_transfer($_POST['FromBankAccount'], $_POST['ToBankAccount'], $_POST['DatePaid'], input_num('amount'), $_POST['ref'], 
+			$_POST['memo_'], $_POST['dimension_id'], $_POST['dimension2_id'], input_num('charge'), input_num('target_amount'));
 	}
 
 	meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");