X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_inquiry.php;h=f9744d0168c15e184c3d0428e63b90e45d35d9b0;hb=7561718ee5113232ce917f63085d272884b0929c;hp=86b965881f6ef4bdb677a816b2c7c0c9645296f6;hpb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;p=fa-stable.git diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php index 86b96588..f9744d01 100644 --- a/sales/inquiry/customer_inquiry.php +++ b/sales/inquiry/customer_inquiry.php @@ -19,9 +19,9 @@ 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); @@ -43,7 +43,7 @@ start_row(); if (!$page_nested) customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, !@$_GET['popup']); -date_cells(_("From:"), 'TransAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); +date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days()); date_cells(_("To:"), 'TransToDate', '', null, 1); if (!isset($_POST['filterType'])) @@ -155,7 +155,7 @@ function fmt_credit($row) function credit_link($row) { global $page_nested; - + if ($page_nested) return ''; return $row['type'] == ST_SALESINVOICE && $row["Outstanding"] > 0 ? @@ -171,8 +171,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 +181,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,7 +191,8 @@ 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"); @@ -232,4 +233,3 @@ display_db_pager($table); end_form(); end_page(); -?>