2.4.4 no Longer Displays 0.00 Sales Invoices in customer_inquiry.php. Fixed. $Braath...
[fa-stable.git] / sales / inquiry / customer_inquiry.php
index d8a000c1866431d7d4ba3fc857adfe104a9b805f..eb98d3dad278b040f247b8df3a2f75d7d4dd7bb7 100644 (file)
@@ -19,91 +19,12 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 page(_($help_context = "Customer Transactions"), isset($_GET['customer_id']), false, "", $js);
 
-if (isset($_GET['customer_id']))
-{
-       $_POST['customer_id'] = $_GET['customer_id'];
-}
-
-//------------------------------------------------------------------------------------------------
-
-start_form();
-
-if (!isset($_POST['customer_id']))
-       $_POST['customer_id'] = get_global_customer();
-
-start_table(TABLESTYLE_NOBORDER);
-start_row();
-
-if (!$page_nested)
-       customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, !@$_GET['popup']);
-
-date_cells(_("From:"), 'TransAfterDate', '', null, -30);
-date_cells(_("To:"), 'TransToDate', '', null, 1);
-
-if (!isset($_POST['filterType']))
-       $_POST['filterType'] = 0;
-
-cust_allocations_list_cells(null, 'filterType', $_POST['filterType'], true);
-
-submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
-end_row();
-end_table();
-
-set_global_customer($_POST['customer_id']);
-
-//------------------------------------------------------------------------------------------------
-
-function display_customer_summary($customer_record)
-{
-       $past1 = get_company_pref('past_due_days');
-       $past2 = 2 * $past1;
-    if ($customer_record["dissallow_invoices"] != 0)
-    {
-       echo "<center><font color=red size=4><b>" . _("CUSTOMER ACCOUNT IS ON HOLD") . "</font></b></center>";
-    }
-
-       $nowdue = "1-" . $past1 . " " . _('Days');
-       $pastdue1 = $past1 + 1 . "-" . $past2 . " " . _('Days');
-       $pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
-
-    start_table(TABLESTYLE, "width=80%");
-    $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();
-
-       end_table();
-}
-//------------------------------------------------------------------------------------------------
-
-div_start('totals_tbl');
-if ($_POST['customer_id'] != "" && $_POST['customer_id'] != ALL_TEXT)
-{
-       $customer_record = get_customer_details($_POST['customer_id'], $_POST['TransToDate']);
-    display_customer_summary($customer_record);
-    echo "<br>";
-}
-div_end();
-
-if(get_post('RefreshInquiry'))
-{
-       $Ajax->activate('totals_tbl');
-}
 //------------------------------------------------------------------------------------------------
 
 function systype_name($dummy, $type)
@@ -135,27 +56,18 @@ function gl_view($row)
        return get_gl_view_str($row["type"], $row["trans_no"]);
 }
 
-function fmt_debit($row)
+function fmt_amount($row)
 {
        $value =
            $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT ?
                -$row["TotalAmount"] : $row["TotalAmount"];
-       return $value>=0 ? price_format($value) : '';
-
-}
-
-function fmt_credit($row)
-{
-       $value =
-           !($row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT) ?
-               -$row["TotalAmount"] : $row["TotalAmount"];
-       return $value>0 ? price_format($value) : '';
+    return price_format($value);
 }
 
 function credit_link($row)
 {
        global $page_nested;
-       
+
        if ($page_nested)
                return '';
        return $row['type'] == ST_SALESINVOICE && $row["Outstanding"] > 0 ?
@@ -171,8 +83,8 @@ function edit_link($row)
        if ($page_nested)
                return '';
 
-       return edit_trans_link($row['type'], $row['trans_no'], $row['type']==ST_CUSTCREDIT && $row['order_']==0 ?
-               "/sales/credit_note_entry.php?ModifyCredit=%d" : 0);
+       return $row['type'] == ST_CUSTCREDIT && $row['order_'] ? '' :   // allow  only free hand credit notes edition
+                       trans_editor_link($row['type'], $row['trans_no']);
 }
 
 function prt_link($row)
@@ -181,7 +93,7 @@ function prt_link($row)
                return print_document_link($row['trans_no']."-".$row['type'], _("Print Receipt"), true, ST_CUSTPAYMENT, ICON_PRINT);
        elseif ($row['type'] == ST_BANKPAYMENT) // bank payment printout not defined yet.
                return '';
