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);
}
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)
function check_overdue($row)
{
return $row['OverDue'] == 1
- && floatcmp($row["TotalAmount"], $row["Allocated"]) != 0;
+ && floatcmp(ABS($row["TotalAmount"]), $row["Allocated"]) != 0;
}
//------------------------------------------------------------------------------------------------
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();
//------------------------------------------------------------------------------------------------
div_start('totals_tbl');
-if ($_POST['customer_id'] != ALL_TEXT && $_POST['filterType'] == '2')
+if ($_POST['customer_id'] != "" && $_POST['customer_id'] != ALL_TEXT)
{
$customer_record = get_customer_details(get_post('customer_id'), get_post('TransToDate'));
display_customer_summary($customer_record);
}
//------------------------------------------------------------------------------------------------
$sql = get_sql_for_customer_inquiry(get_post('TransAfterDate'), get_post('TransToDate'),
- get_post('customer_id'), get_post('filterType'));
+ get_post('customer_id'), get_post('filterType'), check_value('show_voided'));
//------------------------------------------------------------------------------------------------
//db_query("set @bal:=0");
_("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')
);