[open-ils-commits] r15317 - in branches/rel_1_6/Open-ILS: web/opac/locale/en-US xul/staff_client/chrome/content/main xul/staff_client/server/admin xul/staff_client/server/circ (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-01-13 17:16:24 -0500 (Wed, 13 Jan 2010)
New Revision: 15317

Modified:
   branches/rel_1_6/Open-ILS/web/opac/locale/en-US/lang.dtd
   branches/rel_1_6/Open-ILS/xul/staff_client/chrome/content/main/constants.js
   branches/rel_1_6/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
   branches/rel_1_6/Open-ILS/xul/staff_client/server/circ/util.js
Log:
partial backport of changeset 15315 for %courier_code% transit slip template macro and lib.courier_code org unit setting

Modified: branches/rel_1_6/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- branches/rel_1_6/Open-ILS/web/opac/locale/en-US/lang.dtd	2010-01-13 21:52:43 UTC (rev 15316)
+++ branches/rel_1_6/Open-ILS/web/opac/locale/en-US/lang.dtd	2010-01-13 22:16:24 UTC (rev 15317)
@@ -1678,6 +1678,8 @@
 <!ENTITY staff.server.admin.org_settings.ui.circ.show_billing_tab_on_bills.desc "If enabled and a patron has outstanding bills and the alert page is not required, show the billing tab by default, instead of the checkout tab, when a patron is loaded">
 <!ENTITY staff.server.admin.org_settings.ui.circ.patron_display_timeout_interval "GUI: Patron display timeout interval">
 <!ENTITY staff.server.admin.org_settings.ui.circ.patron_display_timeout_interval.desc "Set this if you would like patron displays in the staff client to be closed after a certain interval of inactivity.  Example \'5 minutes\'">
+<!ENTITY staff.server.admin.org_settings.lib.courier_code "Courier Code">
+<!ENTITY staff.server.admin.org_settings.lib.courier_code.desc "Courier Code for the library.  Available in transit slip templates as the &#37;courier_code&#37; macro.">
 
 
 <!ENTITY staff.server.admin.stat_cat.title "Evergreen: Statistical Category Editor">

Modified: branches/rel_1_6/Open-ILS/xul/staff_client/chrome/content/main/constants.js
===================================================================
--- branches/rel_1_6/Open-ILS/xul/staff_client/chrome/content/main/constants.js	2010-01-13 21:52:43 UTC (rev 15316)
+++ branches/rel_1_6/Open-ILS/xul/staff_client/chrome/content/main/constants.js	2010-01-13 22:16:24 UTC (rev 15317)
@@ -122,6 +122,7 @@
     'FM_AOU_IDS_RETRIEVE_VIA_RECORD_ID' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.actor.org_unit.retrieve_by_title', 'secure' : false },
     'FM_AOU_IDS_RETRIEVE_VIA_RECORD_ID.authoritative' : { 'app' : 'open-ils.cat', 'method' : 'open-ils.cat.actor.org_unit.retrieve_by_title.authoritative', 'secure' : false },
     'FM_AOUS_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.org_unit_setting.values.ranged.retrieve' },
+    'FM_AOUS_SPECIFIC_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.ou_setting.ancestor_default' },
     'FM_AOUT_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.org_types.retrieve', 'secure' : false },
     'FM_ASC_BATCH_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.stat_cat.asset.retrieve.batch', 'secure' : false },
     'FM_ASC_RETRIEVE_VIA_AOU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.stat_cat.asset.retrieve.all', 'secure' : false },

Modified: branches/rel_1_6/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
===================================================================
--- branches/rel_1_6/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml	2010-01-13 21:52:43 UTC (rev 15316)
+++ branches/rel_1_6/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml	2010-01-13 22:16:24 UTC (rev 15317)
@@ -209,6 +209,10 @@
                 'ui.circ.patron_display_timeout_interval' : {
                     label : '&staff.server.admin.org_settings.ui.circ.patron_display_timeout_interval;',
                     desc : '&staff.server.admin.org_settings.ui.circ.patron_display_timeout_interval.desc;',
+                },
+                'lib.courier_code' : {
+                    label : '&staff.server.admin.org_settings.lib.courier_code;',
+                    desc : '&staff.server.admin.org_settings.lib.courier_code.desc;',
                 }
             };
         </script>

Modified: branches/rel_1_6/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- branches/rel_1_6/Open-ILS/xul/staff_client/server/circ/util.js	2010-01-13 21:52:43 UTC (rev 15316)
+++ branches/rel_1_6/Open-ILS/xul/staff_client/server/circ/util.js	2010-01-13 22:16:24 UTC (rev 15317)
@@ -2029,6 +2029,7 @@
             'route_to' : '',
             'route_to_msg' : '',
             'route_to_org_fullname' : '',
+            'courier_code' : '',
             'street1' : '',
             'street2' : '',
             'city_state_zip' : '',
@@ -2289,6 +2290,10 @@
             print_data.route_to_org = lib;
             print_data.route_to_msg = document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.destination', [check.route_to]);
             print_data.route_to_org_fullname = lib.name();
+            var aous_req = network.simple_request('FM_AOUS_SPECIFIC_RETRIEVE',[ lib.id(), 'lib.courier_code', ses() ]);
+            if (aous_req) {
+                print_data.courier_code = aous_req.value || '';
+            }
             msg += print_data.route_to_msg;
             msg += '\n\n';
             msg += lib.name();