X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fui%2Fgl_bank_ui.inc;h=34a4fed92971e618787409dde7e7ef11d0fe3c1a;hb=f4161d2985268fc4333f968b215ed0c6a53b731c;hp=7d98271b88462c99ef6964fb9b668989caf915f7;hpb=f840050289f0dd5f6c8ffc4fc6c4b8199bb86e01;p=fa-stable.git

diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc
index 7d98271b..34a4fed9 100644
--- a/gl/includes/ui/gl_bank_ui.inc
+++ b/gl/includes/ui/gl_bank_ui.inc
@@ -11,19 +11,19 @@
 ***********************************************************************/
 function display_bank_header(&$order)
 {
-	global $Ajax, $Refs;
+	global $Ajax;
 	$payment = $order->trans_type == ST_BANKPAYMENT;
 
 	$customer_error = false;
 	div_start('pmt_header');
 
-	start_outer_table(TABLESTYLE2, "width=90%"); // outer table
+	start_outer_table(TABLESTYLE2, "width='90%'"); // outer table
 
 	table_section(1);
 	
     date_row(_("Date:"), 'date_', '', true, 0, 0, 0, null, true);
 
-	ref_row(_("Reference:"), 'ref', '');
+	ref_row(_("Reference:"), 'ref', '', $order->reference, false, $order->trans_type, get_post('date_'));
 
 	table_section(2, "33%");
 
@@ -57,9 +57,6 @@ function display_bank_header(&$order)
     		text_row_ex($payment ?_("To the Order of:"):_("Name:"),
 				 'person_id', 40, 50);
     		break;
-		//case PT_WORKORDER :
-    	//	workorders_list_row(_("Work Order:"), 'person_id', null);
-    	//	break;
 		case PT_SUPPLIER :
     		supplier_list_row(_("Supplier:"), 'person_id', null, false, true, false, true);
     		break;
@@ -84,9 +81,9 @@ function display_bank_header(&$order)
         			$customer_error = true;
 					display_error(_("This customer account is on hold."));
         		}
-        		else			
+        		else
 					display_warning(_("This customer account is on hold."));
-        	}		
+        	}
     		break;
 
 		case PT_QUICKENTRY :
@@ -100,9 +97,6 @@ function display_bank_header(&$order)
 			amount_row($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']),
 				 null, "  ".submit('go', _("Go"), false, false, true));
 			break;	
-		//case payment_person_types::Project() :
-    	//	dimensions_list_row(_("Dimension:"), 'person_id', $_POST['person_id'], false, null, true);
-    	//	break;
     }
 
 	table_section(3, "33%");
@@ -146,12 +140,12 @@ function display_gl_items($title, &$order)
 	display_heading($title);
 
     div_start('items_table');
-	start_table(TABLESTYLE, "colspan=7 width=95%");
+	start_table(TABLESTYLE, "width='95%'");
 
 	if ($dim == 2)
 		$th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
 			_("Dimension")." 2", _("Amount"), _("Memo"), "");
-	else if ($dim == 1)
+	elseif ($dim == 1)
 		$th = array(_("Account Code"), _("Account Description"), _("Dimension"),
 			_("Amount"), _("Memo"), "");
 	else
@@ -176,7 +170,6 @@ function display_gl_items($title, &$order)
 				label_cell(get_dimension_string($item->dimension_id, true));
     		if ($dim > 1)
 				label_cell(get_dimension_string($item->dimension2_id, true));
-			//amount_cell(abs($item->amount));
 			if ($order->trans_type == ST_BANKDEPOSIT)
 				amount_cell(-$item->amount);
 			else		
@@ -225,48 +218,43 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
 		$_POST['LineMemo'] = $item->reference;
 
 		hidden('Index', $id);
-		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)
-			dimensions_list_cells(null, 'dimension2_id', null, true, " ", false, 2);
 	    $Ajax->activate('items_table');
 	}
 	else
 	{
-		$_POST['amount'] = price_format(0);
-		$_POST['dimension_id'] = 0;
-		$_POST['dimension2_id'] = 0;
-		//$_POST['LineMemo'] = ""; // let memo go to next line Joe Hunt 2010-05-30
 		if(isset($_POST['_code_id_update'])) {
 			    $Ajax->activate('code_id');
 		}
-
-		if ($_POST['PayType'] == PT_CUSTOMER)
-		{
-			$acc = get_branch_accounts($_POST['PersonDetailID']);
-			$_POST['code_id'] = $acc['receivables_account'];
-		}
-		elseif ($_POST['PayType'] == PT_SUPPLIER)
+		if (list_updated('PayType') || list_updated('person_id'))
 		{
-			$acc = get_supplier_accounts($_POST['person_id']);
-			$_POST['code_id'] = $acc['payable_account'];
-		}
-		//elseif ($_POST['PayType'] == PT_WORKORDER)
-		//	$_POST['code_id'] = get_company_pref('default_assembly_act');
-		else {
-			$_POST['code_id'] =
-				get_company_pref($payment ? 'default_cogs_act':'default_inv_sales_act');
+			if ($_POST['PayType'] == PT_CUSTOMER)
+			{
+				$acc = get_branch_accounts($_POST['PersonDetailID']);
+				$_POST['code_id'] = $acc['receivables_account'];
+			}
+			elseif ($_POST['PayType'] == PT_SUPPLIER)
+			{
+				$acc = get_supplier_accounts($_POST['person_id']);
+				$_POST['code_id'] = $acc['payable_account'];
+				$_POST['dimension_id'] = $acc['dimension_id'];
+				$_POST['dimension2_id'] = $acc['dimension2_id'];
+			}
+			else {
+				$_POST['code_id'] =
+					get_company_pref($payment ? 'default_cogs_act':'default_inv_sales_act');
+			}
+			$Ajax->activate('dimension_id');
+			$Ajax->activate('dimension2_id');
 		}
-		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)
-			dimensions_list_cells(null, 'dimension2_id', null, true, " ", false, 2);
 	}
-	if ($dim < 1)
+	echo gl_all_accounts_list('code_id', null, true, true);
+	if ($dim >= 1)
+		dimensions_list_cells(null, 'dimension_id', null, true, " ", false, 1);
+	else
 		hidden('dimension_id', 0);
-	if ($dim < 2)
+	if ($dim > 1)
+		dimensions_list_cells(null, 'dimension2_id', null, true, " ", false, 2);
+	else
 		hidden('dimension2_id', 0);
 
 	amount_cells(null, 'amount');
@@ -318,4 +306,3 @@ function gl_options_controls($order)
 
 //---------------------------------------------------------------------------------
 
-?>
\ No newline at end of file