diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 17:57:01 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 17:57:01 -0700 |
| commit | aa9537af853969b34d2da6ca855f1d2fcdec16d4 (patch) | |
| tree | 7fcb68036163f572e3de95ac9e923807eb8659fc /httemplate/view | |
| parent | 31f3763747b82764bb019cfab5b2a2945fc9a99d (diff) | |
| parent | a961013d0550e9e033b86e7bb677de05ddb9e7b7 (diff) | |
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
Diffstat (limited to 'httemplate/view')
| -rw-r--r-- | httemplate/view/cust_main/contacts.html | 4 | ||||
| -rw-r--r-- | httemplate/view/cust_main/payment_history.html | 2 |
2 files changed, 5 insertions, 1 deletions
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> 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> |