Translation conflicts in Bank Deposit/Payment. The 'To' should be 'Into'.

[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 27027f83638619a035aaf7b2e2015497d478c5fa..e0e1b124f3d9d8383cfa69e335f5342a8cba85c2 100644 (file)
--- a/gl/includes/ui/gl_bank_ui.inc
+++ b/gl/includes/ui/gl_bank_ui.inc
@@ -14,29 +14,17 @@ function display_bank_header(&$order)
        global $Ajax, $Refs;
        $payment = $order->trans_type == ST_BANKPAYMENT;
 
+       $customer_error = false;
        div_start('pmt_header');
 
        start_outer_table(TABLESTYLE2, "width=90%"); // outer table
 
        table_section(1);
        
-       if (list_updated('PayType') || list_updated('person_id'))
-       {
-               if ($_POST['PayType'] == PT_CUSTOMER || $_POST['PayType'] == PT_SUPPLIER)
-               {
-                       $Ajax->activate('person_id');
-                       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']))
@@ -87,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 :
@@ -104,18 +103,36 @@ 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:") : _("Into:"), '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();
+       if ($customer_error)
+       {
+               end_form();
+               end_page();
+               exit;
+       }
 }
 //---------------------------------------------------------------------------------