ws_ou instead of home_ou

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

diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js b/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
index 78a200c..498725d 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
@@ -225,7 +225,7 @@ OpenILS.data.prototype = {
                                [ 
                                        api.FM_AOU_RETRIEVE_RELATED_VIA_SESSION.app,
                                        api.FM_AOU_RETRIEVE_RELATED_VIA_SESSION.method,
-                                       [ obj.session ],
+                                       [ obj.session, obj.list.au[0].ws_ou() ], /* use ws_ou and not home_ou */
                                        true
                                ]
                        )
@@ -240,7 +240,7 @@ OpenILS.data.prototype = {
                                        [ 
                                                api.FM_ACTSC_RETRIEVE_VIA_AOU.app,
                                                api.FM_ACTSC_RETRIEVE_VIA_AOU.method,
-                                               [ obj.session, obj.list.au[0].home_ou() ],
+                                               [ obj.session, obj.list.au[0].ws_ou() ],
                                                true
                                        ]
                                )();
@@ -255,7 +255,7 @@ OpenILS.data.prototype = {
                                        [ 
                                                api.FM_ASC_RETRIEVE_VIA_AOU.app,
                                                api.FM_ASC_RETRIEVE_VIA_AOU.method,
-                                               [ obj.session, obj.list.au[0].home_ou() ],
+                                               [ obj.session, obj.list.au[0].ws_ou() ],
                                                true
                                        ]
                                )();
@@ -270,8 +270,7 @@ OpenILS.data.prototype = {
                                        [
                                                api.FM_CNCT_RETRIEVE.app,
                                                api.FM_CNCT_RETRIEVE.method,
-                                               /* FIXME -- later, in most places where we look at the home_ou of the sessioned staff member, we'll want to use the workstation ou instead */
-                                               [ obj.list.au[0].home_ou() ], 
+                                               [ obj.list.au[0].ws_ou() ], 
                                                false
                                        ]
                                );

diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js
index bf05485..27147a4 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkout.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.js
@@ -110,7 +110,7 @@ circ.checkout.prototype = {
                                                        try {
                                                                var params = { 
                                                                        'patron' : obj.patron, 
-                                                                       'lib' : obj.data.hash.aou[ this.data.list.au[0].home_ou() ],
+                                                                       'lib' : obj.data.hash.aou[ this.data.list.au[0].ws_ou() ],
                                                                        'staff' : obj.data.list.au[0],
                                                                        'header' : obj.data.print_list_templates.checkout.header,
                                                                        'line_item' : obj.data.print_list_templates.checkout.line_item,

diff --git a/Open-ILS/xul/staff_client/server/circ/in_house_use.js b/Open-ILS/xul/staff_client/server/circ/in_house_use.js
index 81f3777..cca35fd 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/in_house_use.js
+++ b/Open-ILS/xul/staff_client/server/circ/in_house_use.js
@@ -117,9 +117,8 @@ circ.in_house_use.prototype = {
 
                        var copy = obj.network.simple_request('FM_ACP_RETRIEVE_VIA_BARCODE',[ barcode ]); 
                        var mods = obj.network.simple_request('MODS_SLIM_RECORD_RETRIEVE_VIA_COPY',[ copy.id() ]);
-                       /* FIXME -- Use workstation ou */
                        var result = obj.network.simple_request('FM_AIHU_CREATE',
-                               [ obj.session, { 'copyid' : copy.id(), 'location' : obj.data.list.au[0].home_ou(), 'count' : multiplier } ]
+                               [ obj.session, { 'copyid' : copy.id(), 'location' : obj.data.list.au[0].ws_ou(), 'count' : multiplier } ]
                        );
 
                        obj.list.append(

diff --git a/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js b/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js
index e26d46e..7c35463 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js
+++ b/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js
@@ -236,7 +236,7 @@ circ.print_list_template_editor.prototype = {
                try {
                        var params = { 
                                'patron' : this.test_patron, 
-                               'lib' : this.data.hash.aou[ this.data.list.au[0].home_ou() ],
+                               'lib' : this.data.hash.aou[ this.data.list.au[0].ws_ou() ],
                                'staff' : this.data.list.au[0],
                                'header' : this.controller.view.header.value,
                                'line_item' : this.controller.view.line_item.value,

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 1bfac3b..a07818d 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -349,7 +349,7 @@ circ.util.checkin_via_barcode = function(session,barcode,backdate) {
                                case 8: /* ON HOLDS SHELF */
                                        check.route_to = 'HOLDS SHELF';
                                        if (check.payload.hold) {
-                                               if (check.payload.hold.pickup_lib() != data.list.au[0].home_ou()) {
+                                               if (check.payload.hold.pickup_lib() != data.list.au[0].ws_ou()) {
                                                        msg += 'FIXME:  We should have received a ROUTE_ITEM\n';
                                                } else {
                                                        msg += 'This item needs to be routed to ' + check.route_to + '.\n';

diff --git a/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul b/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
index d2cb6a6..ea945e7 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
@@ -53,7 +53,7 @@
                                document.getElementById('patron_name').setAttribute('value',
                                        g.au_obj.family_name() + ', ' + g.au_obj.first_given_name() + ' : ' + g.au_obj.card().barcode() );
                                document.getElementById('billing_location').setAttribute('value',
-                                       g.OpenILS.data.hash.aou[ g.OpenILS.data.list.au[0].home_ou() ].name() );
+                                       g.OpenILS.data.hash.aou[ g.OpenILS.data.list.au[0].ws_ou() ].name() );
 
                                document.getElementById('bill_amount').focus();
 
@@ -71,7 +71,7 @@
                        try {
                                var grocery = new mg();
                                        grocery.isnew('1');
-                                       grocery.billing_location( g.OpenILS.data.list.au[0].home_ou() );
+                                       grocery.billing_location( g.OpenILS.data.list.au[0].ws_ou() );
                                        grocery.usr( g.au_obj.id() );
                                        grocery.note( document.getElementById('bill_note').value );
                                JSAN.use('util.network'); var net = new util.network();