X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_inquiry.php;h=8bd2d4c72babe5de35ba9bc3128b3de69be8fa9c;hb=8bd22b7671d18cfdf01b8a0f3f66455d5de28014;hp=aba3613593850c49b649cd2bedaf33d94c68b9b3;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php index aba36135..8bd2d4c7 100644 --- a/sales/inquiry/customer_inquiry.php +++ b/sales/inquiry/customer_inquiry.php @@ -23,7 +23,7 @@ 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); +page(_($help_context = "Customer Transactions"), false, false, "", $js); if (isset($_GET['customer_id'])) @@ -54,7 +54,7 @@ cust_allocations_list_cells(null, 'filterType', $_POST['filterType'], true); submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default'); end_row(); end_table(); -end_form(); + set_global_customer($_POST['customer_id']); //------------------------------------------------------------------------------------------------ @@ -94,7 +94,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 +110,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 +129,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 +140,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,14 +149,14 @@ 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 ? + 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) @@ -166,12 +168,12 @@ function edit_link($row) $str = ''; switch($row['type']) { - case 10: - if (get_voided_entry(10, $row["trans_no"]) === false && $row['Allocated'] == 0) + 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 11: - if (get_voided_entry(11, $row["trans_no"]) === false && $row['Allocated'] == 0) // 2008-11-19 Joe Hunt + 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']; @@ -179,8 +181,8 @@ function edit_link($row) $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: + if (get_voided_entry(ST_CUSTDELIVERY, $row["trans_no"]) === false) $str = "/sales/customer_delivery.php?ModifyDelivery=".$row['trans_no']; break; } @@ -191,8 +193,10 @@ function edit_link($row) 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) // 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 + return print_document_link($row['trans_no']."-".$row['type'], _("Print Receipt"), true, ST_CUSTPAYMENT, ICON_PRINT); } function check_overdue($row) @@ -201,70 +205,10 @@ function check_overdue($row) && (abs($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, - 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"); $cols = array( _("Type") => array('fun'=>'systype_name', 'ord'=>''), @@ -278,28 +222,26 @@ $cols = array( _("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'), 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();