X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_allocation_inquiry.php;h=e3aa9567082a2e45dea005cd09e260808ee3a04f;hb=7a5b4d5610ca016856b9a4ab60ff3d490b1b0dd5;hp=6d01aebcace45ea05be0abd3799b5c83f712b67c;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php index 6d01aebc..e3aa9567 100644 --- a/sales/inquiry/customer_allocation_inquiry.php +++ b/sales/inquiry/customer_allocation_inquiry.php @@ -82,7 +82,7 @@ function view_link($trans) function due_date($row) { - return $row["type"] == 10 ? $row["due_date"] : ''; + return $row["type"] == ST_SALESINVOICE ? $row["due_date"] : ''; } function fmt_balance($row) @@ -101,8 +101,10 @@ function alloc_link($row) { /*its a credit note which could have an allocation */ return $link; - } - elseif (($row["type"] == ST_CUSTPAYMENT || $row["type"] == ST_BANKDEPOSIT) && + } elseif ($row["type"] == ST_JOURNAL && $row['TotalAmount'] < 0) + { + return $link; + } elseif (($row["type"] == ST_CUSTPAYMENT || $row["type"] == ST_BANKDEPOSIT) && (floatcmp($row['TotalAmount'], $row['Allocated']) >= 0)) { /*its a receipt which could have an allocation*/ @@ -112,7 +114,7 @@ function alloc_link($row) { /*its a negative receipt */ return ''; - } elseif ($row["type"] == ST_SALESINVOICE && ($row['TotalAmount'] - $row['Allocated']) > 0) + } elseif (($row["type"] == ST_SALESINVOICE && ($row['TotalAmount'] - $row['Allocated']) > 0) || $row["type"] == ST_BANKPAYMENT) return pager_link(_("Payment"), "/sales/customer_payments.php?customer_id=".$row["debtor_no"]."&SInvoice=" . $row["trans_no"], ICON_MONEY);