fix examples to use elements/init_overlib.html

[freeside.git] / httemplate / search / cust_bill.html

diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index fe2f6e5..2860f7a 100755 (executable)
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -144,7 +144,7 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
                     '$%.2f outstanding balance',
                   ];
   }
-  $count_query .=  " FROM cust_bill $join_cust_main WHERE $extra_sql";
+  $count_query .=  " FROM cust_bill $join_cust_main $extra_sql";
 
   $sql_query = {
     'table'     => 'cust_bill',
@@ -159,7 +159,8 @@ if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
                      FS::cust_bill->owed_sql. ' AS owed',
                      FS::cust_bill->net_sql.  ' AS net',
                    ),
-    'extra_sql' => "$extra_sql $orderby"
+    'extra_sql' => $extra_sql,
+    'order_by'  => $orderby,
   };
 
 }
@@ -212,16 +213,18 @@ function confirm_fax_process() {
 
 </SCRIPT>';
 
-my $menubar =  [
-                'Main menu' => $p,
-                'Print these invoices' =>
-                  "javascript:confirm_print_process()",
-                'Email these invoices' =>
-                  "javascript:confirm_email_process()",
-              ];
-
-push @$menubar, 'Fax these invoices' =>
-                 "javascript:confirm_fax_process()"
- if $conf->exists('hylafax');
+my $menubar = [];
+
+if ( $FS::CurrentUser::CurrentUser->access_right('Resend invoices') ) {
+
+  push @$menubar, 'Print these invoices' =>
+                    "javascript:confirm_print_process()",
+                  'Email these invoices' =>
+                    "javascript:confirm_email_process()";
+
+  push @$menubar, 'Fax these invoices' =>
+                    "javascript:confirm_fax_process()"
+    if $conf->exists('hylafax');
+}
 
 </%init>