0003954: RB not correct in Customer Transactions Inquiry. Removed RB from customer...

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

diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 34b06832e0e292aeb95642afdd25c5ceb3faf95c..d6851aa027d473dad652b79910306dc0f12106b3 100644 (file)
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -41,10 +41,10 @@ start_table(TABLESTYLE_NOBORDER);
 start_row();
 
 if (!$page_nested)
-       customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, !@$_GET['popup']);
+       customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, true);
 
-date_cells(_("From:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
-date_cells(_("To:"), 'TransToDate', '', null, 1);
+date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
+date_cells(_("To:"), 'TransToDate', '', null);
 
 if (!isset($_POST['filterType']))
        $_POST['filterType'] = 0;
@@ -72,7 +72,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);
@@ -135,21 +135,12 @@ 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['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT || $row['type']==ST_JOURNAL ?
                -$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)
@@ -195,7 +186,7 @@ $sql = get_sql_for_customer_inquiry(get_post('TransAfterDate'), get_post('TransT
        get_post('customer_id'), get_post('filterType'));
 
 //------------------------------------------------------------------------------------------------
-db_query("set @bal:=0");
+//db_query("set @bal:=0");
 
 $cols = array(
        _("Type") => array('fun'=>'systype_name', 'ord'=>''),
@@ -207,9 +198,8 @@ $cols = array(
        _("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'), 
+//     _("RB") => array('align'=>'right', 'type'=>'amount'),
                array('insert'=>true, 'fun'=>'gl_view'),
                array('insert'=>true, 'fun'=>'credit_link'),
                array('insert'=>true, 'fun'=>'edit_link'),