X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Finquiry%2Fcustomer_inquiry.php;h=b2764d465595a2be828cda60e3f59921c316d165;hb=d2cc0860eccf02eaefcd90731ac3af141a841529;hp=c9d64bdc00548033f60f05fbe14699c26ff10a60;hpb=902e63ca33432a8499a1f2d1c51e9620e975d668;p=fa-stable.git diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php index c9d64bdc..b2764d46 100644 --- a/sales/inquiry/customer_inquiry.php +++ b/sales/inquiry/customer_inquiry.php @@ -1,7 +1,16 @@ . +***********************************************************************/ +$page_security = 'SA_SALESTRANSVIEW'; +$path_to_root = "../.."; include($path_to_root . "/includes/db_pager.inc"); include_once($path_to_root . "/includes/session.inc"); @@ -14,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'])) @@ -42,12 +51,10 @@ if (!isset($_POST['filterType'])) 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']); //------------------------------------------------------------------------------------------------ @@ -82,12 +89,12 @@ function display_customer_summary($customer_record) amount_cell($customer_record["Balance"]); end_row(); - end_table();; + end_table(); } //------------------------------------------------------------------------------------------------ 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); @@ -95,17 +102,23 @@ if ($_POST['customer_id'] != "" && $_POST['customer_id'] != reserved_words::get_ } div_end(); - +if(get_post('RefreshInquiry')) +{ + $Ajax->activate('totals_tbl'); +} //------------------------------------------------------------------------------------------------ + 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_']) : ""; } @@ -116,8 +129,7 @@ function trans_view($trans) function due_date($row) { - return ($row["type"]==20 || $row["type"]==21) - ? $row["due_date"] : ''; + return $row["type"] == ST_SALESINVOICE ? $row["due_date"] : ''; } function gl_view($row) @@ -128,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) : ''; @@ -137,28 +149,17 @@ 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 alloc_link($row) -{ - if ($row['type'] == 10) - if ($row["TotalAmount"] - $row["Allocated"] > 0) - return pager_link(_("Allocation"), - "/sales/allocations/customer_allocate.php" - ."?trans_no={$row['trans_no']}&trans_type=" - .$row['type']); - return ''; -} - function credit_link($row) { - return $row['type'] == 10 ? + return $row['type'] == ST_SALESINVOICE && $row["TotalAmount"] - $row["Allocated"] > 0 ? pager_link(_("Credit This"), "/sales/customer_credit_invoice.php?InvoiceNumber=". - $row['trans_no']) + $row['trans_no'], ICON_CREDIT) : ''; } @@ -167,26 +168,33 @@ function edit_link($row) $str = ''; switch($row['type']) { - case 10: - $str = "/sales/customer_invoice.php?ModifyInvoice=".$row['trans_no']; + 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 ($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']; + 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 13: - $str = "/sales/customer_delivery.php?ModifyDelivery=".$row['trans_no']; + case ST_CUSTDELIVERY: + if (get_voided_entry(ST_CUSTDELIVERY, $row["trans_no"]) === false) + $str = "/sales/customer_delivery.php?ModifyDelivery=".$row['trans_no']; break; } - return pager_link(_('Edit'), $str); + if ($str != "" && !is_closed_trans($row['type'], $row["trans_no"])) + return pager_link(_('Edit'), $str, ICON_EDIT); + return ''; } function prt_link($row) { - if ($row['type'] != 12) // customer payment printout not defined yet. - return print_document_link($row['trans_no'], _("Print"), true, $row['type']); + 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'], _("Print"), true, $row['type'], ICON_PRINT); } function check_overdue($row) @@ -208,10 +216,11 @@ function check_overdue($row) 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) + ((trans.type = ".ST_SALESINVOICE.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue FROM " .TB_PREF."debtor_trans as trans, " @@ -219,33 +228,34 @@ function check_overdue($row) .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.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['customer_id'] != ALL_TEXT) + $sql .= " AND trans.debtor_no = ".db_escape($_POST['customer_id']); - if ($_POST['filterType'] != reserved_words::get_all()) + if ($_POST['filterType'] != ALL_TEXT) { if ($_POST['filterType'] == '1') { - $sql .= " AND (trans.type = 10 OR trans.type = 1) "; + $sql .= " AND (trans.type = ".ST_SALESINVOICE." OR trans.type = ".ST_BANKPAYMENT.") "; } elseif ($_POST['filterType'] == '2') { - $sql .= " AND (trans.type = 10) "; + $sql .= " AND (trans.type = ".ST_SALESINVOICE.") "; } elseif ($_POST['filterType'] == '3') { - $sql .= " AND (trans.type = " . systypes::cust_payment() - ." OR trans.type = 2) "; + $sql .= " AND (trans.type = " . ST_CUSTPAYMENT + ." OR trans.type = ".ST_BANKDEPOSIT.") "; } elseif ($_POST['filterType'] == '4') { - $sql .= " AND trans.type = 11 "; + $sql .= " AND trans.type = ".ST_CUSTCREDIT." "; } elseif ($_POST['filterType'] == '5') { - $sql .= " AND trans.type = 13 "; + $sql .= " AND trans.type = ".ST_CUSTDELIVERY." "; } if ($_POST['filterType'] == '2') @@ -258,27 +268,28 @@ function check_overdue($row) } //------------------------------------------------------------------------------------------------ +db_query("set @bal:=0"); $cols = array( _("Type") => array('fun'=>'systype_name', 'ord'=>''), _("#") => array('fun'=>'trans_view', 'ord'=>''), _("Order") => array('fun'=>'order_view'), _("Reference"), - _("Date") => array('type'=>'date', 'ord'=>'desc'), - _("Due Date") => array('type=>date', 'fun'=>'due_date'), + _("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'), + _("RB"), _("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), _("Credit") => array('align'=>'right','insert'=>true, 'fun'=>'fmt_credit'), array('insert'=>true, 'fun'=>'gl_view'), - array('insert'=>true, 'fun'=>'alloc_link'), 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'; } @@ -287,19 +298,11 @@ if ($_POST['customer_id'] != reserved_words::get_all()) { $table =& new_db_pager('trans_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked items are overdue.")); +$table->width = "85%"; -if(get_post('RefreshInquiry')) -{ - $table->set_sql($sql); - $table->set_columns($cols); - $Ajax->activate('trans_tbl'); - $Ajax->activate('totals_tbl'); -} +display_db_pager($table); - start_form(); - display_db_pager($table); - end_form(); +end_form(); end_page(); - ?>