From 4d74d17419b99ef733e7e8f773cdf8ff1d42ee7b Mon Sep 17 00:00:00 2001
From: Jason Stephenson <jason@sigio.com>
Date: Sun, 6 Oct 2013 10:52:43 -0400
Subject: [PATCH] Do not expose the void payment in the user interface.

Things will get too complicated if void payments are applied ad hoc
to transactions.  Staff should still use the existing void interface
so that void payments will get linked to individual billings.  If not,
"unvoiding" a bill becomes nearly impossibl.

Signed-off-by: Jason Stephenson <jason@sigio.com>
---
 Open-ILS/web/opac/locale/en-US/lang.dtd           | 1 -
 Open-ILS/xul/staff_client/server/patron/bill2.xul | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index d787753d12..c3c6cf020d 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -3373,7 +3373,6 @@
 <!ENTITY staff.patron.bills_overlay.patron_credit.label "Patron Credit">
 <!ENTITY staff.patron.bills_overlay.word.label "Work">
 <!ENTITY staff.patron.bills_overlay.forgive.label "Forgive">
-<!ENTITY staff.patron.bills_overlay.void.label "Void">
 <!ENTITY staff.patron.bills_overlay.goods.label "Goods">
 <!ENTITY staff.patron.bills_overlay.payment_received.value "Payment received">
 <!ENTITY staff.patron.bills_overlay.payment_received.accesskey "a">
diff --git a/Open-ILS/xul/staff_client/server/patron/bill2.xul b/Open-ILS/xul/staff_client/server/patron/bill2.xul
index 83dcabc5bb..b0135b4bd9 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill2.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill2.xul
@@ -101,8 +101,7 @@
                                         <menuitem id="payment_type_menuitem4" class="hide_patron_credit" label="&staff.patron.bills_overlay.patron_credit.label;" value="credit_payment" />
                                         <menuitem id="payment_type_menuitem5" class="hide_patron_work" label="&staff.patron.bills_overlay.word.label;" value="work_payment"/>
                                         <menuitem id="payment_type_menuitem6" class="hide_patron_forgive" label="&staff.patron.bills_overlay.forgive.label;" value="forgive_payment"/>
-                                        <menuitem id="payment_type_menuitem7" class="hide_patron_void" label="&staff.patron.bills_overlay.void.label;" value="void_payment"/>
-                                        <menuitem id="payment_type_menuitem8" class="hide_patron_goods" label="&staff.patron.bills_overlay.goods.label;" value="goods_payment"/>
+                                        <menuitem id="payment_type_menuitem7" class="hide_patron_goods" label="&staff.patron.bills_overlay.goods.label;" value="goods_payment"/>
                                     </menupopup>
                                 </menulist>
                             </row>
-- 
2.11.0