From: Bill Erickson <berick@esilibrary.com>
Date: Thu, 31 Jul 2014 19:15:27 +0000 (-0400)
Subject: LP#1270289 support canceling delayed copies
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4ba2d5524837493d6a8a384a571813c60436019c;p=working%2FEvergreen.git

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 <berick@esilibrary.com>
---

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 @@
                     <td><div name='barcode'></div></td>
                     <td><div name='note'></div></td>
                     <td><div name='receiver'></div></td>
-                    <td><a href="javascript:void(0);" name="receive">[% l('Mark&nbsp;Received') %]</a><a href="javascript:void(0);" name="unreceive">[% l('Un-Receive') %]</a>&nbsp;<a href="javascript:void(0);" name="cancel">[% l('Cancel') %]</a><span class="hidden" name="cancel_reason"></span>&nbsp;<a href="javascript:void(0);" name="claim">[% l('Claim') %]</a></td>
+                    <td><a href="javascript:void(0);" name="receive">[% l('Mark&nbsp;Received') %]</a><a href="javascript:void(0);" name="unreceive">[% l('Un-Receive') %]</a>&nbsp;<a href="javascript:void(0);" name="cancel">[% l('Cancel') %]</a>&nbsp;<span class="hidden" name="cancel_reason"></span>&nbsp;<a href="javascript:void(0);" name="claim">[% l('Claim') %]</a></td>
                     <td><div name='delete' dojoType='dijit.form.Button' style='color:red;' scrollOnFocus='false'>X</div></td>
                 </tr>
             </tbody>
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 0b2b766337..95cd628718 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
@@ -2463,6 +2463,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 -------------------------- */