Right align numbers in customer inquiry.

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

diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 720edc35bf4ffb3b0c477dc07ff60b134e17b26d..e93f1d4319863dff4ae6beb2029a47da1f51c113 100644 (file)
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -135,24 +135,14 @@ 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_JOURNAL ?
                -$row["TotalAmount"] : $row["TotalAmount"];
-       return $value>=0 ? price_format($value) : '';
-
+    return price_format($value);
 }
 
-function fmt_credit($row)
-{
-       $value =
-           !($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 credit_link($row)
 {
        global $page_nested;
@@ -196,21 +186,20 @@ $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'=>''),
-       _("#") => 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'), 
+//     _("RB") => array('align'=>'right', 'type'=>'amount'),
                array('insert'=>true, 'fun'=>'gl_view'),
                array('insert'=>true, 'fun'=>'credit_link'),
                array('insert'=>true, 'fun'=>'edit_link'),