X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fui%2Fgl_bank_ui.inc;h=5425edfbaa605af1d5e1b89083e2019f5febddff;hb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;hp=48c823923774d0b6fbbe82a1c84f63d5005b674b;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc
index 48c82392..5425edfb 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']))
@@ -74,6 +75,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 :
@@ -91,34 +103,48 @@ function display_bank_header(&$order)
     	//	break;
     }
 
+	table_section(3, "33%");
+
+	if (!$order->order_id && !list_updated('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:") : _("To:"), 'bank_account', null, true);
+    if ($payment)
+		bank_balance_row($_POST['bank_account']);
+    	
 	$person_currency = payment_person_currency($_POST['PayType'], $_POST['person_id']);
 	$bank_currency = get_bank_account_currency($_POST['bank_account']);
 
 	exchange_rate_display($bank_currency, $person_currency, $_POST['date_']);
 
-	table_section(3, "33%");
-
-	if (isset($_GET['NewPayment']))
-    	ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKPAYMENT));
-    else
-    	ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_BANKDEPOSIT));
-
 	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, "colspan=7 width=95%");
 
 	if ($dim == 2)
 		$th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
@@ -197,9 +223,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
 		$_POST['LineMemo'] = $item->reference;
 
 		hidden('Index', $id);
-		hidden('code_id', $item->code_id);
-		label_cell($_POST['code_id']);
-		label_cell($item->description);
+		echo gl_all_accounts_list('code_id', null, true, true);
 		if ($dim >= 1)
 			dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
 		if ($dim > 1)
@@ -211,7 +235,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
 		$_POST['amount'] = price_format(0);
 		$_POST['dimension_id'] = 0;
 		$_POST['dimension2_id'] = 0;
-		$_POST['LineMemo'] = "";
+		//$_POST['LineMemo'] = ""; // let memo go to next line Joe Hunt 2010-05-30
 		if(isset($_POST['_code_id_update'])) {
 			    $Ajax->activate('code_id');
 		}
@@ -232,7 +256,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
 			$_POST['code_id'] =
 				get_company_pref($payment ? 'default_cogs_act':'default_inv_sales_act');
 		}
-		gl_all_accounts_list('code_id', null, false, true);
+		echo gl_all_accounts_list('code_id', null, true, true);
 		if ($dim >= 1)
 			dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
 		if ($dim > 1)
@@ -244,7 +268,7 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
 		hidden('dimension2_id', 0);
 
 	amount_cells(null, 'amount');
-	text_cells_ex(null, 'LineMemo', 35, 50);
+	text_cells_ex(null, 'LineMemo', 35, 255);
 
 	if ($id != -1)
 	{