[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch rel_2_5 updated. d49038c3cf415cc1f424fbd524f261c1aa4d9abe

[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_5 has been updated
       via  d49038c3cf415cc1f424fbd524f261c1aa4d9abe (commit)
       via  7a16423c653e289c149647c95f14af59f5fa1898 (commit)
      from  b9be5b319f5a4855b34ce3bb8f508dfa90d22ca0 (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 d49038c3cf415cc1f424fbd524f261c1aa4d9abe
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 2263534..384607a 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
@@ -2918,8 +2918,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 7a16423c653e289c149647c95f14af59f5fa1898
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 b462eed..2263534 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