-       else    
+       else
                return print_document_link($row['trans_no']."-".$row['type'], _("Print"), true, $row['type'], ICON_PRINT);
 }
 
@@ -191,24 +103,105 @@ function check_overdue($row)
                && floatcmp($row["TotalAmount"], $row["Allocated"]) != 0;
 }
 //------------------------------------------------------------------------------------------------
-$sql = get_sql_for_customer_inquiry();
+
+function display_customer_summary($customer_record)
+{
+       $past1 = get_company_pref('past_due_days');
+       $past2 = 2 * $past1;
+    if ($customer_record["dissallow_invoices"] != 0)
+    {
+       echo "<center><font color=red size=4><b>" . _("CUSTOMER ACCOUNT IS ON HOLD") . "</font></b></center>";
+    }
+
+       $nowdue = "1-" . $past1 . " " . _('Days');
+       $pastdue1 = $past1 + 1 . "-" . $past2 . " " . _('Days');
+       $pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
+
+    start_table(TABLESTYLE, "width='80%'");
+    $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();
+
+       end_table();
+}
+
+if (isset($_GET['customer_id']))
+{
+       $_POST['customer_id'] = $_GET['customer_id'];
+}
+
+//------------------------------------------------------------------------------------------------
+
+start_form();
+
+if (!isset($_POST['customer_id']))
+       $_POST['customer_id'] = get_global_customer();
+
+start_table(TABLESTYLE_NOBORDER);
+start_row();
+
+if (!$page_nested)
+       customer_list_cells(_("Select a customer: "), 'customer_id', null, true, true, false, true);
+
+cust_allocations_list_cells(null, 'filterType', null, true, true);
+
+if ($_POST['filterType'] != '2')
+{
+       date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
+       date_cells(_("To:"), 'TransToDate', '', null);
+}
+check_cells(_("Zero values"), 'show_voided');
+
+submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
+end_row();
+end_table();
+
+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'));
+    display_customer_summary($customer_record);
+    echo "<br>";
+}
+div_end();
+
+if (get_post('RefreshInquiry') || list_updated('filterType'))
+{
+       $Ajax->activate('_page_body');
+}
+//------------------------------------------------------------------------------------------------
+$sql = get_sql_for_customer_inquiry(get_post('TransAfterDate'), get_post('TransToDate'),
+       get_post('customer_id'), get_post('filterType'), check_value('show_voided'));
 
 //------------------------------------------------------------------------------------------------
-db_query("set @bal:=0");
+//db_query("set @bal:=0");
 
 $cols = array(
        _("Type") => array('fun'=>'systype_name', 'ord'=>''),
-       _("#") => array('fun'=>'trans_view', 'ord'=>''),
-       _("Order") => array('fun'=>'order_view'), 
+       _("#") => array('fun'=>'trans_view', 'ord'=>'', 'align'=>'right'),
+       _("Order") => array('fun'=>'order_view', 'align'=>'right'), 
        _("Reference"), 
        _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'desc'),
        _("Due Date") => array('type'=>'date', 'fun'=>'due_date'),
        _("Customer") => array('ord'=>''), 
        _("Branch") => array('ord'=>''), 
        _("Currency") => array('align'=>'center'),
-       _("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), 
-       _("Credit") => array('align'=>'right','insert'=>true, 'fun'=>'fmt_credit'), 
-       _("RB") => array('align'=>'right', 'type'=>'amount'),
+       _("Amount") => array('align'=>'right', 'fun'=>'fmt_amount'), 
+       _("Balance") => array('align'=>'right', 'type'=>'amount'),
                array('insert'=>true, 'fun'=>'gl_view'),
                array('insert'=>true, 'fun'=>'credit_link'),
                array('insert'=>true, 'fun'=>'edit_link'),
@@ -220,8 +213,8 @@ if ($_POST['customer_id'] != ALL_TEXT) {
        $cols[_("Customer")] = 'skip';
        $cols[_("Currency")] = 'skip';
 }
-if ($_POST['filterType'] == ALL_TEXT)
-       $cols[_("RB")] = 'skip';
+if ($_POST['filterType'] != '2')
+       $cols[_("Balance")] = 'skip';
 
 $table =& new_db_pager('trans_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
@@ -232,4 +225,3 @@ display_db_pager($table);
 
 end_form();
 end_page();
-?>