From df206eda646b0bcf1952ab86be9ffbcb3760ef8d Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 31 Jul 2014 15:15:27 -0400 Subject: [PATCH] LP#1270289 support canceling delayed copies In the PO copy grid, allow cancelled-as-delayed copies to be canceled again, so that true cancelation can be achieved as needed. Signed-off-by: Bill Erickson Signed-off-by: Kathy Lussier Signed-off-by: Ben Shum --- Open-ILS/src/templates/acq/common/li_table.tt2 | 2 +- Open-ILS/web/js/ui/default/acq/common/li_table.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Open-ILS/src/templates/acq/common/li_table.tt2 b/Open-ILS/src/templates/acq/common/li_table.tt2 index fd337418ee..b93749dbc9 100644 --- a/Open-ILS/src/templates/acq/common/li_table.tt2 +++ b/Open-ILS/src/templates/acq/common/li_table.tt2 @@ -376,7 +376,7 @@
- [% l('Mark Received') %][% l('Un-Receive') %] [% l('Cancel') %] [% l('Claim') %] + [% l('Mark Received') %][% l('Un-Receive') %] [% l('Cancel') %]  [% l('Claim') %]
X
diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js index e2fa363e9f..e7e4d73c1a 100644 --- a/Open-ILS/web/js/ui/default/acq/common/li_table.js +++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js @@ -2484,6 +2484,13 @@ function AcqLiTable() { ); openils.Util.show(cxl_reason_link, "inline"); + if (copy.cancel_reason().keep_debits() == 't' ) { + // allow further cancellation of "delayed" copies + + openils.Util.show(cxl_link, "inline"); + cxl_link.onclick = function() { self.cancelLid(copy.id()) }; + } + } else if (copy.recv_time()) { /* --------- received -------------------------- */ -- 2.43.2