Fixed error log warning (missing installed_extensions.inc) during upgrade to 2.2.

[fa-stable.git] / purchasing / supplier_payment.php

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index ee0b81a6538434ec35a4662a88666824228e7f9b..ce217913e0aefc4522fac4060232d13a12fc7617 100644 (file)
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -102,10 +102,13 @@ function check_inputs()
                return false;
        }
 
-       if (isset($_POST['charge']) && input_num('charge') > 0 && get_company_pref('bank_charge_act') == '') {
-               display_error(_("The Bank Charge Account has not been set in System and General GL Setup."));
-               set_focus('charge');
-               return false;
+       if (isset($_POST['charge']) && input_num('charge') > 0) {
+               $charge_acct = get_company_pref('bank_charge_act');
+               if (get_gl_account($charge_acct) == false) {
+                       display_error(_("The Bank Charge Account has not been set in System and General GL Setup."));
+                       set_focus('charge');
+                       return false;
+               }       
        }
 
        if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001))
@@ -153,7 +156,7 @@ function check_inputs()
                return false;
        }
 
-       if (!is_new_reference($_POST['ref'], 22)) 
+       if (!is_new_reference($_POST['ref'], ST_SUPPAYMENT)) 
        {
                display_error(_("The entered reference is already in use."));
                set_focus('ref');
@@ -161,7 +164,11 @@ function check_inputs()
        }
 
        $_SESSION['alloc']->amount = -input_num('amount');
-       return check_allocations();
+
+       if (isset($_POST["TotalNumberOfAllocs"]))
+               return check_allocations();
+       else
+               return true;
 }
 
 //----------------------------------------------------------------------------------------
@@ -219,7 +226,7 @@ start_form();
     supplier_list_row(_("Payment To:"), 'supplier_id', null, false, true);
 
        if (!isset($_POST['bank_account'])) // first page call
-                 $_SESSION['alloc'] = new allocation(22, 0);
+                 $_SESSION['alloc'] = new allocation(ST_SUPPAYMENT, 0);
 
        set_global_supplier($_POST['supplier_id']);
        
@@ -227,7 +234,7 @@ start_form();
 
        table_section(2);
 
-    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(22));
+    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT));
 
     date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true);