X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_inquiry.php;h=7a1cc62b1853c1983a51665024f5b12e87762ed9;hb=27d2650c63d4c853054945938251bfe884faed74;hp=426e135b8f0156894b69ab691855fcdb39d8a5c3;hpb=a3c366442e07bfa82a326df8fea3d9d4b35a3dd8;p=fa-stable.git diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php index 426e135b..7a1cc62b 100644 --- a/sales/inquiry/customer_inquiry.php +++ b/sales/inquiry/customer_inquiry.php @@ -11,7 +11,7 @@ ***********************************************************************/ $page_security = 'SA_SALESTRANSVIEW'; $path_to_root = "../.."; -include($path_to_root . "/includes/db_pager.inc"); +include_once($path_to_root . "/includes/db_pager.inc"); include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/sales/includes/sales_ui.inc"); @@ -19,12 +19,11 @@ 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"), false, false, "", $js); - +page(_($help_context = "Customer Transactions"), isset($_GET['customer_id']), false, "", $js); if (isset($_GET['customer_id'])) { @@ -38,13 +37,14 @@ start_form(); if (!isset($_POST['customer_id'])) $_POST['customer_id'] = get_global_customer(); -start_table("class='tablestyle_noborder'"); +start_table(TABLESTYLE_NOBORDER); start_row(); -customer_list_cells(_("Select a customer: "), 'customer_id', null, true); +if (!$page_nested) + customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, true); -date_cells(_("From:"), 'TransAfterDate', '', null, -30); -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; @@ -61,8 +61,6 @@ set_global_customer($_POST['customer_id']); function display_customer_summary($customer_record) { - global $table_style; - $past1 = get_company_pref('past_due_days'); $past2 = 2 * $past1; if ($customer_record["dissallow_invoices"] != 0) @@ -74,7 +72,7 @@ function display_customer_summary($customer_record) $pastdue1 = $past1 + 1 . "-" . $past2 . " " . _('Days'); $pastdue2 = _('Over') . " " . $past2 . " " . _('Days'); - start_table("width=80% $table_style"); + start_table(TABLESTYLE, "width='80%'"); $th = array(_("Currency"), _("Terms"), _("Current"), $nowdue, $pastdue1, $pastdue2, _("Total Balance")); table_header($th); @@ -137,143 +135,55 @@ 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) { - return $row['type'] == ST_SALESINVOICE && $row["TotalAmount"] - $row["Allocated"] > 0 ? - pager_link(_("Credit This"), - "/sales/customer_credit_invoice.php?InvoiceNumber=". - $row['trans_no'], ICON_CREDIT) - : ''; + global $page_nested; + + 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):''; } function edit_link($row) { + global $page_nested; + $str = ''; + if ($page_nested) + return ''; - switch($row['type']) { - case ST_SALESINVOICE: - if (get_voided_entry(ST_SALESINVOICE, $row["trans_no"]) === false && $row['Allocated'] == 0) - $str = "/sales/customer_invoice.php?ModifyInvoice=".$row['trans_no']; - break; - case ST_CUSTCREDIT: - if (get_voided_entry(ST_CUSTCREDIT, $row["trans_no"]) === false && $row['Allocated'] == 0) // 2008-11-19 Joe Hunt - { - 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: - if (get_voided_entry(ST_CUSTDELIVERY, $row["trans_no"]) === false) - $str = "/sales/customer_delivery.php?ModifyDelivery=".$row['trans_no']; - break; - } - if ($str != "" && !is_closed_trans($row['type'], $row["trans_no"])) - return pager_link(_('Edit'), $str, ICON_EDIT); - return ''; + 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) { - if ($row['type'] != ST_CUSTPAYMENT && $row['type'] != ST_BANKDEPOSIT) // customer payment or bank deposit printout not defined yet. - return print_document_link($row['trans_no']."-".$row['type'], _("Print"), true, $row['type'], ICON_PRINT); - else + 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 - && (abs($row["TotalAmount"]) - $row["Allocated"] != 0); + && floatcmp($row["TotalAmount"], $row["Allocated"]) != 0; } //------------------------------------------------------------------------------------------------ - $date_after = date2sql($_POST['TransAfterDate']); - $date_to = date2sql($_POST['TransToDate']); - - $sql = "SELECT - trans.type, - trans.trans_no, - trans.order_, - trans.reference, - trans.tran_date, - trans.due_date, - debtor.name, - branch.br_name, - debtor.curr_code, - (trans.ov_amount + trans.ov_gst + trans.ov_freight - + trans.ov_freight_tax + trans.ov_discount) AS TotalAmount, "; - if ($_POST['filterType'] != ALL_TEXT) - $sql .= "@bal := @bal+(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount), "; - -// else -// $sql .= "IF(trans.type=".ST_CUSTDELIVERY.",'', IF(trans.type=".ST_SALESINVOICE." OR trans.type=".ST_BANKPAYMENT.",@bal := @bal+ -// (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount), @bal := @bal- -// (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount))) , "; - $sql .= "trans.alloc AS Allocated, - ((trans.type = ".ST_SALESINVOICE.") - AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue - FROM " - .TB_PREF."debtor_trans as trans, " - .TB_PREF."debtors_master as debtor, " - .TB_PREF."cust_branch as branch - WHERE debtor.debtor_no = trans.debtor_no - AND trans.tran_date >= '$date_after' - AND trans.tran_date <= '$date_to' - AND trans.branch_code = branch.branch_code"; - - if ($_POST['customer_id'] != ALL_TEXT) - $sql .= " AND trans.debtor_no = ".db_escape($_POST['customer_id']); - - if ($_POST['filterType'] != ALL_TEXT) - { - if ($_POST['filterType'] == '1') - { - $sql .= " AND (trans.type = ".ST_SALESINVOICE." OR trans.type = ".ST_BANKPAYMENT.") "; - } - elseif ($_POST['filterType'] == '2') - { - $sql .= " AND (trans.type = ".ST_SALESINVOICE.") "; - } - elseif ($_POST['filterType'] == '3') - { - $sql .= " AND (trans.type = " . ST_CUSTPAYMENT - ." OR trans.type = ".ST_BANKDEPOSIT.") "; - } - elseif ($_POST['filterType'] == '4') - { - $sql .= " AND trans.type = ".ST_CUSTCREDIT." "; - } - elseif ($_POST['filterType'] == '5') - { - $sql .= " AND trans.type = ".ST_CUSTDELIVERY." "; - } - - if ($_POST['filterType'] == '2') - { - $today = date2sql(Today()); - $sql .= " AND trans.due_date < '$today' - AND (trans.ov_amount + trans.ov_gst + trans.ov_freight_tax + - trans.ov_freight + trans.ov_discount - trans.alloc > 0) "; - } - } +$sql = get_sql_for_customer_inquiry(get_post('TransAfterDate'), get_post('TransToDate'), + get_post('customer_id'), get_post('filterType')); //------------------------------------------------------------------------------------------------ db_query("set @bal:=0"); @@ -288,8 +198,7 @@ $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'), + _("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'), @@ -314,5 +223,3 @@ display_db_pager($table); end_form(); end_page(); - -?>