A bug in Customer Allocations fixed.

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

diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 4356121379971c0cb2bc167657ab9162d08fb5aa..184e7e3b21eb395f20c54ff0f58c88d9413667f6 100644 (file)
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -19,7 +19,7 @@ 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 (user_use_date_picker())
        $js .= get_js_date_picker();
@@ -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,27 +135,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 +162,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 +172,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 +182,24 @@ function check_overdue($row)
                && floatcmp($row["TotalAmount"], $row["Allocated"]) != 0;
 }
 //------------------------------------------------------------------------------------------------
-$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'));
 
 //------------------------------------------------------------------------------------------------
-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'),
@@ -232,4 +223,3 @@ display_db_pager($table);
 
 end_form();
 end_page();
-?>