X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=6d5277612f190d181b3a4519bf7380ae19dcbade;hb=636bd62e61bba10718df2f048d44fb475964eb66;hp=8884ddea4404f5d16dc5d4a0f6f348bed68433de;hpb=a0e3c43f10daaff70886197ff40a47d92f2c345b;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 8884ddea4..6d5277612 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -9,13 +9,30 @@ 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
@@ -66,7 +83,7 @@ function areyousure(href, message) {
% $onclick = '';
% if ( $cust_bill->promised_date ) {
% my $date_format = $conf->config('date_format') || '%b %o, %Y';
- <% mt('Payment promised by [_1]',
+ <% emt('Payment promised by [_1]',
time2str($date_format, $cust_bill->promised_date) ) %>
( <% $onclick %><% mt('change') |h %> )
@@ -78,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 %>
@@ -89,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 ? '|' : '' %>
+<% emt('View as:') %>