Cleanup setting of customers/suppliers bank account in forms

[fa-stable.git] / gl / includes / ui / gl_bank_ui.inc

diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc
index 0f3d33f7382297e35f81c25a93d516127d774e2e..5a0124f656215e1e8582c8d4e70434b4725cc716 100644 (file)
--- 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();