X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Finquiry%2Fcustomer_inquiry.php;h=3c1ffd9594dfba71c60e9d44234b7a0971a7f697;hb=HEAD;hp=92c640d49a874ebde9c67a78e80537b4850da325;hpb=b54fdb00859af85c72742d32ebc628ef52b81cec;p=fa-stable.git
diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 92c640d4..2e7f0117 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,91 +19,12 @@ 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);
-
-if (isset($_GET['customer_id']))
-{
- $_POST['customer_id'] = $_GET['customer_id'];
-}
-
-//------------------------------------------------------------------------------------------------
-
-start_form();
-
-if (!isset($_POST['customer_id']))
- $_POST['customer_id'] = get_global_customer();
-
-start_table(TABLESTYLE_NOBORDER);
-start_row();
-
-customer_list_cells(_("Select a customer: "), 'customer_id', null, true);
-
-date_cells(_("From:"), 'TransAfterDate', '', null, -30);
-date_cells(_("To:"), 'TransToDate', '', null, 1);
-
-if (!isset($_POST['filterType']))
- $_POST['filterType'] = 0;
-
-cust_allocations_list_cells(null, 'filterType', $_POST['filterType'], true);
-
-submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
-end_row();
-end_table();
-
-set_global_customer($_POST['customer_id']);
-
-//------------------------------------------------------------------------------------------------
-
-function display_customer_summary($customer_record)
-{
- $past1 = get_company_pref('past_due_days');
- $past2 = 2 * $past1;
- if ($customer_record["dissallow_invoices"] != 0)
- {
- echo "
" . _("CUSTOMER ACCOUNT IS ON HOLD") . "";
- }
-
- $nowdue = "1-" . $past1 . " " . _('Days');
- $pastdue1 = $past1 + 1 . "-" . $past2 . " " . _('Days');
- $pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
-
- start_table(TABLESTYLE, "width=80%");
- $th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
- $pastdue1, $pastdue2, _("Total Balance"));
- table_header($th);
-
- start_row();
- label_cell($customer_record["curr_code"]);
- label_cell($customer_record["terms"]);
- amount_cell($customer_record["Balance"] - $customer_record["Due"]);
- amount_cell($customer_record["Due"] - $customer_record["Overdue1"]);
- amount_cell($customer_record["Overdue1"] - $customer_record["Overdue2"]);
- amount_cell($customer_record["Overdue2"]);
- amount_cell($customer_record["Balance"]);
- end_row();
-
- end_table();
-}
-//------------------------------------------------------------------------------------------------
-
-div_start('totals_tbl');
-if ($_POST['customer_id'] != "" && $_POST['customer_id'] != ALL_TEXT)
-{
- $customer_record = get_customer_details($_POST['customer_id'], $_POST['TransToDate']);
- display_customer_summary($customer_record);
- echo "
";
-}
-div_end();
-
-if(get_post('RefreshInquiry'))
-{
- $Ajax->activate('totals_tbl');
-}
//------------------------------------------------------------------------------------------------
function systype_name($dummy, $type)
@@ -135,56 +56,53 @@ 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["TotalAmount"] : $row["TotalAmount"];
- return $value>=0 ? price_format($value) : '';
-
+ $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT ? -$row["TotalAmount"] : $row["TotalAmount"];
+ return price_format($value);
}
-function fmt_credit($row)
+function credit_link($row)
{
- $value =
- !($row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT) ?
- -$row["TotalAmount"] : $row["TotalAmount"];
- return $value>0 ? price_format($value) : '';
+ global $page_nested;
+
+ if ($page_nested)
+ return '';
+ if ($row["Outstanding"] > 0)
+ {
+ if ($row['type'] == ST_CUSTDELIVERY)
+ return pager_link(_('Invoice'), "/sales/customer_invoice.php?DeliveryNumber="
+ .$row['trans_no'], ICON_DOC);
+ else if ($row['type'] == ST_SALESINVOICE)
+ return pager_link(_("Credit This") ,
+ "/sales/customer_credit_invoice.php?InvoiceNumber=". $row['trans_no'], ICON_CREDIT);
+ }
}
-function credit_link($row)
+function edit_link($row)
{
- return $row['type'] == ST_SALESINVOICE && $row["Outstanding"] > 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_CUSTCREDIT && $row['order_'] ? '' : // allow only free hand credit notes edition
+ trans_editor_link($row['type'], $row['trans_no']);
}
-function edit_link($row)
+function copy_link($row)
{
- $str = '';
-
- 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 '';
+ global $page_nested;
+
+ if ($page_nested)
+ return '';
+ if ($row['type'] == ST_CUSTDELIVERY)
+ return pager_link(_("Copy Delivery"), "/sales/sales_order_entry.php?NewDelivery="
+ .$row['order_'], ICON_DOC);
+ elseif ($row['type'] == ST_SALESINVOICE)
+ return pager_link(_("Copy Invoice"), "/sales/sales_order_entry.php?NewInvoice="
+ . $row['order_'], ICON_DOC);
}
function prt_link($row)
@@ -193,37 +111,123 @@ 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);
}
function check_overdue($row)
{
return $row['OverDue'] == 1
- && (abs($row["TotalAmount"]) - $row["Allocated"] != 0);
+ && floatcmp(ABS($row["TotalAmount"]), $row["Allocated"]) != 0;
+}
+//------------------------------------------------------------------------------------------------
+
+function display_customer_summary($customer_record)
+{
+ $past1 = get_company_pref('past_due_days');
+ $past2 = 2 * $past1;
+ if ($customer_record && $customer_record["dissallow_invoices"] != 0)
+ {
+ echo "" . _("CUSTOMER ACCOUNT IS ON HOLD") . "";
+ }
+
+ $nowdue = "1-" . $past1 . " " . _('Days');
+ $pastdue1 = $past1 + 1 . "-" . $past2 . " " . _('Days');
+ $pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
+
+ start_table(TABLESTYLE, "width='80%'");
+ $th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
+ $pastdue1, $pastdue2, _("Total Balance"));
+ table_header($th);
+ if ($customer_record != false)
+ {
+ start_row();
+ label_cell($customer_record["curr_code"]);
+ label_cell($customer_record["terms"]);
+ amount_cell($customer_record["Balance"] - $customer_record["Due"]);
+ amount_cell($customer_record["Due"] - $customer_record["Overdue1"]);
+ amount_cell($customer_record["Overdue1"] - $customer_record["Overdue2"]);
+ amount_cell($customer_record["Overdue2"]);
+ amount_cell($customer_record["Balance"]);
+ end_row();
+ }
+
+ end_table();
+}
+
+if (isset($_GET['customer_id']))
+{
+ $_POST['customer_id'] = $_GET['customer_id'];
+}
+
+//------------------------------------------------------------------------------------------------
+
+start_form();
+
+if (!isset($_POST['customer_id']))
+ $_POST['customer_id'] = get_global_customer();
+
+start_table(TABLESTYLE_NOBORDER);
+start_row();
+
+ref_cells(_("Reference:"), 'Ref', '', NULL, _('Enter reference fragment or leave empty'));
+
+if (!$page_nested)
+ customer_list_cells(_("Select a customer: "), 'customer_id', null, true, true, false, true);
+
+cust_allocations_list_cells(null, 'filterType', null, true, true);
+
+if ($_POST['filterType'] != '2')
+{
+ date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
+ date_cells(_("To:"), 'TransToDate', '', null);
+}
+check_cells(_("Zero values"), 'show_voided');
+
+submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), 'default');
+end_row();
+end_table();
+
+set_global_customer($_POST['customer_id']);
+
+//------------------------------------------------------------------------------------------------
+
+div_start('totals_tbl');
+if ($_POST['customer_id'] != "" && $_POST['customer_id'] != ALL_TEXT)
+{
+ $customer_record = get_customer_details(get_post('customer_id'), get_post('TransToDate'), false);
+ display_customer_summary($customer_record);
+ echo "
";
+}
+div_end();
+
+if (get_post('RefreshInquiry') || list_updated('filterType'))
+{
+ $Ajax->activate('_page_body');
}
//------------------------------------------------------------------------------------------------
-$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'), check_value('show_voided'), get_post('Ref'));
//------------------------------------------------------------------------------------------------
-db_query("set @bal:=0");
+//db_query("set @bal:=0");
$cols = array(
_("Type") => array('fun'=>'systype_name', 'ord'=>''),
- _("#") => array('fun'=>'trans_view', 'ord'=>''),
- _("Order") => array('fun'=>'order_view'),
+ _("#") => array('fun'=>'trans_view', 'ord'=>'', 'align'=>'right'),
+ _("Order") => array('fun'=>'order_view', 'align'=>'right'),
_("Reference"),
_("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'),
- _("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'),
- _("Credit") => array('align'=>'right','insert'=>true, 'fun'=>'fmt_credit'),
- _("RB") => array('align'=>'right', 'type'=>'amount'),
+ _("Amount") => array('align'=>'right', 'fun'=>'fmt_amount'),
+ _("Balance") => 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'=>'copy_link'),
+ array('insert'=>true, 'fun'=>'credit_link'),
array('insert'=>true, 'fun'=>'prt_link')
);
@@ -232,8 +236,8 @@ if ($_POST['customer_id'] != ALL_TEXT) {
$cols[_("Customer")] = 'skip';
$cols[_("Currency")] = 'skip';
}
-if ($_POST['filterType'] == ALL_TEXT)
- $cols[_("RB")] = 'skip';
+if ($_POST['filterType'] != '2')
+ $cols[_("Balance")] = 'skip';
$table =& new_db_pager('trans_tbl', $sql, $cols);
$table->set_marker('check_overdue', _("Marked items are overdue."));
@@ -244,5 +248,3 @@ display_db_pager($table);
end_form();
end_page();
-
-?>