[open-ils-commits] r16736 - in trunk/Open-ILS: web/js/ui/default/conify/global/acq web/opac/locale/en-US web/templates/default/conify/global/acq xul/staff_client/chrome/content/main (senator)
svn at svn.open-ils.org
svn at svn.open-ils.org
Wed Jun 16 16:39:06 EDT 2010
Author: senator
Date: 2010-06-16 16:39:00 -0400 (Wed, 16 Jun 2010)
New Revision: 16736
Added:
trunk/Open-ILS/web/templates/default/conify/global/acq/invoice_item_type.tt2
trunk/Open-ILS/web/templates/default/conify/global/acq/invoice_payment_method.tt2
Modified:
trunk/Open-ILS/web/js/ui/default/conify/global/acq/fund_tag.js
trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
Log:
Acq: Fix display failure in fund tag interface. Add admin interfaces for
invoice_payment_method and invoice_item_type.
Modified: trunk/Open-ILS/web/js/ui/default/conify/global/acq/fund_tag.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/conify/global/acq/fund_tag.js 2010-06-16 19:41:27 UTC (rev 16735)
+++ trunk/Open-ILS/web/js/ui/default/conify/global/acq/fund_tag.js 2010-06-16 20:39:00 UTC (rev 16736)
@@ -29,6 +29,7 @@
buildFtGrid();
}
);
+ buildFtGrid();
}
);
}
@@ -42,7 +43,7 @@
{"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 @@
}
);
}
+ },
+ "oncomplete": function() {
+ ftGrid.hideLoadProgressIndicator();
}
}
);
Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-06-16 19:41:27 UTC (rev 16735)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-06-16 20:39:00 UTC (rev 16736)
@@ -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">
Added: trunk/Open-ILS/web/templates/default/conify/global/acq/invoice_item_type.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/conify/global/acq/invoice_item_type.tt2 (rev 0)
+++ trunk/Open-ILS/web/templates/default/conify/global/acq/invoice_item_type.tt2 2010-06-16 20:39:00 UTC (rev 16736)
@@ -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 %]
Added: trunk/Open-ILS/web/templates/default/conify/global/acq/invoice_payment_method.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/conify/global/acq/invoice_payment_method.tt2 (rev 0)
+++ trunk/Open-ILS/web/templates/default/conify/global/acq/invoice_payment_method.tt2 2010-06-16 20:39:00 UTC (rev 16736)
@@ -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 %]
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2010-06-16 19:41:27 UTC (rev 16735)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2010-06-16 20:39:00 UTC (rev 16736)
@@ -672,6 +672,14 @@
['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'); }
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul 2010-06-16 19:41:27 UTC (rev 16735)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul 2010-06-16 20:39:00 UTC (rev 16736)
@@ -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>
More information about the open-ils-commits
mailing list