From 9bc92eb30cfc0eb7d73d0a363e6c8c463c32295c Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Wed, 8 Jun 2011 15:38:02 +0200
Subject: [PATCH] Cleanup setting of customers/suppliers bank account in forms

---
 gl/includes/db/gl_db_bank_accounts.inc | 16 +----------
 gl/includes/ui/gl_bank_ui.inc          | 40 +++++++++++---------------
 purchasing/supplier_payment.php        |  6 ++--
 sales/customer_payments.php            |  2 +-
 4 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/gl/includes/db/gl_db_bank_accounts.inc b/gl/includes/db/gl_db_bank_accounts.inc
index 93dc8e7..1669d20 100644
--- a/gl/includes/db/gl_db_bank_accounts.inc
+++ b/gl/includes/db/gl_db_bank_accounts.inc
@@ -318,14 +318,7 @@ function get_default_bank_account($curr)
 
 function get_default_customer_bank_account($cust_id)
 {
-	if ($cust_id == "")
-	{
-		$sql = "SELECT debtor_no FROM ".TB_PREF."debtors_master WHERE inactive=0 ORDER BY debtor_ref LIMIT 1";
-		$result = db_query($sql, "could not retreive first customer");
-		$row = db_fetch_row($result);
-		$cust_id = $row[0];
-	}
-	$sql = "SELECT curr_code FROM ".TB_PREF."debtors_master WHERE debtor_no=$cust_id";
+	$sql = "SELECT curr_code FROM ".TB_PREF."debtors_master WHERE debtor_no=".db_escape($cust_id);
 	$result = db_query($sql, "could not retreive default customer currency code");
 	$row = db_fetch_row($result);
 	$ba = get_default_bank_account($row[0]);
@@ -334,13 +327,6 @@ function get_default_customer_bank_account($cust_id)
 
 function get_default_supplier_bank_account($supplier_id)
 {
-	if ($supplier_id == "")
-	{
-		$sql = "SELECT supplier_id FROM ".TB_PREF."suppliers WHERE inactive=0 ORDER BY supp_ref LIMIT 1";
-		$result = db_query($sql, "could not retreive first supplier");
-		$row = db_fetch_row($result);
-		$supplier_id = $row[0];
-	}
 	$sql = "SELECT curr_code FROM ".TB_PREF."suppliers WHERE supplier_id=".db_escape($supplier_id);
 	$result = db_query($sql, "could not retreive default supplier currency code");
 	$row = db_fetch_row($result);
diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc
index 0f3d33f..5a0124f 100644
--- a/gl/includes/ui/gl_bank_ui.inc
+++ b/gl/includes/ui/gl_bank_ui.inc
@@ -20,27 +20,10 @@ function display_bank_header(&$order)
 
 	table_section(1);
 	
-	if (list_updated('PayType') || list_updated('person_id'))
-	{
-		if (list_updated('PayType'))
-		{
-			$_POST['person_id'] = "";
-			unset($_POST['bank_account']);
-		}	
-		if ($_POST['PayType'] == PT_CUSTOMER || $_POST['PayType'] == PT_SUPPLIER)
-		{
-			if ($_POST['PayType'] == PT_CUSTOMER)
-    			$_POST['bank_account'] = get_default_customer_bank_account($_POST['person_id']);
-    		else	
-    			$_POST['bank_account'] = get_default_supplier_bank_account($_POST['person_id']);
-		}
-	}	
-    bank_accounts_list_row( $payment ? _("From:") : _("To:"), 'bank_account', null, true);
-    if ($payment)
-		bank_balance_row($_POST['bank_account']);
-    	
     date_row(_("Date:"), 'date_', '', true, 0, 0, 0, null, true);
 
+	ref_row(_("Reference:"), 'ref', '');
+
 	table_section(2, "33%");
 
 	if (!isset($_POST['PayType']))
@@ -108,15 +91,26 @@ function display_bank_header(&$order)
     	//	break;
     }
 
+	table_section(3, "33%");
+
+	if (!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();
diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index 26c2a74..477c30b 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -58,7 +58,6 @@ if (isset($_POST['_DatePaid_changed'])) {
 }
 
 if (list_updated('supplier_id') || list_updated('bank_account')) {
-  $_SESSION['alloc']->read();
   $Ajax->activate('alloc_tbl');
 }
 //----------------------------------------------------------------------------------------
@@ -302,9 +301,10 @@ start_form();
 	end_outer_table(1); // outer table
 
 	if ($bank_currency == $supplier_currency) {
-  	div_start('alloc_tbl');
+  		div_start('alloc_tbl');
+  		$_SESSION['alloc']->read();
 		show_allocatable(false);
-	div_end();
+		div_end();
 	}
 
 	start_table(TABLESTYLE, "width=60%");
diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index 3aa2311..b455170 100644
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -184,7 +184,6 @@ if (isset($_POST['_DateBanked_changed'])) {
   $Ajax->activate('_ex_rate');
 }
 if (list_updated('customer_id') || list_updated('bank_account')) {
-  $_SESSION['alloc']->read();
   $Ajax->activate('alloc_tbl');
 }
 //----------------------------------------------------------------------------------------------
@@ -278,6 +277,7 @@ start_form();
 
 		if ($cust_currency == $bank_currency) {
 	  		div_start('alloc_tbl');
+ 	 		$_SESSION['alloc']->read();
 			show_allocatable(false);
 			div_end();
 		}
-- 
2.30.2