Better sql construct in sales/includes/db/sales_order_db.inc

[fa-stable.git] / sales / inquiry / customer_inquiry.php

diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 5bdbe785e4b7f4fcee10767fc09fed31718d6a74..3c1ffd9594dfba71c60e9d44234b7a0971a7f697 100644 (file)
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -58,11 +58,6 @@ function gl_view($row)
 
 function fmt_amount($row)
 {
-       /*
-       $value =
-           $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT || 
-               ($row['type']==ST_JOURNAL && $row['TotalAmount'] < 0) ? -$row["TotalAmount"] : $row["TotalAmount"];
-       */      
        $value =
            $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT ? -$row["TotalAmount"] : $row["TotalAmount"];
     return price_format($value);
@@ -118,7 +113,7 @@ function display_customer_summary($customer_record)
 {
        $past1 = get_company_pref('past_due_days');
        $past2 = 2 * $past1;
-    if ($customer_record["dissallow_invoices"] != 0)
+    if ($customer_record && $customer_record["dissallow_invoices"] != 0)
     {
        echo "<center><font color=red size=4><b>" . _("CUSTOMER ACCOUNT IS ON HOLD") . "</font></b></center>";
     }
@@ -131,16 +126,18 @@ function display_customer_summary($customer_record)
     $th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
        $pastdue1, $pastdue2, _("Total Balance"));
     table_header($th);
-
-       start_row();
-    label_cell($customer_record["curr_code"]);
-    label_cell($customer_record["terms"]);
-       amount_cell($customer_record["Balance"] - $customer_record["Due"]);
-       amount_cell($customer_record["Due"] - $customer_record["Overdue1"]);
-       amount_cell($customer_record["Overdue1"] - $customer_record["Overdue2"]);
-       amount_cell($customer_record["Overdue2"]);
-       amount_cell($customer_record["Balance"]);
-       end_row();
+    if ($customer_record != false)
+    {
+               start_row();
+           label_cell($customer_record["curr_code"]);
+           label_cell($customer_record["terms"]);
+               amount_cell($customer_record["Balance"] - $customer_record["Due"]);
+               amount_cell($customer_record["Due"] - $customer_record["Overdue1"]);
+               amount_cell($customer_record["Overdue1"] - $customer_record["Overdue2"]);
+               amount_cell($customer_record["Overdue2"]);
+               amount_cell($customer_record["Balance"]);
+               end_row();
+       }
 
        end_table();
 }
@@ -160,6 +157,8 @@ if (!isset($_POST['customer_id']))
 start_table(TABLESTYLE_NOBORDER);
 start_row();
 
+ref_cells(_("Reference:"), 'Ref', '', NULL, _('Enter reference fragment or leave empty'));
+
 if (!$page_nested)
        customer_list_cells(_("Select a customer: "), 'customer_id', null, true, true, false, true);
 
@@ -183,7 +182,7 @@ set_global_customer($_POST['customer_id']);
 div_start('totals_tbl');
 if ($_POST['customer_id'] != "" && $_POST['customer_id'] != ALL_TEXT)
 {
-       $customer_record = get_customer_details(get_post('customer_id'), get_post('TransToDate'));
+       $customer_record = get_customer_details(get_post('customer_id'), get_post('TransToDate'), false);
     display_customer_summary($customer_record);
     echo "<br>";
 }
@@ -195,7 +194,7 @@ if (get_post('RefreshInquiry') || list_updated('filterType'))
 }
 //------------------------------------------------------------------------------------------------
 $sql = get_sql_for_customer_inquiry(get_post('TransAfterDate'), get_post('TransToDate'),
-       get_post('customer_id'), get_post('filterType'), check_value('show_voided'));
+       get_post('customer_id'), get_post('filterType'), check_value('show_voided'), get_post('Ref'));
 
 //------------------------------------------------------------------------------------------------
 //db_query("set @bal:=0");