[open-ils-commits] [GIT] Evergreen ILS branch master updated. 4ecd93eccebd159c70cff12cc73f2111735291fa

[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, master has been updated
       via  4ecd93eccebd159c70cff12cc73f2111735291fa (commit)
       via  83d27351d9422ae8c52f087c480bffee9e798e65 (commit)
      from  b5826950c8deb7d20819e1cd4b5c18f608894ffe (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 4ecd93eccebd159c70cff12cc73f2111735291fa
Author: Mark Cooper <markchristophercooper at gmail.com>
Date:   Tue Oct 23 22:02:38 2012 -0700

    LP#1058321: Acq: Possible to receive a pending purchase order
    
    Revised to allow a cancelled PO to be received, as this is needed under
    certain conditions (note - bib/items are not restored in this case).
    Added po_state variable to avoid repeated PO.state() function invocations.
    
    Signed-off-by: Mark Cooper <markchristophercooper at gmail.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/web/js/ui/default/acq/po/view_po.js b/Open-ILS/web/js/ui/default/acq/po/view_po.js
index faab39d..490de97 100644
--- a/Open-ILS/web/js/ui/default/acq/po/view_po.js
+++ b/Open-ILS/web/js/ui/default/acq/po/view_po.js
@@ -300,6 +300,7 @@ function prepareInvoiceFeatures() {
 }
 
 function renderPo() {
+    var po_state = PO.state();
     dojo.byId("acq-po-view-id").innerHTML = PO.id();
     dojo.byId("acq-po-view-name").innerHTML = PO.name();
     makeProviderLink(
@@ -309,7 +310,7 @@ function renderPo() {
     dojo.byId("acq-po-view-total-li").innerHTML = PO.lineitem_count();
     dojo.byId("acq-po-view-total-enc").innerHTML = PO.amount_encumbered().toFixed(2);
     dojo.byId("acq-po-view-total-spent").innerHTML = PO.amount_spent().toFixed(2);
-    dojo.byId("acq-po-view-state").innerHTML = PO.state(); // TODO i18n
+    dojo.byId("acq-po-view-state").innerHTML = po_state; // TODO i18n
 
     if(PO.order_date()) {
         openils.Util.show('acq-po-activated-on', 'inline');
@@ -319,9 +320,9 @@ function renderPo() {
                     openils.Util.timeStamp(PO.order_date(), {formatLength:'short'})
                 ]
             );
-        if(PO.state() == "on-order") {
+        if(po_state == "on-order" || po_state == "cancelled") {
             dojo.removeAttr('receive_po', 'disabled');
-        } else if(PO.state() == "received") {
+        } else if(po_state == "received") {
             dojo.removeAttr('rollback_receive_po', 'disabled');
         }
     }
@@ -337,7 +338,7 @@ function renderPo() {
     // dojo.byId("acq-po-view-notes").innerHTML = PO.notes().length;
     poNoteTable.updatePoNotesCount();
 
-    if (PO.state() == "pending") {
+    if (po_state == "pending") {
         checkCouldActivatePo();
         if (PO.lineitem_count() > 1)
             openils.Util.show("acq-po-split");

commit 83d27351d9422ae8c52f087c480bffee9e798e65
Author: Mark Cooper <markchristophercooper at gmail.com>
Date:   Mon Oct 15 18:03:44 2012 -0700

    LP#1058321: Possible to receive a pending purchase order
    
    Restrict 'Mark purchase order as received' to on-order state
    purchase orders, and 'Un-Receive Purchase Order' to 'received'
    POs. Otherwise inconsistencies easily occur ...
    
    Signed-off-by: Mark Cooper <markchristophercooper at gmail.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/src/templates/acq/common/li_table.tt2 b/Open-ILS/src/templates/acq/common/li_table.tt2
index 00c2727..328bed0 100644
--- a/Open-ILS/src/templates/acq/common/li_table.tt2
+++ b/Open-ILS/src/templates/acq/common/li_table.tt2
@@ -28,8 +28,8 @@
                                             <option mask='po' value='create_assets'>Load Bibs and Items</option>
                                             <option mask='po' value='cancel_lineitems'>Cancel Selected Lineitems</option>
                                             <option mask='po' value='change_claim_policy'>Change Claim Policy</option>
-                                            <option mask='po' value='receive_po'>Mark Purchase Order as Received</option>
-                                            <option mask='po' value='rollback_receive_po'>Un-Receive Purchase Order</option>
+                                            <option mask='po' value='receive_po' id='receive_po' disabled='disabled'>Mark Purchase Order as Received</option>
+                                            <option mask='po' value='rollback_receive_po' id='rollback_receive_po' disabled='disabled'>Un-Receive Purchase Order</option>
                                             <option mask='po' value='print_po'>Print Purchase Order</option>
                                             <option mask='po' value='po_history'>View PO History</option>
                                             <option mask='po' value='batch_create_invoice'>[% l('Create Invoice From Selected Lineitems') %]</option>
diff --git a/Open-ILS/web/js/ui/default/acq/po/view_po.js b/Open-ILS/web/js/ui/default/acq/po/view_po.js
index 4c2a7e7..faab39d 100644
--- a/Open-ILS/web/js/ui/default/acq/po/view_po.js
+++ b/Open-ILS/web/js/ui/default/acq/po/view_po.js
@@ -319,7 +319,11 @@ function renderPo() {
                     openils.Util.timeStamp(PO.order_date(), {formatLength:'short'})
                 ]
             );
-
+        if(PO.state() == "on-order") {
+            dojo.removeAttr('receive_po', 'disabled');
+        } else if(PO.state() == "received") {
+            dojo.removeAttr('rollback_receive_po', 'disabled');
+        }
     }
 
     makePrepayWidget(

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

Summary of changes:
 Open-ILS/src/templates/acq/common/li_table.tt2 |    4 ++--
 Open-ILS/web/js/ui/default/acq/po/view_po.js   |   11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS