patch from jamesrf for lp#756880 for Grocery Billing Location in Bill Patron wizard

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

diff --git a/Open-ILS/xul/staff_client/server/patron/bill_wizard.js b/Open-ILS/xul/staff_client/server/patron/bill_wizard.js
index ae4035a..b1c4d87 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/bill_wizard.js
+++ b/Open-ILS/xul/staff_client/server/patron/bill_wizard.js
@@ -129,7 +129,7 @@ function patron_bill_init() {
 
         retrieve_patron();
 
-        $('billing_location').setAttribute('value', g.OpenILS.data.hash.aou[ g.OpenILS.data.list.au[0].ws_ou() ].name() );
+        $('wizard_billing_location').setAttribute('value', g.OpenILS.data.hash.aou[ g.OpenILS.data.list.au[0].ws_ou() ].name() );
 
         if ( g.OpenILS.data.hash.cbt[ ml.value ] ) {
             $('bill_amount').value = g.OpenILS.data.hash.cbt[ ml.value ].default_price();

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 d07f71d..126f021 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
@@ -45,7 +45,7 @@
                 <grid>
                     <columns> <column flex="0" /> <column flex="0" /> </columns>
                     <rows id="page1_rows">
-                        <row><label value="&staff.patron.bill_wizard.location.value;"/><textbox id="billing_location" disabled="true" context="clipboard" /></row>
+                        <row><label value="&staff.patron.bill_wizard.location.value;"/><textbox id="wizard_billing_location" disabled="true" context="clipboard" /></row>
                         <row><label value="&staff.patron.bill_wizard.transaction_type.value;"/>
                             <menulist id="xact_type">
                                 <menupopup>