X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=d9525750cdc6923dbae7e5898dcffbf04e805dba;hb=0ff3950a9293b9055363c327816276ff45268d82;hp=2ff3ca8834983ef3270e117aee868f08c4c77370;hpb=9aee669886202be7035e6c6049fc71bc99dd3013;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 2ff3ca883..d9525750c 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -9,17 +9,33 @@ function areyousure(href, message) {
}
-% if ( !$cust_bill->closed && $curuser->access_right('Void invoices') ) {
+% if ( !$cust_bill->closed ) { # otherwise allow no changes
+% my $can_delete = $conf->exists('deleteinvoices')
+% && $curuser->access_right('Delete invoices');
+% my $can_void = $curuser->access_right('Void invoices');
+% if ( $can_void ) {
<& /elements/popup_link.html,
'label' => emt('Void this invoice'),
'actionlabel' => emt('Void this invoice'),
'action' => $p.'misc/void-cust_bill.html?invnum='.$invnum,
&>
-
+% }
+% if ( $can_void and $can_delete ) {
+ |
+% }
+% if ( $can_delete ) {
+ \
+ <% emt('Delete this invoice') |h %>
+% }
+% if ( $can_void or $can_delete ) {
+
+% }
% }
% if ( $cust_bill->owed > 0
-% && scalar( grep $payby{$_}, qw(BILL CASH WEST MCRD MCHK) )
% && $curuser->access_right(['Post payment', 'Post check payment', 'Post cash payment'])
% && ! $conf->exists('pkg-balances')
% )
@@ -28,30 +44,30 @@ function areyousure(href, message) {
<% mt('Post') |h %>
-% if ( $payby{'BILL'} && $curuser->access_right(['Post payment', 'Post check payment']) ) {
+% if ( $curuser->access_right(['Post payment', 'Post check payment']) ) {
<% $s++ ? ' | ' : '' %>
<% mt('check') |h %>
% }
-% if ( $payby{'CASH'} && $curuser->access_right(['Post payment', 'Post cash payment']) ) {
+% if ( $curuser->access_right(['Post payment', 'Post cash payment']) ) {
<% $s++ ? ' | ' : '' %>
<% mt('cash') |h %>
% }
-% if ( $payby{'WEST'} && $curuser->access_right(['Post payment']) ) {
- <% $s++ ? ' | ' : '' %>
- <% mt('Western Union') |h %>
-% }
-
-% if ( $payby{'MCRD'} && $curuser->access_right(['Post payment']) ) {
- <% $s++ ? ' | ' : '' %>
- <% mt('manual credit card') |h %>
-% }
-
-% if ( $payby{'MCHK'} && $curuser->access_right(['Post payment']) ) {
- <% $s++ ? ' | ' : '' %>
- <% mt('manual electronic check') |h %>
-% }
+%# % if ( $payby{'WEST'} && $curuser->access_right(['Post payment']) ) {
+%# <% $s++ ? ' | ' : '' %>
+%# <% mt('Western Union') |h %>
+%# % }
+%#
+%# % if ( $payby{'MCRD'} && $curuser->access_right(['Post payment']) ) {
+%# <% $s++ ? ' | ' : '' %>
+%# <% mt('manual credit card') |h %>
+%# % }
+%#
+%# % if ( $payby{'MCHK'} && $curuser->access_right(['Post payment']) ) {
+%# <% $s++ ? ' | ' : '' %>
+%# <% mt('manual electronic check') |h %>
+%# % }
<% mt('payment against this invoice') |h %>
@@ -79,8 +95,21 @@ function areyousure(href, message) {
% }
% if ( $curuser->access_right('Resend invoices') ) {
+ <% mt('Print this invoice') |h %>
+% }
- <% mt('Re-print this invoice') |h %>
+% if ( $conf->exists('support-key')
+% && $curuser->access_right('Print and mail invoices')
+% )
+% {
+ | <& /elements/popup_link.html,
+ 'action' => $p."misc/post_fsinc-invoice.cgi?$link",
+ 'label' => 'Print and mail this invoice online',
+ 'actionlabel' => 'Invoice printing and mailing',
+ &>
+% }
+
+% if ( $curuser->access_right('Resend invoices') ) {
% if ( grep { $_ ne 'POST' } $cust_bill->cust_main->invoicing_list ) {
| <% mt('Re-email this invoice') |h %>
@@ -90,25 +119,32 @@ function areyousure(href, message) {
| <% mt('Re-fax this invoice') |h %>
% }
-
+% }
+% if ( $curuser->access_right('Resend invoices')
+% || $curuser->access_right('Print and mail invoices') ) {
+
% }
-% if ( $conf->exists('invoice_latex') ) {
+% my $br = 0;
+% if ( $conf->exists('invoice_latex') ) {
<% mt('View typeset invoice PDF') |h %>
-
+
+% $br++;
% }
-% my $br = 0;
-% if ( $cust_bill->num_cust_event ) { $br++;
-( <% mt('View invoice events') |h %> )
+% if ( $cust_bill->num_cust_event ) {
+<% $br ? '|' : '' %>
+<% mt('View invoice events') |h %>
+% $br++;
% }
% my @modes = grep {! $_->disabled}
% $cust_bill->cust_main->agent->invoice_modes;
-% if ( @modes ) {
-( <% mt('View as:') %>
+% if ( @modes || $include_statement_template ) {
+<% $br ? '|' : '' %>
+<% mt('View as:') %>