[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch rel_2_4 updated. df77fdd85abec2c11de3a1cdd1b1b7ec6f392d6f

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_4 has been updated
       via  df77fdd85abec2c11de3a1cdd1b1b7ec6f392d6f (commit)
       via  df7a004ef0d438531e1d39e6a7e9da3c0c57918f (commit)
      from  bf77cf3b011e2189b16c0e4a9feeef1403340ce5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit df77fdd85abec2c11de3a1cdd1b1b7ec6f392d6f
Author: Bill Erickson <berick at esilibrary.com>
Date:   Fri Mar 21 21:05:14 2014 -0400

    LP#1115599: Ignore canceled lineitems during batch cancel
    
    Continue ignoring already-canceled lineitems during batch cancel so that
    a) no unnecessary calls are made and b) staff can be alerted when no
    viable lineitems were selected for the requested action.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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 2fbd1fc..56852cf 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
@@ -2908,8 +2908,13 @@ function AcqLiTable() {
     };
 
     this._cancelLineitems = function(reason) {
-        var id_list = this.getSelected(
-            null, null, true, li_active_states);
+
+        // ignore canceled lineitems during batch lineitem cancel
+        var states = li_active_states.filter(
+            function(s) { return s != 'cancelled' });
+
+        var id_list = this.getSelected(null, null, true, states);
+
         if (!id_list.length) {
             alert(localeStrings.NO_LI_GENERAL);
             return;

commit df7a004ef0d438531e1d39e6a7e9da3c0c57918f
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Wed Jan 29 17:07:29 2014 -0500

    LP#1115599: Allow cancelled lineitems to be received and invoiced
    
    Acquisitions staff need to be able to receive and invoice cancelled items,
    particularly when those items are backordered. This branch restores the
    ability to perform these actions on cancelled lineitems from the PO
    screen.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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 a740677..2fbd1fc 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
@@ -52,8 +52,7 @@ var fundStyles = {
  * Is this all of 'em?
  */
 var li_pre_po_states = ["new", "selector-ready", "order-ready", "approved"];
-var li_post_po_states = ["pending-order", "on-order", "received"];
-// i.e. not-canceled ("cancelled") lineitems
+var li_post_po_states = ["pending-order", "on-order", "received", "cancelled"];
 var li_active_states = li_pre_po_states.concat(li_post_po_states);
 
 function AcqLiTable() {

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/js/ui/default/acq/common/li_table.js |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS