[open-ils-commits] [GIT] Evergreen ILS branch master updated. 05e16eea42d1b6c4e282f36dd434d8170cc9669a

[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  05e16eea42d1b6c4e282f36dd434d8170cc9669a (commit)
      from  9a0120762a77f44f2f117b574f20ed4cd5ae7da1 (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 05e16eea42d1b6c4e282f36dd434d8170cc9669a
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date:   Thu Oct 6 16:13:51 2011 -0400

    Acq: better error message if trying to create PO without provider or agency
    
    Before now, if you leave either the provider or ordering agency
    fields blank in the "Create Purchase Order" dialog, you get a
    nonsensical warning about prepayment.
    
    This fixes that.
    
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/web/js/dojo/openils/acq/nls/acq.js b/Open-ILS/web/js/dojo/openils/acq/nls/acq.js
index d2b69f4..9e29f0f 100644
--- a/Open-ILS/web/js/dojo/openils/acq/nls/acq.js
+++ b/Open-ILS/web/js/dojo/openils/acq/nls/acq.js
@@ -84,5 +84,6 @@
     "ADD_LI_TO_PO_BAD_PO_STATE" : "The selected PO has already been activated",
     "ADD_LI_TO_PO_BAD_LI_STATE" : "The selected lineitem is not in a state that can be added to a purchase order",
     "INVOICE_NUMBER": "Invoice #${0}",
-    "COPIES_TO_RECEIVE": "Number of copies to receive: "
+    "COPIES_TO_RECEIVE": "Number of copies to receive: ",
+    "CREATE_PO_INVALID": "A purchase order must have an ordering agency and a provider."
 }
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 3733314..addf137 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
@@ -86,7 +86,11 @@ function AcqLiTable() {
     };
 
     acqLitCreatePoSubmit.onClick = function() {
-        if (self._confirmPoPrepaySituation()) {
+        if (!self.createPoProviderSelector.attr("value") ||
+                !self.createPoAgencySelector.attr("value")) {
+            alert(localeStrings.CREATE_PO_INVALID);
+            return false;
+        } else if (self._confirmPoPrepaySituation()) {
             acqLitPoCreateDialog.hide();
             self._createPO(acqLitPoCreateDialog.getValues());
         } else {

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

Summary of changes:
 Open-ILS/web/js/dojo/openils/acq/nls/acq.js       |    3 ++-
 Open-ILS/web/js/ui/default/acq/common/li_table.js |    6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS