X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fui%2Fgl_bank_ui.inc;h=981569c420943b06583a958f3daa11ad14bdd664;hb=acb313fc11ab4aa40e48b46c1534d09114638f6c;hp=2fe97b86d22be34f6bac87eb30ace80644847516;hpb=b5c5d915d8ce6e85605dce6efc5d2b61ea02f3ee;p=fa-stable.git

diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc
index 2fe97b86..981569c4 100644
--- a/gl/includes/ui/gl_bank_ui.inc
+++ b/gl/includes/ui/gl_bank_ui.inc
@@ -11,19 +11,20 @@
 ***********************************************************************/
 function display_bank_header(&$order)
 {
-	global $table_style2, $Ajax, $Refs;
+	global $Ajax, $Refs;
 	$payment = $order->trans_type == ST_BANKPAYMENT;
 
+	$customer_error = false;
 	div_start('pmt_header');
 
-	start_outer_table("width=90% $table_style2"); // outer table
+	start_outer_table(TABLESTYLE2, "width='90%'"); // outer table
 
 	table_section(1);
 	
-    bank_accounts_list_row( $payment ? _("From:") : _("To:"), 'bank_account', null, true);
-
     date_row(_("Date:"), 'date_', '', true, 0, 0, 0, null, true);
 
+	ref_row(_("Reference:"), 'ref', '');
+
 	table_section(2, "33%");
 
 	if (!isset($_POST['PayType']))
@@ -46,6 +47,7 @@ function display_bank_header(&$order)
 		$Ajax->activate('code_id');
 		$Ajax->activate('pagehelp');
 		$Ajax->activate('editors');
+		$Ajax->activate('footer');
 	}
     payment_person_types_list_row( $payment ? _("Pay To:"):_("From:"),
 		 'PayType', $_POST['PayType'], true);
@@ -74,6 +76,17 @@ function display_bank_header(&$order)
 				$_POST['PersonDetailID'] = ANY_NUMERIC;
         		hidden('PersonDetailID');
         	}
+        	$trans = get_customer_habit($_POST['person_id']); // take care of customers on hold
+        	if ($trans['dissallow_invoices'] != 0)
+        	{
+        		if ($payment)
+        		{
+        			$customer_error = true;
+					display_error(_("This customer account is on hold."));
+        		}
+        		else			
+					display_warning(_("This customer account is on hold."));
+        	}		
     		break;
 
 		case PT_QUICKENTRY :
@@ -81,6 +94,7 @@ function display_bank_header(&$order)
 			$qid = get_quick_entry(get_post('person_id'));
 			if (list_updated('person_id')) {
 				unset($_POST['totamount']); // enable default
+				$Ajax->activate('footer');
 				$Ajax->activate('totamount');
 			}
 			amount_row($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']),
@@ -91,34 +105,48 @@ function display_bank_header(&$order)
     	//	break;
     }
 
-	$person_currency = payment_person_currency($_POST['PayType'], $_POST['person_id']);
-	$bank_currency = get_bank_account_currency($_POST['bank_account']);
+	table_section(3, "33%");
 
-	exchange_rate_display($bank_currency, $person_currency, $_POST['date_']);
+	if (!$order->order_id && !get_post('bank_account'))
+	{
+		if ($_POST['PayType'] == PT_CUSTOMER)
+			$_POST['bank_account'] = get_default_customer_bank_account($_POST['person_id']);
+		elseif ($_POST['PayType'] == PT_SUPPLIER)	
+			$_POST['bank_account'] = get_default_supplier_bank_account($_POST['person_id']);
+		else
+			unset($_POST['bank_account']);
+	}		
+    
+    bank_accounts_list_row( $payment ? _("From:") : _("Into:"), 'bank_account', null, true);
+    if ($payment)
+		bank_balance_row($_POST['bank_account']);
 
-	table_section(3, "33%");
+	$bank_currency = get_bank_account_currency($_POST['bank_account']);
 
-	if (isset($_GET['NewPayment']))
-    	ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKPAYMENT));
-    else
-    	ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKDEPOSIT));
+	exchange_rate_display(get_company_currency(), $bank_currency, $_POST['date_']);
 
 	end_outer_table(1); // outer table
 
 	div_end();
+	if ($customer_error)
+	{
+		end_form();
+		end_page();
+		exit;
+	}
 }
 //---------------------------------------------------------------------------------
 
 function display_gl_items($title, &$order)
 {
-	global $table_style, $path_to_root;
+	global $path_to_root;
 
 	$dim = get_company_pref('use_dimension');
 	$colspan = ($dim == 2 ? 4 : ($dim == 1 ? 3 : 2));
 	display_heading($title);
 
     div_start('items_table');
-	start_table("$table_style colspan=7 width=95%");
+	start_table(TABLESTYLE, "width='95%'");
 
 	if ($dim == 2)
 		$th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
@@ -264,13 +292,27 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
 
 //---------------------------------------------------------------------------------
 
-function gl_options_controls()
+function gl_options_controls($order)
 {
+	div_start('footer');
 	echo "<br><table align='center'>";
 
+	$type = get_post('PayType');
+	$bank_curr = get_bank_account_currency(get_post('bank_account'));
+	$person_curr = $type == PT_CUSTOMER ? get_customer_currency(get_post('person_id')) 
+		: ($type == PT_SUPPLIER ? get_supplier_currency(get_post('person_id')) : $bank_curr);
+
+	if ($person_curr != $bank_curr)
+	{
+		$_POST['settled_amount'] =
+			price_format(abs($order->gl_items_total() / get_exchange_rate_from_to($bank_curr, $person_curr, get_post('date_'))));
+		amount_row($type == PT_CUSTOMER ? _("Settled AR Amount:") :  _("Settled AP Amount:"),
+			 'settled_amount', null, null, $person_curr, user_price_dec());
+	}
 	textarea_row(_("Memo"), 'memo_', null, 50, 3);
 
   	echo "</table>";
+  	div_end();
 }