X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.html;h=2ab0e0b2e37988e16fa76c267f26965a6ec47d55;hb=c4b71bc4459cb7d403cbebede470aeb2c6292a6e;hp=bdeb8e2372d45c17c14b5d94b3da55afb2e50fb1;hpb=2c757d7db4cb6a7b9655de13206fcc84fb7ce61f;p=freeside.git

diff --git a/httemplate/search/report_tax.html b/httemplate/search/report_tax.html
index bdeb8e237..2ab0e0b2e 100755
--- a/httemplate/search/report_tax.html
+++ b/httemplate/search/report_tax.html
@@ -1,30 +1,58 @@
-<%= include('/elements/header.html', 'Tax Report' ) %>
+<% include('/elements/header.html', 'Tax Report' ) %>
 
 <FORM ACTION="report_tax.cgi" METHOD="GET">
 
 <TABLE>
 
- <%= include( '/elements/tr-select-agent.html' ) %>
+% if ( $conf->config('tax-report_groups') ) {
+%   my @lines = $conf->config('tax-report_groups');
+    
+  <TR>
+    <TD ALIGN="right">Tax group</TD>
+    <TD>
+      <SELECT NAME="report_group">
 
- <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+        <OPTION VALUE="">all</OPTION>
 
- <% my $conf = new FS::Conf;
-    if ( $conf->exists('enable_taxclasses') ) {
- %>
+%       foreach my $line ( @lines ) {
+%         $line =~ /^\s*(.+)\s+(=|!=)\s+(.*)\s*$/ #or next;
+%           or do { warn "bad report_group line: $line\n"; next; };
+%         my($label, $op, $value) = ($1, $2, $3);
+
+          <OPTION VALUE="<% "$op $value" %>"><% $label %></OPTION>
+%       }
+
+      </SELECT>
+    </TD>
+  </TR>
+
+% }
+
+ <% include( '/elements/tr-select-agent.html', 'disable_empty'=>0 ) %>
+
+ <% include( '/elements/tr-input-beginning_ending.html' ) %>
+
+%    if ( $city ) {
+   <TR>
+     <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="show_cities" VALUE="1"></TD>
+     <TD>Show cities</TD>
+   </TR>
+% } 
+
+%    if ( $conf->exists('enable_taxclasses') ) {
    <TR>
      <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="show_taxclasses" VALUE="1"></TD>
      <TD>Show tax classes</TD>
    </TR>
- <% } %>
+% } 
 
- <% my @pkg_class = qsearch('pkg_class', {});
-    if ( @pkg_class ) {
- %>
+% my @pkg_class = qsearch('pkg_class', {});
+% if ( @pkg_class ) {
    <TR>
      <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="show_pkgclasses" VALUE="1"></TD>
      <TD>Show package classes</TD>
    </TR>
- <% } %>
+% } 
 
 </TABLE>
 
@@ -32,4 +60,20 @@
 
 </FORM>
 
-<%= include('/elements/footer.html') %>
+<% include('/elements/footer.html') %>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
+
+my $conf = new FS::Conf;
+
+my $city_sql = "SELECT COUNT(*) FROM cust_main_county
+                  WHERE city != '' AND city IS NOT NULL
+                  LIMIT 1";
+
+my $city_sth = dbh->prepare($city_sql) or die dbh->errstr;
+$city_sth->execute or die $city_sth->errstr;
+my $city = $city_sth->fetchrow_arrayref->[0];
+
+</%init>