[freeside-commits] freeside/httemplate/search report_tax.cgi, 1.64.4.1, 1.64.4.2 cust_bill_pkg.cgi, 1.37.2.6, 1.37.2.7

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	report_tax.cgi cust_bill_pkg.cgi 
Log Message:
fix tax reports for taxclass+non-taxclass cases, RT#13160

Index: report_tax.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_tax.cgi,v
retrieving revision 1.64.4.1
retrieving revision 1.64.4.2
diff -u -w -d -r1.64.4.1 -r1.64.4.2
--- report_tax.cgi	8 Nov 2010 21:54:49 -0000	1.64.4.1
+++ report_tax.cgi	21 Jul 2011 23:33:11 -0000	1.64.4.2
@@ -366,12 +366,13 @@
 
   } else {
 
-    $regions{$label}->{'url_param'} .= ';taxclassNULL=1'
-      if $cgi->param('show_taxclasses');
-
     my $same_sql = $r->sql_taxclass_sameregion;
     $mywhere .= " AND $same_sql" if $same_sql;
 
+    $regions{$label}->{'url_param'} .= ';taxclassNULL=1'
+      if $cgi->param('show_taxclasses')
+      || $same_sql;
+
   }
 
   my $fromwhere = "$from_join_cust_pkg $mywhere"; # AND payby != 'COMP' ";

Index: cust_bill_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill_pkg.cgi,v
retrieving revision 1.37.2.6
retrieving revision 1.37.2.7
diff -u -w -d -r1.37.2.6 -r1.37.2.7
--- cust_bill_pkg.cgi	11 Apr 2011 07:04:47 -0000	1.37.2.6
+++ cust_bill_pkg.cgi	21 Jul 2011 23:33:11 -0000	1.37.2.7
@@ -75,6 +75,7 @@
                    \&FS::UI::Web::cust_fields,
                  ],
                  'sort_fields' => [
+                   '',
                    'setup', #broken in $unearned case i guess
                    ( $unearned ? ('', '') : () ),
                    ( $use_usage eq 'recurring' ? 'recur - usage' :
@@ -204,11 +205,8 @@
   #
   #} else {
 
-    push @where,
-      ' ( '. join(' OR ',
-                    map ' part_pkg.taxclass = '.dbh->quote($_),
-                        $cgi->param('taxclass')
-                 ).
+    push @where, ' part_pkg.taxclass IN ( '.
+                   join(', ', map dbh->quote($_), $cgi->param('taxclass') ).
       ' ) ';
 
   #}
@@ -315,6 +313,7 @@
     die "unknown base region for empty taxclass" unless $cust_main_county;
 
     my $same_sql = $cust_main_county->sql_taxclass_sameregion;
+    $same_sql =~ s/taxclass/part_pkg.taxclass/g;
     push @where, $same_sql if $same_sql;
 
   }