invoice_sections_with_taxes per-agent, RT#79636

[freeside.git] / httemplate / edit / credit-cust_bill_pkg.html

diff --git a/httemplate/edit/credit-cust_bill_pkg.html b/httemplate/edit/credit-cust_bill_pkg.html
index 3d1cf24..85f7943 100644 (file)
--- a/httemplate/edit/credit-cust_bill_pkg.html
+++ b/httemplate/edit/credit-cust_bill_pkg.html
@@ -70,18 +70,19 @@
   <TH ALIGN="right" COLSPAN=2>Total credit amount: </TD>
   <TH ALIGN="right" ID="total_td"><% $money_char %><% sprintf('%.2f', 0) %></TD>
 </TR>
-<INPUT TYPE="hidden" NAME="amount" ID="total_el" VALUE="0.00">
 
 </table>
 
+<INPUT TYPE="hidden" NAME="amount" ID="total_el" VALUE="0.00">
+
 <table>
 
 <& /elements/tr-select-reason.html,
               'field'          => 'reasonnum',
               'reason_class'   => 'R',
-              #XXX reconcile both this and show_taxes wanteding to enable this
+              #XXX reconcile both this and show_taxes wanting to enable this
               'id'             => 'select_reason',
-              'control_button' => "document.getElementById('credit_button')",
+              'control_button' => 'credit_button',
               'cgi'            => $cgi,
 &>
 
@@ -244,7 +245,7 @@ function calc_total(what) {
 <%init>
 
 my $curuser = $FS::CurrentUser::CurrentUser;
-die "access denied" unless $curuser->access_right('Post credit');
+die "access denied" unless $curuser->access_right('Credit line items');
 
 #a tiny bit of false laziness w/search/cust_bill_pkg.cgi, but we're pretty
 # specialized and a piece of UI, not a report
@@ -268,7 +269,8 @@ my @cust_bill_pkg = qsearch({
   'select'    => 'cust_bill_pkg.*',
   'table'     => 'cust_bill_pkg',
   'addl_from' => 'LEFT JOIN cust_bill USING (invnum)',
-  'extra_sql' => "WHERE custnum = $custnum AND pkgnum != 0",
+  'extra_sql' => "WHERE custnum = $custnum ".
+                 "AND (pkgnum != 0 or feepart IS NOT NULL)",
   'order_by'  => 'ORDER BY invnum ASC, billpkgnum ASC',
 });