Replaced the global variables for table styles to defined CSS classes.

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

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index 1dcce02d3f6411535da166cefaa7a279f6cea83f..e8b51f9943243ebe631d25d911cc5f3cc82f6d12 100644 (file)
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -19,6 +19,7 @@ include_once($path_to_root . "/includes/banking.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 //include_once($path_to_root . "/sales/includes/ui/cust_alloc_ui.inc");
+include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
 if ($use_popup_windows) {
@@ -29,7 +30,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);
 
 //----------------------------------------------------------------------------------------------
 
@@ -60,14 +61,15 @@ if (isset($_GET['AddedID'])) {
 
        display_notification_centered(_("The customer payment has been successfully entered."));
 
+       submenu_print(_("&Print This Receipt"), ST_CUSTPAYMENT, $payment_no."-".ST_CUSTPAYMENT, 'prtopt');
+
        display_note(get_gl_view_str(ST_CUSTPAYMENT, $payment_no, _("&View the GL Journal Entries for this Customer Payment")));
 
 //     hyperlink_params($path_to_root . "/sales/allocations/customer_allocate.php", _("&Allocate this Customer Payment"), "trans_no=$payment_no&trans_type=12");
 
        hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another &Customer Payment"));
-       br(1);
-       end_page();
-       exit;
+       
+       display_footer_exit();
 }
 
 //----------------------------------------------------------------------------------------------
@@ -109,11 +111,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 +145,11 @@ function can_process()
        }
 
        $_SESSION['alloc']->amount = input_num('amount');
-       return check_allocations();
+
+       if (isset($_POST["TotalNumberOfAllocs"]))
+               return check_allocations();
+       else
+               return true;
 }
 
 //----------------------------------------------------------------------------------------------
@@ -194,26 +202,18 @@ 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);
 }
 
 //----------------------------------------------------------------------------------------------
 
 start_form();
 
-       start_outer_table("$table_style2 width=60%", 5);
+       start_outer_table(TABLESTYLE2, "width=60%", 5);
        table_section(1);
 
        customer_list_row(_("From Customer:"), 'customer_id', null, false, true);
@@ -266,7 +266,7 @@ start_form();
                        div_end();
                }
 
-               start_table("$table_style width=60%");
+               start_table(TABLESTYLE, "width=60%");
 
                label_row(_("Customer prompt payment discount :"), $display_discount_percent);
                amount_row(_("Amount of Discount:"), 'discount');