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 6c9a97cc1b4796df0debb90629ac59a8b890ef12..eb98d3dad278b040f247b8df3a2f75d7d4dd7bb7 100644 (file)
@@ -18,49 +18,90 @@ include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
-if (!@$_GET['popup'])
+$js = "";
+if ($SysPrefs->use_popup_windows)
+       $js .= get_js_open_window(900, 500);
+if (user_use_date_picker())
+       $js .= get_js_date_picker();
+page(_($help_context = "Customer Transactions"), isset($_GET['customer_id']), false, "", $js);
+
+//------------------------------------------------------------------------------------------------
+
+function systype_name($dummy, $type)
 {
-       $js = "";
-       if ($use_popup_windows)
-               $js .= get_js_open_window(900, 500);
-       if ($use_date_picker)
-               $js .= get_js_date_picker();
-       page(_($help_context = "Customer Transactions"), isset($_GET['customer_id']), false, "", $js);
+       global $systypes_array;
+
+       return $systypes_array[$type];
 }
 
-if (isset($_GET['customer_id']))
+function order_view($row)
 {
-       $_POST['customer_id'] = $_GET['customer_id'];
+       return $row['order_']>0 ?
+               get_customer_trans_view_str(ST_SALESORDER, $row['order_'])
+               : "";
 }
 
-//------------------------------------------------------------------------------------------------
+function trans_view($trans)
+{
+       return get_trans_view_str($trans["type"], $trans["trans_no"]);
+}
 
-if (!@$_GET['popup'])
-       start_form();
+function due_date($row)
+{
+       return  $row["type"] == ST_SALESINVOICE ? $row["due_date"] : '';
+}
 
-if (!isset($_POST['customer_id']))
-       $_POST['customer_id'] = get_global_customer();
+function gl_view($row)
+{
+       return get_gl_view_str($row["type"], $row["trans_no"]);
+}
 
-start_table(TABLESTYLE_NOBORDER);
-start_row();
+function fmt_amount($row)
+{
+       $value =
+           $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT ?
+               -$row["TotalAmount"] : $row["TotalAmount"];
+    return price_format($value);
+}
 
-if (!@$_GET['popup'])
-       customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, !@$_GET['popup']);
+function credit_link($row)
+{
+       global $page_nested;
 
-date_cells(_("From:"), 'TransAfterDate', '', null, -30);
-date_cells(_("To:"), 'TransToDate', '', null, 1);
+       if ($page_nested)
+               return '';
+       return $row['type'] == ST_SALESINVOICE && $row["Outstanding"] > 0 ?
+               pager_link(_("Credit This") ,
+                       "/sales/customer_credit_invoice.php?InvoiceNumber=". $row['trans_no'], ICON_CREDIT):'';
+}
 
-if (!isset($_POST['filterType']))
-       $_POST['filterType'] = 0;
+function edit_link($row)
+{
+       global $page_nested;
 
-cust_allocations_list_cells(null, 'filterType', $_POST['filterType'], true);
+       $str = '';
+       if ($page_nested)
+               return '';
 
-submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
-end_row();
-end_table();
+       return $row['type'] == ST_CUSTCREDIT && $row['order_'] ? '' :   // allow  only free hand credit notes edition
+                       trans_editor_link($row['type'], $row['trans_no']);
+}
 
-set_global_customer($_POST['customer_id']);
+function prt_link($row)
+{
+       if ($row['type'] == ST_CUSTPAYMENT || $row['type'] == ST_BANKDEPOSIT) 
+               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
+               return print_document_link($row['trans_no']."-".$row['type'], _("Print"), true, $row['type'], ICON_PRINT);
+}
 
+function check_overdue($row)
+{
+       return $row['OverDue'] == 1
+               && floatcmp($row["TotalAmount"], $row["Allocated"]) != 0;
+}
 //------------------------------------------------------------------------------------------------
 
 function display_customer_summary($customer_record)
@@ -76,7 +117,7 @@ function display_customer_summary($customer_record)
        $pastdue1 = $past1 + 1 . "-" . $past2 . " " . _('Days');
        $pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
 
-    start_table(TABLESTYLE, "width=80%");
+    start_table(TABLESTYLE, "width='80%'");
     $th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
        $pastdue1, $pastdue2, _("Total Balance"));
     table_header($th);
@@ -93,139 +134,74 @@ function display_customer_summary($customer_record)
 
        end_table();
 }
-//------------------------------------------------------------------------------------------------
 
-div_start('totals_tbl');
-if ($_POST['customer_id'] != "" && $_POST['customer_id'] != ALL_TEXT)
+if (isset($_GET['customer_id']))
 {
-       $customer_record = get_customer_details($_POST['customer_id'], $_POST['TransToDate']);
-    display_customer_summary($customer_record);
-    echo "<br>";
+       $_POST['customer_id'] = $_GET['customer_id'];
 }
