Moved all SQL statements from PHP files into relevant *_db.inc files.

[fa-stable.git] / sales / customer_payments.php

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index 1dcce02d3f6411535da166cefaa7a279f6cea83f..9f4630a4f4739eb201b8c2585ed0b94043065da4 100644 (file)
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -29,7 +29,7 @@ if ($use_date_picker) {
 }
 add_js_file('payalloc.js');
 
-page(_("Customer Payment Entry"), false, false, "", $js);
+page(_($help_context = "Customer Payment Entry"), false, false, "", $js);
 
 //----------------------------------------------------------------------------------------------
 
@@ -109,11 +109,13 @@ function can_process()
                set_focus('charge');
                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))
@@ -141,7 +143,11 @@ function can_process()
        }
 
        $_SESSION['alloc']->amount = input_num('amount');
-       return check_allocations();
+
+       if (isset($_POST["TotalNumberOfAllocs"]))
+               return check_allocations();
+       else
+               return true;
 }
 
 //----------------------------------------------------------------------------------------------
@@ -194,19 +200,11 @@ function read_customer_data()
 {
        global $Refs;
 
-       $sql = "SELECT ".TB_PREF."debtors_master.pymt_discount,
-               ".TB_PREF."credit_status.dissallow_invoices
-               FROM ".TB_PREF."debtors_master, ".TB_PREF."credit_status
-               WHERE ".TB_PREF."debtors_master.credit_status = ".TB_PREF."credit_status.id
-                       AND ".TB_PREF."debtors_master.debtor_no = '" . $_POST['customer_id'] . "'";
-
-       $result = db_query($sql, "could not query customers");
-
-       $myrow = db_fetch($result);
+       $myrow = get_customer_habit($_POST['customer_id']);
 
        $_POST['HoldAccount'] = $myrow["dissallow_invoices"];
        $_POST['pymt_discount'] = $myrow["pymt_discount"];
-       $_POST['ref'] = $Refs->get_next(12);
+       $_POST['ref'] = $Refs->get_next(ST_CUSTPAYMENT);
 }
 
 //----------------------------------------------------------------------------------------------