X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_inquiry.php;h=2e7f0117d087415987514fab07412507416f9c4b;hb=cf523b36717768b5c061accc95f3ba9083b88165;hp=5bdbe785e4b7f4fcee10767fc09fed31718d6a74;hpb=15637f687c7fc48fde54904fe54c0386b7e90859;p=fa-stable.git
diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index 5bdbe785..2e7f0117 100644
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -58,11 +58,6 @@ function gl_view($row)
function fmt_amount($row)
{
- /*
- $value =
- $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT ||
- ($row['type']==ST_JOURNAL && $row['TotalAmount'] < 0) ? -$row["TotalAmount"] : $row["TotalAmount"];
- */
$value =
$row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT ? -$row["TotalAmount"] : $row["TotalAmount"];
return price_format($value);
@@ -89,7 +84,6 @@ function edit_link($row)
{
global $page_nested;
- $str = '';
if ($page_nested)
return '';
@@ -97,6 +91,20 @@ function edit_link($row)
trans_editor_link($row['type'], $row['trans_no']);
}
+function copy_link($row)
+{
+ 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)
{
if ($row['type'] == ST_CUSTPAYMENT || $row['type'] == ST_BANKDEPOSIT)
@@ -118,7 +126,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") . "";
}
@@ -131,16 +139,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();
}
@@ -160,6 +170,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);
@@ -183,7 +195,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 "
";
}
@@ -195,7 +207,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");
@@ -214,6 +226,7 @@ $cols = array(
_("Balance") => array('align'=>'right', 'type'=>'amount'),
array('insert'=>true, 'fun'=>'gl_view'),
array('insert'=>true, 'fun'=>'edit_link'),
+ array('insert'=>true, 'fun'=>'copy_link'),
array('insert'=>true, 'fun'=>'credit_link'),
array('insert'=>true, 'fun'=>'prt_link')
);