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

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 8733b602..613e0362 100644
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -31,11 +31,10 @@ if ($use_date_picker)
 
 if (isset($_GET['NewPayment'])) {
 	$_SESSION['page_title'] = _($help_context = "Bank Account Payment Entry");
-	handle_new_order(ST_BANKPAYMENT);
-
+	create_cart(ST_BANKPAYMENT, 0);
 } else if(isset($_GET['NewDeposit'])) {
 	$_SESSION['page_title'] = _($help_context = "Bank Account Deposit Entry");
-	handle_new_order(ST_BANKDEPOSIT);
+	create_cart(ST_BANKDEPOSIT, 0);
 } else if(isset($_GET['ModifyPayment'])) {
 	$_SESSION['page_title'] = _($help_context = "Modify Bank Account Entry")." #".$_GET['trans_no'];
 	create_cart(ST_BANKPAYMENT, $_GET['trans_no']);
@@ -70,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")));
 
@@ -102,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")));
 
@@ -133,23 +132,6 @@ if (isset($_POST['_date__changed'])) {
 }
 //--------------------------------------------------------------------------------------------------
 
-function handle_new_order($type)
-{
-	if (isset($_SESSION['pay_items']))
-	{
-		unset ($_SESSION['pay_items']);
-	}
-
-	//session_register("pay_items");
-
-	$_SESSION['pay_items'] = new items_cart($type);
-
-	$_POST['date_'] = new_doc_date();
-	if (!is_date_in_fiscalyear($_POST['date_']))
-		$_POST['date_'] = end_fiscalyear();
-	$_SESSION['pay_items']->tran_date = $_POST['date_'];
-}
-
 function create_cart($type, $trans_no)
 {
 	global $Refs;
@@ -158,64 +140,71 @@ function create_cart($type, $trans_no)
 	{
 		unset ($_SESSION['pay_items']);
 	}
-
-	$_SESSION['pay_items'] = new items_cart($type);
-    $_SESSION['pay_items']->order_id = $trans_no;
+	
+	check_is_closed($type, $trans_no);
+	$cart = new items_cart($type);
+    $cart->order_id = $trans_no;
 
 	if ($trans_no) {
-		$result = get_gl_trans($type, $trans_no);
-
-		if ($result) {
-			while ($row = db_fetch($result)) {
-				if ($row['amount'] == 0) continue;
-				if (is_bank_account($row['account'])) continue;
-				$date = $row['tran_date'];
-				$_SESSION['pay_items']->add_gl_item($row['account'], $row['dimension_id'], 
-					$row['dimension2_id'], $row['amount'], $row['memo_']);
-			}
-		}
-		$_SESSION['pay_items']->memo_ = get_comments_string($type, $trans_no);
-		$_SESSION['pay_items']->tran_date = sql2date($date);
-		$_SESSION['pay_items']->reference = $Refs->get($type, $trans_no);
-		////////////////////////////////////////////
-		// Check Ref Original ?????
-		$_POST['ref_original'] = $_SESSION['pay_items']->reference; // Store for comparison when updating	
 
 		$bank_trans = db_fetch(get_bank_trans($type, $trans_no));
 		$_POST['bank_account'] = $bank_trans["bank_act"];
 		$_POST['PayType'] = $bank_trans["person_type_id"];
 		
-		if ($bank_trans["person_type_id"] == PT_CUSTOMER) //2
+		if ($bank_trans["person_type_id"] == PT_CUSTOMER)
 		{
 			$trans = get_customer_trans($trans_no, $type);	
 			$_POST['person_id'] = $trans["debtor_no"];
 			$_POST['PersonDetailID'] = $trans["branch_code"];
 		}
-		elseif ($bank_trans["person_type_id"] == PT_SUPPLIER) //3
+		elseif ($bank_trans["person_type_id"] == PT_SUPPLIER)
 		{
 			$trans = get_supp_trans($trans_no, $type);
 			$_POST['person_id'] = $trans["supplier_id"];
 		}
-		elseif ($bank_trans["person_type_id"] == PT_MISC) //0
+		elseif ($bank_trans["person_type_id"] == PT_MISC)
 			$_POST['person_id'] = $bank_trans["person_id"];
-		elseif ($bank_trans["person_type_id"] == PT_QUICKENTRY) //4
+		elseif ($bank_trans["person_type_id"] == PT_QUICKENTRY)
 			$_POST['person_id'] = $bank_trans["person_id"];
 		else 
 			$_POST['person_id'] = $bank_trans["person_id"];
 
+		$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);
+		if ($result) {
+			while ($row = db_fetch($result)) {
+				if (is_bank_account($row['account'])) {
+					// date exchange rate is currenly not stored in bank transaction,
+					// 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_']);
+				}
+			}
+		}
+
+		// apply exchange rate
+		foreach($cart->gl_items as $line_no => $line)
+			$cart->gl_items[$line_no]->amount *= $ex_rate;
+
 	} else {
-		$_SESSION['pay_items']->reference = $Refs->get_next(0);
-		$_SESSION['pay_items']->tran_date = new_doc_date();
-		if (!is_date_in_fiscalyear($_SESSION['pay_items']->tran_date))
-			$_SESSION['pay_items']->tran_date = end_fiscalyear();
-		$_POST['ref_original'] = -1;
+		$cart->reference = $Refs->get_next($cart->trans_type);
+		$cart->tran_date = new_doc_date();
+		if (!is_date_in_fiscalyear($cart->tran_date))
+			$cart->tran_date = end_fiscalyear();
 	}
 
-	$_POST['memo_'] = $_SESSION['pay_items']->memo_;
-	$_POST['ref'] = $_SESSION['pay_items']->reference;
-	$_POST['date_'] = $_SESSION['pay_items']->tran_date;
+	$_POST['memo_'] = $cart->memo_;
+	$_POST['ref'] = $cart->reference;
+	$_POST['date_'] = $cart->tran_date;
 
-	//$_SESSION['pay_items'] = &$_SESSION['pay_items'];
+	$_SESSION['pay_items'] = &$cart;
 }
 //-----------------------------------------------------------------------------------------------
 
