X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=2d090820a810d64834fb26f5f619bcfc3f88a665;hb=3e4d22b2cd42755981754f95de97f915a31f8233;hp=a8b4ac15cfaabc4ee7edb8eeb8d96b2ad7ba3bb1;hpb=ce1b61e7d65317a74f680afb4cb8d8306e14fa5f;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index a8b4ac15c..2d090820a 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -2,30 +2,41 @@
emt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
) &>
-% if ( $conf->exists('deleteinvoices')
-% && $curuser->access_right('Delete invoices' )
-% )
-% {
-
-
-
- <% mt('Delete this invoice') |h %>
-
-
+
+
+% 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) )
+% && scalar( grep $payby{$_}, qw(BILL CASH WEST MCRD MCHK) )
% && $curuser->access_right(['Post payment', 'Post check payment', 'Post cash payment'])
% && ! $conf->exists('pkg-balances')
% )
@@ -54,6 +65,11 @@
<% 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 %>
% }
@@ -68,7 +84,7 @@
% $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 %> )
@@ -80,8 +96,21 @@
% }
% 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 %>
@@ -91,31 +120,63 @@
| <% 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 %>
-
-% }
-% my $br = 0;
-% if ( $cust_bill->num_cust_event ) { $br++;
-( <% mt('View invoice events') |h %> )
+% $br++;
% }
+% if ( $cust_bill->num_cust_event ) {
+<% $br ? '|' : '' %>
+<% mt('View invoice events') |h %>
+% $br++;
+% }
+
% if ( $cust_bill->num_cust_bill_event ) { $br++;
( <% mt('View deprecated, old-style invoice events') |h %> )
% }
-<% $br ? '
' : '' %>
+% my @modes = grep {! $_->disabled}
+% $cust_bill->cust_main->agent->invoice_modes;
+% if ( @modes || $include_statement_template ) {
+<% $br ? '|' : '' %>
+<% emt('View as:') %>
+