invoice search : limit to on-order lineitems

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/templates/acq/invoice/view.tt2 b/Open-ILS/src/templates/acq/invoice/view.tt2
index 695fba7..678543a 100644 (file)
--- a/Open-ILS/src/templates/acq/invoice/view.tt2
+++ b/Open-ILS/src/templates/acq/invoice/view.tt2
@@ -215,8 +215,14 @@
                                 [% l('Add Selected Items to Invoice') %]
                             </button>
                             <span style='padding-left: 20px;'>
-                                <input type='checkbox' id='acq-invoice-search-limit-provider' checked='checked'/>
-                                [% l('Limit Resutls to Invoice Provider') %]
+                                <span>
+                                    <input type='checkbox' id='acq-invoice-search-limit-provider' checked='checked'/>
+                                    [% l('Limit Resutls to Invoice Provider') %]
+                                </span>
+                                <span style='padding-left: 5px;'>
+                                    <input type='checkbox' id='acq-invoice-search-limit-onorder' checked='checked'/>
+                                    [% l('Limit Resutls to "on-order" Lineitems') %]
+                                </span>
                             </span>
                         </div>
                     </div> <!-- end search form -->

diff --git a/Open-ILS/web/js/ui/default/acq/invoice/view.js b/Open-ILS/web/js/ui/default/acq/invoice/view.js
index 762a621..e1c945b 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/invoice/view.js
+++ b/Open-ILS/web/js/ui/default/acq/invoice/view.js
@@ -240,6 +240,13 @@ function performSearch() {
             searchObject.jub.push({provider : provider});
     }
 
+    if (dojo.byId('acq-invoice-search-limit-onorder').checked) {
+        if (!searchObject.jub) 
+            searchObject.jub = [];
+        if (!searchObject.jub.filter(function(i) { return i.state != null }).length)
+            searchObject.jub.push({state : 'on-order'});
+    }
+
     resultManager.go(searchObject)
     console.log(js2JSON(searchObject));
 }