[freeside-commits] freeside/httemplate/search report_queued_newtax.cgi, NONE, 1.1 queue.html, 1.6, 1.7 report_newtax.html, 1.2, 1.3

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv20373/httemplate/search

Modified Files:
	queue.html report_newtax.html 
Added Files:
	report_queued_newtax.cgi 
Log Message:
cope with poor tax liability report performance by allowing queuing of reports RT#8274

Index: queue.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/queue.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -d -r1.6 -r1.7
--- queue.html	13 Jan 2008 20:57:36 -0000	1.6
+++ queue.html	13 May 2010 05:43:22 -0000	1.7
@@ -50,10 +50,14 @@
                                                  || ( ! $noactions
                                                       && $status =~ /^failed/
                                                       || $status =~ /^locked/
+                                                      || $status =~ /^done/
                                                     );
                                  if ( $changable ) {
+                                   $status .= qq! (!;
+                                   $status .=
+                                     qq! &nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=new">retry</A>&nbsp;|!
+                                     unless $status =~ /^done/;
                                    $status .=
-                                     qq! (&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=new">retry</A>&nbsp;|!.
                                      qq!&nbsp;<A HREF="$p/misc/queue.cgi?jobnum=$jobnum&action=del">remove</A>&nbsp;)!;
                                  }
                                  $status;

--- NEW FILE: report_queued_newtax.cgi ---
<% include("/elements/header.html", "Queue Tax Report") %>
<% include("/elements/error.html") %>
% unless ($error) {
  <CENTER>
  Report queued.  Check the job queue for status.
  </CENTER>
% }
<% include("/elements/footer.html") %>
<%init>

die "access denied"
  unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');

my $error = FS::tax_rate::queue_liability_report($cgi);

</%init>

Index: report_newtax.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_newtax.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- report_newtax.html	10 Dec 2008 21:43:43 -0000	1.2
+++ report_newtax.html	13 May 2010 05:43:22 -0000	1.3
@@ -1,6 +1,6 @@
 <% include('/elements/header.html', 'Tax Report' ) %>
 
-<FORM ACTION="report_newtax.cgi" METHOD="GET">
+<FORM ACTION="report_queued_newtax.cgi" METHOD="GET">
 
 <TABLE>