X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=2ff3ca8834983ef3270e117aee868f08c4c77370;hb=71d389e6554fd9994ac9c18bc59fd43449b8cca1;hp=8ddeb1c81312736e2fdf8edd057d8e589e43c4d7;hpb=a363a49c213f1e64add5c34a8a2bd17d154adfd3;p=freeside.git
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 8ddeb1c81..2ff3ca883 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,31 +1,25 @@
<& /elements/header.html, mt('Invoice View'), menubar(
- mt("View this customer (#[_1])",$display_custnum) => "${p}view/cust_main.cgi?$custnum",
+ 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 && $curuser->access_right('Void invoices') ) {
+ <& /elements/popup_link.html,
+ 'label' => emt('Void this invoice'),
+ 'actionlabel' => emt('Void this invoice'),
+ 'action' => $p.'misc/void-cust_bill.html?invnum='.$invnum,
+ &>
-
% }
% 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,10 +48,36 @@
<% 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 %>
% }
+% if ( $conf->exists('cust_bill-enable_promised_date') ) {
+% my $onclick = include('/elements/popup_link_onclick.html',
+% 'action' => $p.'misc/cust_bill-promised_date.html?'.$invnum,
+% 'actionlabel' => emt('Set promised payment date'),
+% 'width' => 320,
+% 'height' => 240,
+% );
+% $onclick = '';
+% if ( $cust_bill->promised_date ) {
+% my $date_format = $conf->config('date_format') || '%b %o, %Y';
+ <% mt('Payment promised by [_1]',
+ time2str($date_format, $cust_bill->promised_date) ) %>
+ ( <% $onclick %><% mt('change') |h %> )
+
+% }
+% elsif ( $cust_bill->owed > 0 ) {
+ <% $onclick %><% mt('Set promised payment date' ) |h %>
+
+% }
+% }
+
% if ( $curuser->access_right('Resend invoices') ) {
<% mt('Re-print this invoice') |h %>
@@ -83,18 +103,37 @@
% my $br = 0;
% if ( $cust_bill->num_cust_event ) { $br++;
( <% mt('View invoice events') |h %> )
-% }
+% }
-% if ( $cust_bill->num_cust_bill_event ) { $br++;
-( <% mt('View deprecated, old-style invoice events') |h %> )
+% my @modes = grep {! $_->disabled}
+% $cust_bill->cust_main->agent->invoice_modes;
+% if ( @modes ) {
+( <% mt('View as:') %>
+