From f5cc5eb0b51cf3c5e91fda0a47965cbe6f40496e Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Wed, 8 Jul 2015 21:33:10 -0500
Subject: RT#34078: Payment History Report / Statement [menu fix, v3 only]

---
 httemplate/view/cust_main/payment_history.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/view')

diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index db2cf4f23..69571c78e 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -151,7 +151,7 @@
 
 %# invoice reports, combined statement
 % if ( $curuser->access_right('List invoices') ) { 
-%   if ( $curuser->access_right('Bulk send customer notices')
+%   if ( $curuser->access_right('Resend invoices')
 %          && $cust_main->invoicing_list_emailonly ) {
 
   <A HREF="<% $p %>misc/email-customer-statement.html?table=cust_main;agent_virt_agentnum=<% $cust_main->agentnum %>;custnum=<% $custnum %>"><% mt('Email statement to this customer') |h %></A>
-- 
cgit v1.2.1


From a961013d0550e9e033b86e7bb677de05ddb9e7b7 Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Wed, 8 Jul 2015 22:57:10 -0500
Subject: RT#29285: State field not needed for New Zealand [interface, v3 only]

---
 httemplate/view/cust_main/contacts.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'httemplate/view')

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index e810d6f5d..136f634a4 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -93,8 +93,12 @@
 % } 
 
 <TR>
+% if ( $location->city ) {
   <TD ALIGN="right"><% mt('City') |h %></TD>
   <TD BGCOLOR="#ffffff"><% $location->city |h %></TD>
+% } else {
+  <TD COLSPAN="2"></TD>
+% }
 % if ( $location->county ) {
     <TD ALIGN="right"><% mt('County') |h %></TD>
     <TD BGCOLOR="#ffffff"><% $location->county |h %></TD>
-- 
cgit v1.2.1