X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_inquiry.php;h=24f3148300c3057d1a2fefca48e61032823f6155;hb=62d814189db1479e1034be8930dd3735b23a353a;hp=52b82ef92f54cb43eee991548a366a9ff039dbca;hpb=e000d0b3fb245b02de604356b1f60c65b5f4962f;p=fa-stable.git diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php index 52b82ef9..24f31483 100644 --- a/sales/inquiry/customer_inquiry.php +++ b/sales/inquiry/customer_inquiry.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 1; $path_to_root="../.."; include($path_to_root . "/includes/db_pager.inc"); @@ -146,10 +155,10 @@ function fmt_credit($row) function credit_link($row) { - return $row['type'] == 10 ? + return $row['type'] == 10 && $row["TotalAmount"] - $row["Allocated"] > 0 ? pager_link(_("Credit This"), "/sales/customer_credit_invoice.php?InvoiceNumber=". - $row['trans_no']) + $row['trans_no'], ICON_CREDIT) : ''; } @@ -159,25 +168,32 @@ function edit_link($row) switch($row['type']) { case 10: - $str = "/sales/customer_invoice.php?ModifyInvoice=".$row['trans_no']; + if (get_voided_entry(10, $row["trans_no"]) === false && $row['Allocated'] == 0) + $str = "/sales/customer_invoice.php?ModifyInvoice=".$row['trans_no']; break; case 11: - 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']; + if (get_voided_entry(11, $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 13: - $str = "/sales/customer_delivery.php?ModifyDelivery=".$row['trans_no']; + if (get_voided_entry(13, $row["trans_no"]) === false) + $str = "/sales/customer_delivery.php?ModifyDelivery=".$row['trans_no']; break; } - return pager_link(_('Edit'), $str); + if ($str != "") + return pager_link(_('Edit'), $str, ICON_EDIT); + return ''; } function prt_link($row) { - if ($row['type'] != 12) // customer payment printout not defined yet. - return print_document_link($row['trans_no'], _("Print"), true, $row['type']); + if ($row['type'] != 12 && $row['type'] != 2) // customer payment or bank deposit printout not defined yet. + return print_document_link($row['trans_no'], _("Print"), true, $row['type'], ICON_PRINT); } function check_overdue($row)