Acq: Fix display failure in fund tag interface. Add admin interfaces for

invoice_payment_method and invoice_item_type.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@16736 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/js/ui/default/conify/global/acq/fund_tag.js b/Open-ILS/web/js/ui/default/conify/global/acq/fund_tag.js
index f451ea7..d23be78 100644 (file)
--- a/Open-ILS/web/js/ui/default/conify/global/acq/fund_tag.js
+++ b/Open-ILS/web/js/ui/default/conify/global/acq/fund_tag.js
@@ -29,6 +29,7 @@ function ftInit() {
                     buildFtGrid();
                 }
             );
+            buildFtGrid();
         }
     );
 }
@@ -42,7 +43,7 @@ function buildFtGrid() {
         {"owner": fieldmapper.aou.orgNodeTrail(ftOwner, true /* asId */)},
         {
             "async": true,
-            "oncomplete": function(r) {
+            "onresponse": function(r) {
                 if ((ftList = openils.Util.readResponse(r))) {
                     ftList = openils.Util.objectSort(ftList);
                     ftList.forEach(
@@ -51,6 +52,9 @@ function buildFtGrid() {
                         }
                     );
                 }
+            },
+            "oncomplete": function() {
+                ftGrid.hideLoadProgressIndicator();
             }
         }
     );

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 117100f..3d5da38 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -697,6 +697,10 @@
 <!ENTITY staff.main.menu.admin.server_admin.acq.accesskey "A">
 <!ENTITY staff.main.menu.admin.server_admin.acq.lineitem_alert.label "Line Item Alerts">
 <!ENTITY staff.main.menu.admin.server_admin.acq.lineitem_alert.accesskey "L">
+<!ENTITY staff.main.menu.admin.server_admin.acq.invoice_item_type.label "Invoice Item Type">
+<!ENTITY staff.main.menu.admin.server_admin.acq.invoice_item_type.accesskey "I">
+<!ENTITY staff.main.menu.admin.server_admin.acq.invoice_payment_method.label "Invoice Payment Method">
+<!ENTITY staff.main.menu.admin.server_admin.acq.invoice_payment_method.accesskey "Y">
 <!ENTITY staff.main.menu.admin.server_admin.acq.fund_tag.label "Fund Tags">
 <!ENTITY staff.main.menu.admin.server_admin.acq.fund_tag.accesskey "G">
 <!ENTITY staff.main.menu.admin.server_admin.acq.cancel_reason.label "Cancel Reasons">

diff --git a/Open-ILS/web/templates/default/conify/global/acq/invoice_item_type.tt2 b/Open-ILS/web/templates/default/conify/global/acq/invoice_item_type.tt2
new file mode 100644 (file)
index 0000000..f87a0f4
--- /dev/null
+++ b/Open-ILS/web/templates/default/conify/global/acq/invoice_item_type.tt2
@@ -0,0 +1,26 @@
+[% WRAPPER default/base.tt2 %]
+<script type="text/javascript">
+    dojo.require("openils.widget.AutoGrid");
+    dojo.require("dijit.form.FilteringSelect");
+    openils.Util.addOnLoad(
+        function() { aiitGrid.loadAll({"order_by": {"aiit": "name"}}); }
+    );
+</script>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+    <div>Invoice Item Types</div>
+    <div>
+        <button dojoType="dijit.form.Button" onClick="aiitGrid.showCreateDialog();">New Invoice Item Type</button>
+        <button dojoType="dijit.form.Button" onClick="aiitGrid.deleteSelected();">Delete Selected</button>
+    </div>
+</div>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+    <table  jsId="aiitGrid"
+            dojoType="openils.widget.AutoGrid"
+            fieldOrder="['code', 'name', 'prorate']"
+            defaultCellWidth="'auto'"
+            query="{id: '*'}"
+            fmClass="aiit"
+            editOnEnter="true">
+    </table>
+</div>
+[% END %]

diff --git a/Open-ILS/web/templates/default/conify/global/acq/invoice_payment_method.tt2 b/Open-ILS/web/templates/default/conify/global/acq/invoice_payment_method.tt2
new file mode 100644 (file)
index 0000000..437cc57
--- /dev/null
+++ b/Open-ILS/web/templates/default/conify/global/acq/invoice_payment_method.tt2
@@ -0,0 +1,26 @@
+[% WRAPPER default/base.tt2 %]
+<script type="text/javascript">
+    dojo.require("openils.widget.AutoGrid");
+    dojo.require("dijit.form.FilteringSelect");
+    openils.Util.addOnLoad(
+        function() { acqipmGrid.loadAll({"order_by": {"acqipm": "name"}}); }
+    );
+</script>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class="oils-header-panel">
+    <div>Invoice Payment Methods</div>
+    <div>
+        <button dojoType="dijit.form.Button" onClick="acqipmGrid.showCreateDialog();">New Invoice Payment Method</button>
+        <button dojoType="dijit.form.Button" onClick="acqipmGrid.deleteSelected();">Delete Selected</button>
+    </div>
+</div>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
+    <table  jsId="acqipmGrid"
+            dojoType="openils.widget.AutoGrid"
+            fieldOrder="['code', 'name']"
+            defaultCellWidth="'auto'"
+            query="{id: '*'}"
+            fmClass="acqipm"
+            editOnEnter="true">
+    </table>
+</div>
+[% END %]

diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu.js b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
index d850372..18ed6ce 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
@@ -672,6 +672,14 @@ main.menu.prototype = {
                 ['oncommand'],
                 function() { open_eg_web_page('conify/global/config/billing_type'); }
             ],
+            'cmd_server_admin_acq_invoice_item_type' : [
+                ['oncommand'],
+                function() { open_eg_web_page('conify/global/acq/invoice_item_type'); }
+            ],
+            'cmd_server_admin_acq_invoice_payment_method' : [
+                ['oncommand'],
+                function() { open_eg_web_page('conify/global/acq/invoice_payment_method'); }
+            ],
             'cmd_server_admin_acq_lineitem_alert' : [
                 ['oncommand'],
                 function() { open_eg_web_page('conify/global/acq/lineitem_alert'); }

diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
index d5a9be4..dfa0b56 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
@@ -129,6 +129,8 @@
     <command id="cmd_server_admin_copy_status"/>
     <command id="cmd_server_admin_marc_code"/>
     <command id="cmd_server_admin_billing_type"/>
+    <command id="cmd_server_admin_acq_invoice_item_type"/>
+    <command id="cmd_server_admin_acq_invoice_payment_method"/>
     <command id="cmd_server_admin_acq_cancel_reason"/>
     <command id="cmd_server_admin_acq_lineitem_alert"/>
     <command id="cmd_server_admin_acq_fund_tag"/>
@@ -382,6 +384,9 @@
                         <menuitem label="&staff.main.menu.admin.server_admin.acq.claim_policy.label;" accesskey="&staff.main.menu.admin.server_admin.acq.claim_policy.accesskey;" command="cmd_server_admin_acq_claim_policy"/>
                         <menuitem label="&staff.main.menu.admin.server_admin.acq.claim_policy_action.label;" accesskey="&staff.main.menu.admin.server_admin.acq.claim_policy_action.accesskey;" command="cmd_server_admin_acq_claim_policy_action"/>
                         <menuseparator />
+                        <menuitem label="&staff.main.menu.admin.server_admin.acq.invoice_item_type.label;" accesskey="&staff.main.menu.admin.server_admin.acq.invoice_item_type.accesskey;" command="cmd_server_admin_acq_invoice_item_type"/>
+                        <menuitem label="&staff.main.menu.admin.server_admin.acq.invoice_payment_method.label;" accesskey="&staff.main.menu.admin.server_admin.acq.invoice_payment_method.accesskey;" command="cmd_server_admin_acq_invoice_payment_method"/>
+                        <menuseparator />
                         <menuitem label="&staff.main.menu.admin.server_admin.acq.lineitem_alert.label;" accesskey="&staff.main.menu.admin.server_admin.acq.lineitem_alert.accesskey;" command="cmd_server_admin_acq_lineitem_alert"/>
                         <menuitem label="&staff.main.menu.admin.server_admin.acq.cancel_reason.label;" accesskey="&staff.main.menu.admin.server_admin.acq.cancel_reason.accesskey;" command="cmd_server_admin_acq_cancel_reason"/>
                     </menupopup>