@@ -236,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."));
@@ -256,9 +254,19 @@ 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."));
+		set_focus('person_id');
+		$input_error = 1;
+	} elseif (get_post('PayType')==PT_SUPPLIER && (!get_post('person_id'))) {
+		display_error(_("You have to select supplier."));
+		set_focus('person_id');
+		$input_error = 1;
 	}
 
 	if ($input_error == 1)
@@ -271,19 +279,9 @@ if (isset($_POST['Process']))
 	
 	$_SESSION['pay_items'] = &$_SESSION['pay_items'];
 	$new = $_SESSION['pay_items']->order_id == 0;
-	
-	if (!$new)
-	{
-		clear_bank_trans($_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id, true);
-		$trans = reinsert_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_'], false);		
-	}
-	else 
-	$trans = add_bank_transaction(
-		$_SESSION['pay_items']->trans_type, $_POST['bank_account'],
+
+	$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_'], false);
@@ -298,43 +296,26 @@ if (isset($_POST['Process']))
 	commit_transaction();
 	
 	if ($new)
-	meta_forward($_SERVER['PHP_SELF'], $trans_type==ST_BANKPAYMENT ?
-		"AddedID=$trans_no" : "AddedDep=$trans_no");
+		meta_forward($_SERVER['PHP_SELF'], $trans_type==ST_BANKPAYMENT ?
+			"AddedID=$trans_no" : "AddedDep=$trans_no");
 	else
-	meta_forward($_SERVER['PHP_SELF'], $trans_type==ST_BANKPAYMENT ?
-		"UpdatedID=$trans_no" : "UpdatedDep=$trans_no");
+		meta_forward($_SERVER['PHP_SELF'], $trans_type==ST_BANKPAYMENT ?
+			"UpdatedID=$trans_no" : "UpdatedDep=$trans_no");
 
-} /*end of process credit note */
+}
 
 //-----------------------------------------------------------------------------------------------
 
 function check_item_data()
 {
-	//if (!check_num('amount', 0))
-	//{
-	//	display_error( _("The amount entered is not a valid number or is less than zero."));
-	//	set_focus('amount');
-	//	return false;
-	//}
-
-	if ($_POST['code_id'] == $_POST['bank_account'])
+	if (!check_num('amount', 0))
 	{
-		display_error( _("The source and destination accouts cannot be the same."));
-		set_focus('code_id');
+		display_error( _("The amount entered is not a valid number or is less than zero."));
+		set_focus('amount');
 		return false;
 	}
 
-	//if (is_bank_account($_POST['code_id']))
-	//{
-	//	if ($_SESSION['pay_items']->trans_type == ST_BANKPAYMENT)
-	//		display_error( _("You cannot make a payment to a bank account. Please use the transfer funds facility for this."));
-	//	else
- 	//		display_error( _("You cannot make a deposit from a bank account. Please use the transfer funds facility for this."));
-	//	set_focus('code_id');
-	//	return false;
-	//}
-
-   	return true;
+	return true;
 }
 
 //-----------------------------------------------------------------------------------------------