X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_inquiry.php;h=9fdd02761272c5336dff8818fd62a6dbd49634bd;hb=2e570d1c62dd7775213cfffe3cf1ab186b94117f;hp=85a8d70da85f158148da96426edd489406d5fb14;hpb=05f0481e5264c2a9154297adec74b4a64259e562;p=fa-stable.git diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php index 85a8d70d..9fdd0276 100644 --- a/sales/inquiry/customer_inquiry.php +++ b/sales/inquiry/customer_inquiry.php @@ -9,22 +9,24 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 1; -$path_to_root="../.."; -include($path_to_root . "/includes/db_pager.inc"); +$page_security = 'SA_SALESTRANSVIEW'; +$path_to_root = "../.."; +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"); include_once($path_to_root . "/sales/includes/sales_db.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); -$js = ""; -if ($use_popup_windows) - $js .= get_js_open_window(900, 500); -if ($use_date_picker) - $js .= get_js_date_picker(); -page(_("Customer Transactions"), false, false, "", $js); - +if (!@$_GET['popup']) +{ + $js = ""; + if ($use_popup_windows) + $js .= get_js_open_window(900, 500); + if ($use_date_picker) + $js .= get_js_date_picker(); + page(_($help_context = "Customer Transactions"), isset($_GET['customer_id']), false, "", $js); +} if (isset($_GET['customer_id'])) { @@ -33,36 +35,36 @@ if (isset($_GET['customer_id'])) //------------------------------------------------------------------------------------------------ -start_form(); +if (!@$_GET['popup']) + 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 (!@$_GET['popup']) + customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, !@$_GET['popup']); date_cells(_("From:"), 'TransAfterDate', '', null, -30); -date_cells(_("To:"), 'TransToDate', '', null, 1); +date_cells(_("To:"), 'TransToDate', '', null); if (!isset($_POST['filterType'])) $_POST['filterType'] = 0; cust_allocations_list_cells(null, 'filterType', $_POST['filterType'], true); -submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true); +submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default'); end_row(); end_table(); -end_form(); + 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 +76,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); @@ -94,7 +96,7 @@ function display_customer_summary($customer_record) //------------------------------------------------------------------------------------------------ div_start('totals_tbl'); -if ($_POST['customer_id'] != "" && $_POST['customer_id'] != reserved_words::get_all()) +if ($_POST['customer_id'] != "" && $_POST['customer_id'] != ALL_TEXT) { $customer_record = get_customer_details($_POST['customer_id'], $_POST['TransToDate']); display_customer_summary($customer_record); @@ -110,13 +112,15 @@ if(get_post('RefreshInquiry')) function systype_name($dummy, $type) { - return systypes::name($type); + global $systypes_array; + + return $systypes_array[$type]; } function order_view($row) { return $row['order_']>0 ? - get_customer_trans_view_str(systypes::sales_order(), $row['order_']) + get_customer_trans_view_str(ST_SALESORDER, $row['order_']) : ""; } @@ -127,7 +131,7 @@ function trans_view($trans) function due_date($row) { - return $row["type"] == 10 ? $row["due_date"] : ''; + return $row["type"] == ST_SALESINVOICE ? $row["due_date"] : ''; } function gl_view($row) @@ -138,7 +142,7 @@ function gl_view($row) function fmt_debit($row) { $value = - $row['type']==11 || $row['type']==12 || $row['type']==2 ? + $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT ? -$row["TotalAmount"] : $row["TotalAmount"]; return $value>=0 ? price_format($value) : ''; @@ -147,123 +151,64 @@ function fmt_debit($row) function fmt_credit($row) { $value = - !($row['type']==11 || $row['type']==12 || $row['type']==2) ? + !($row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT) ? -$row["TotalAmount"] : $row["TotalAmount"]; return $value>0 ? price_format($value) : ''; } function credit_link($row) { - return $row['type'] == 10 && $row["TotalAmount"] - $row["Allocated"] > 0 ? - pager_link(_("Credit This"), - "/sales/customer_credit_invoice.php?InvoiceNumber=". - $row['trans_no'], ICON_CREDIT) - : ''; + if (@$_GET['popup']) + 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) { - $str = ''; + if (@$_GET['popup'] || get_voided_entry($row['type'], $row["trans_no"]) || is_closed_trans($row['type'], $row["trans_no"])) + return ''; + $str = ''; switch($row['type']) { - case 10: - if (get_voided_entry(10, $row["trans_no"]) === false && $row['Allocated'] == 0) + case ST_SALESINVOICE: $str = "/sales/customer_invoice.php?ModifyInvoice=".$row['trans_no']; break; - case 11: - if (get_voided_entry(11, $row["trans_no"]) === false && $row['Allocated'] == 0) // 2008-11-19 Joe Hunt - { + case ST_CUSTCREDIT: 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 13: - if (get_voided_entry(13, $row["trans_no"]) === false) + case ST_CUSTDELIVERY: $str = "/sales/customer_delivery.php?ModifyDelivery=".$row['trans_no']; break; + case ST_CUSTPAYMENT: + $str = "/sales/customer_payments.php?trans_no=".$row['trans_no']; + break; } - if ($str != "") - return pager_link(_('Edit'), $str, ICON_EDIT); - return ''; + + return $str ? pager_link(_('Edit'), $str, ICON_EDIT) : ''; } function prt_link($row) { - if ($row['type'] != 12 && $row['type'] != 2) // customer payment or bank deposit printout not defined yet. - return print_document_link($row['trans_no'], _("Print"), true, $row['type'], ICON_PRINT); + 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, - @bal := @bal+trans.ov_amount, - (trans.ov_amount + trans.ov_gst + trans.ov_freight - + trans.ov_freight_tax + trans.ov_discount) AS TotalAmount, - trans.alloc AS Allocated, - ((trans.type = 10) - 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'] != reserved_words::get_all()) - $sql .= " AND trans.debtor_no = '" . $_POST['customer_id'] . "'"; - - if ($_POST['filterType'] != reserved_words::get_all()) - { - if ($_POST['filterType'] == '1') - { - $sql .= " AND (trans.type = 10 OR trans.type = 1) "; - } - elseif ($_POST['filterType'] == '2') - { - $sql .= " AND (trans.type = 10) "; - } - elseif ($_POST['filterType'] == '3') - { - $sql .= " AND (trans.type = " . systypes::cust_payment() - ." OR trans.type = 2) "; - } - elseif ($_POST['filterType'] == '4') - { - $sql .= " AND trans.type = 11 "; - } - elseif ($_POST['filterType'] == '5') - { - $sql .= " AND trans.type = 13 "; - } - - 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(); //------------------------------------------------------------------------------------------------ db_query("set @bal:=0"); @@ -278,34 +223,33 @@ $cols = array( _("Customer") => array('ord'=>''), _("Branch") => array('ord'=>''), _("Currency") => array('align'=>'center'), - _("RB"), _("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), _("Credit") => array('align'=>'right','insert'=>true, 'fun'=>'fmt_credit'), + _("RB") => array('align'=>'right', 'type'=>'amount'), array('insert'=>true, 'fun'=>'gl_view'), array('insert'=>true, 'fun'=>'credit_link'), array('insert'=>true, 'fun'=>'edit_link'), array('insert'=>true, 'fun'=>'prt_link') ); -if ($_POST['customer_id'] != reserved_words::get_all()) { + +if ($_POST['customer_id'] != ALL_TEXT) { $cols[_("Customer")] = 'skip'; $cols[_("Currency")] = 'skip'; } - +if ($_POST['filterType'] == ALL_TEXT) + $cols[_("RB")] = 'skip'; $table =& new_db_pager('trans_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked items are overdue.")); -if (get_post('RefreshInquiry')) { - $table->set_sql($sql); - $table->set_columns($cols); -} $table->width = "85%"; -start_form(); display_db_pager($table); -end_form(); -end_page(); - +if (!@$_GET['popup']) +{ + end_form(); + end_page(@$_GET['popup'], false, false); +} ?>