X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fincludes%2Fui%2Fgl_bank_ui.inc;h=1ac37eb7a2812509f82940558c85c2662ced1c61;hb=0025c69bbcdcf7445db44656a408c18832ac3a68;hp=6454edbda9bb9cfa4fe631ed07cb0b2044239ab3;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc
index 6454edbd..1ac37eb7 100644
--- a/gl/includes/ui/gl_bank_ui.inc
+++ b/gl/includes/ui/gl_bank_ui.inc
@@ -20,10 +20,10 @@ function display_bank_header(&$order)
 
 	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']))
@@ -91,15 +91,26 @@ 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%");
-
-	ref_row(_("Reference:"), 'ref', '');
-
 	end_outer_table(1); // outer table
 
 	div_end();