-div_end();
 
-if(get_post('RefreshInquiry'))
-{
-       $Ajax->activate('totals_tbl');
-}
 //------------------------------------------------------------------------------------------------
 
-function systype_name($dummy, $type)
-{
-       global $systypes_array;
-
-       return $systypes_array[$type];
-}
-
-function order_view($row)
-{
-       return $row['order_']>0 ?
-               get_customer_trans_view_str(ST_SALESORDER, $row['order_'])
-               : "";
-}
-
-function trans_view($trans)
-{
-       return get_trans_view_str($trans["type"], $trans["trans_no"]);
-}
+start_form();
 
-function due_date($row)
-{
-       return  $row["type"] == ST_SALESINVOICE ? $row["due_date"] : '';
-}
+if (!isset($_POST['customer_id']))
+       $_POST['customer_id'] = get_global_customer();
 
-function gl_view($row)
-{
-       return get_gl_view_str($row["type"], $row["trans_no"]);
-}
+start_table(TABLESTYLE_NOBORDER);
+start_row();
 
-function fmt_debit($row)
-{
-       $value =
-           $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT ?
-               -$row["TotalAmount"] : $row["TotalAmount"];
-       return $value>=0 ? price_format($value) : '';
+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);
 
-function fmt_credit($row)
+if ($_POST['filterType'] != '2')
 {
-       $value =
-           !($row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT) ?
-               -$row["TotalAmount"] : $row["TotalAmount"];
-       return $value>0 ? price_format($value) : '';
+       date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
+       date_cells(_("To:"), 'TransToDate', '', null);
 }
+check_cells(_("Zero values"), 'show_voided');
 
-function credit_link($row)
-{
-       if (@$_GET['popup'])
-               return '';
-       return $row['type'] == ST_SALESINVOICE && $row["Outstanding"] > 0 ?
-               pager_link(_("Credit This") ,
-                       "/sales/customer_credit_invoice.php?InvoiceNumber=". $row['trans_no'], ICON_CREDIT):'';
-}
+submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
+end_row();
+end_table();
 
-function edit_link($row)
-{
-       if (@$_GET['popup'] || get_voided_entry($row['type'], $row["trans_no"]) || is_closed_trans($row['type'], $row["trans_no"]))
-               return '';
+set_global_customer($_POST['customer_id']);
 
-       $str = '';
-       switch($row['type']) {
-               case ST_SALESINVOICE:
-                       $str = "/sales/customer_invoice.php?ModifyInvoice=".$row['trans_no'];
-               break;
-               case ST_CUSTCREDIT:
-                       if ($row['order_']==0) // free-hand credit note
-                           $str = "/sales/credit_note_entry.php?ModifyCredit=".$row['trans_no'];
-                       else    // credit invoice
-                           $str = "/sales/customer_credit_invoice.php?ModifyCredit=".$row['trans_no'];
-               break;
-               case ST_CUSTDELIVERY:
-                       $str = "/sales/customer_delivery.php?ModifyDelivery=".$row['trans_no'];
-               break;
-               case ST_CUSTPAYMENT:
-                       $str = "/sales/customer_payments.php?trans_no=".$row['trans_no'];
-               break;
-       }
-
-       return $str ? pager_link(_('Edit'), $str, ICON_EDIT) : '';
-}
+//------------------------------------------------------------------------------------------------
 
-function prt_link($row)
+div_start('totals_tbl');
+if ($_POST['customer_id'] != "" && $_POST['customer_id'] != ALL_TEXT)
 {
-       if ($row['type'] == ST_CUSTPAYMENT || $row['type'] == ST_BANKDEPOSIT) 
-               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    
-               return print_document_link($row['trans_no']."-".$row['type'], _("Print"), true, $row['type'], ICON_PRINT);
+       $customer_record = get_customer_details(get_post('customer_id'), get_post('TransToDate'));
+    display_customer_summary($customer_record);
+    echo "<br>";
 }
+div_end();
 
-function check_overdue($row)
+if (get_post('RefreshInquiry') || list_updated('filterType'))
 {
-       return $row['OverDue'] == 1
-               && floatcmp($row["TotalAmount"], $row["Allocated"]) != 0;
+       $Ajax->activate('_page_body');
 }
 //------------------------------------------------------------------------------------------------
-$sql = get_sql_for_customer_inquiry();
+$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'),
@@ -237,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."));
@@ -247,9 +223,5 @@ $table->width = "85%";
 
 display_db_pager($table);
 
-if (!@$_GET['popup'])
-{
-       end_form();
-       end_page(@$_GET['popup'], false, false);
-}
-?>
+end_form();
+end_page();