fixup commit for tag 'version_2_3_1'

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

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index 7170d4fdd9ee07433f43f7def08d373cb3be9b11..b67df99c774a1b3c06c22e2dd64faab2879c7ed9 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) {
@@ -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();
 }
 
 //----------------------------------------------------------------------------------------------
@@ -76,6 +78,20 @@ function can_process()
 {
        global $Refs;
 
+       if (!get_post('customer_id')) 
+       {
+               display_error(_("There is no customer selected."));
+               set_focus('customer_id');
+               return false;
+       } 
+       
+       if (!get_post('BranchID')) 
+       {
+               display_error(_("This customer has no branch defined."));
+               set_focus('BranchID');
+               return false;
+       } 
+       
        if (!isset($_POST['DateBanked']) || !is_date($_POST['DateBanked'])) {
                display_error(_("The entered date is invalid. Please enter a valid date for the payment."));
                set_focus('DateBanked');
@@ -136,7 +152,8 @@ function can_process()
                return false;
        }
 
-       if ((input_num('amount') - input_num('discount') <= 0)) {
+       //if ((input_num('amount') - input_num('discount') <= 0)) {
+       if (input_num('amount') <= 0) {
                display_error(_("The balance of the amount and discout is zero or negative. Please enter valid amounts."));
                set_focus('discount');
                return false;
@@ -200,26 +217,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 = ".db_escape($_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);
@@ -272,7 +281,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');