X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_inquiry.php;h=3c1ffd9594dfba71c60e9d44234b7a0971a7f697;hb=0f465ad5e73c6683a5102bde63821a6f6a1c3f3a;hp=eb98d3dad278b040f247b8df3a2f75d7d4dd7bb7;hpb=5d8f36d15260bfd9215315935af86b7d96065489;p=fa-stable.git
diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index eb98d3da..3c1ffd95 100644
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -59,8 +59,7 @@ function gl_view($row)
function fmt_amount($row)
{
$value =
- $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT ?
- -$row["TotalAmount"] : $row["TotalAmount"];
+ $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT ? -$row["TotalAmount"] : $row["TotalAmount"];
return price_format($value);
}
@@ -70,9 +69,15 @@ function credit_link($row)
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):'';
+ 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 edit_link($row)
@@ -100,7 +105,7 @@ function prt_link($row)
function check_overdue($row)
{
return $row['OverDue'] == 1
- && floatcmp($row["TotalAmount"], $row["Allocated"]) != 0;
+ && floatcmp(ABS($row["TotalAmount"]), $row["Allocated"]) != 0;
}
//------------------------------------------------------------------------------------------------
@@ -108,7 +113,7 @@ function display_customer_summary($customer_record)
{
$past1 = get_company_pref('past_due_days');
$past2 = 2 * $past1;
- if ($customer_record["dissallow_invoices"] != 0)
+ if ($customer_record && $customer_record["dissallow_invoices"] != 0)
{
echo "
" . _("CUSTOMER ACCOUNT IS ON HOLD") . "";
}
@@ -121,16 +126,18 @@ function display_customer_summary($customer_record)
$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();
+ 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();
}
@@ -150,6 +157,8 @@ if (!isset($_POST['customer_id']))
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);
@@ -173,7 +182,7 @@ 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'));
+ $customer_record = get_customer_details(get_post('customer_id'), get_post('TransToDate'), false);
display_customer_summary($customer_record);
echo "
";
}
@@ -185,7 +194,7 @@ if (get_post('RefreshInquiry') || list_updated('filterType'))
}
//------------------------------------------------------------------------------------------------
$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('customer_id'), get_post('filterType'), check_value('show_voided'), get_post('Ref'));
//------------------------------------------------------------------------------------------------
//db_query("set @bal:=0");
@@ -203,8 +212,8 @@ $cols = array(
_("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'=>'credit_link'),
array('insert'=>true, 'fun'=>'prt_link')
);