lp1436797-Remove grocery from the UI

Removes xact_type as a menu when adding a bill and from column lists. End
users are confused by the 'grocery' terminology and the info isn't
really necessary to display in the UI. This branch also displays the
last billing type and last billing note by default since these two fields
will let staff know if the bill is system generated.

Signed-off-by: Kathy Lussier <klussier@masslnc.org>

diff --git a/Open-ILS/xul/staff_client/server/patron/bill_history.js b/Open-ILS/xul/staff_client/server/patron/bill_history.js
index d897f6f..33c237c 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/bill_history.js
+++ b/Open-ILS/xul/staff_client/server/patron/bill_history.js
@@ -177,11 +177,6 @@ function init_payments_list() {
     g.payments_list.init( {
         'columns' : g.payments_list.fm_columns('mp').concat( [
             {
-                'id' : 'payments_blob_xact_type', 'flex' : 0,
-                'label' : $('patronStrings').getString('staff.patron.bill_history.column.xact_type.label'),
-                'render' : function(my) { return my.xact_type; }
-            },
-            {
                 'id' : 'payments_blob_last_billing_type', 'flex' : 0,
                 'label' : $('patronStrings').getString('staff.patron.bill_history.column.last_billing_type.label'),
                 'render' : function(my) { return my.last_billing_type; }

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 44cb12a..dcf8d7a 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
@@ -47,14 +47,6 @@
                     <columns> <column flex="0" /> <column flex="0" /> </columns>
                     <rows id="page1_rows">
                         <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>
-                                    <menuitem label="&staff.patron.bill_wizard.grocery.label;" value="grocery" selected="true"/>
-                                    <menuitem label="&staff.patron.bill_wizard.circulation.label;" value="circulation" disabled="true"/>
-                                </menupopup>
-                            </menulist>
-                        </row>
                         <row><label value="&staff.patron.bill_wizard.billing_type.label;"/>
                             <hbox id="menu_placeholder"/>
                         </row>

diff --git a/Open-ILS/xul/staff_client/server/patron/util.js b/Open-ILS/xul/staff_client/server/patron/util.js
index d77b3de..b07c128 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/util.js
+++ b/Open-ILS/xul/staff_client/server/patron/util.js
@@ -27,10 +27,6 @@ patron.util.mbts_columns = function(modify,params) {
             'primary' : false, 'hidden' : true, 'editable' : false, 'render' : function(my) { return my.mbts.usr() ? "Id = " + my.mbts.usr() : ""; }
         },
         {
-            'id' : 'xact_type', 'label' : commonStrings.getString('staff.mbts_xact_type_label'), 'flex' : 1,
-            'primary' : false, 'hidden' : false, 'editable' : false, 'render' : function(my) { return my.mbts.xact_type(); }
-        },
-        {
             'id' : 'balance_owed', 'label' : commonStrings.getString('staff.mbts_balance_owed_label'), 'flex' : 1,
             'primary' : false, 'hidden' : false, 'editable' : false, 'render' : function(my) { return util.money.sanitize( my.mbts.balance_owed() ); },
             'sort_type' : 'money'
@@ -47,11 +43,11 @@ patron.util.mbts_columns = function(modify,params) {
         },
         {
             'id' : 'last_billing_note', 'label' : commonStrings.getString('staff.mbts_last_billing_note_label'), 'flex' : 2,
-            'primary' : false, 'hidden' : true, 'editable' : false, 'render' : function(my) { return my.mbts.last_billing_note(); }
+            'primary' : false, 'hidden' : false, 'editable' : false, 'render' : function(my) { return my.mbts.last_billing_note(); }
         },
         {
             'id' : 'last_billing_type', 'label' : commonStrings.getString('staff.mbts_last_billing_type_label'), 'flex' : 1,
-            'primary' : false, 'hidden' : true, 'editable' : false, 'render' : function(my) { return my.mbts.last_billing_type(); }
+            'primary' : false, 'hidden' : false, 'editable' : false, 'render' : function(my) { return my.mbts.last_billing_type(); }
         },
         {
             'id' : 'last_billing_ts', 'label' : commonStrings.getString('staff.mbts_last_billing_timestamp_label'), 'flex' : 1,