X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_bill_pkg.cgi;h=f4febdbf2fa415fa8dbba3b1823fb992c7823de9;hp=0664197eda8d7c5a27be55bb6fa2e10a7277afba;hb=dde41fbab51d693dda80977a724ee722059d92f7;hpb=e35cfefb4b71342ec99384d8301e7e3f4a90a55f

diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index 0664197ed..f4febdbf2 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -398,6 +398,8 @@ if ( $cgi->param('nottax') ) {
   # If we're showing 'out' (items that aren't region/class taxable),
   # then we need the set of all items minus the union of those.
 
+  # Always exclude cust_tax_exempt_pkg records with non-NULL creditbillpkgnum.
+
   if ( $cgi->param('out') ) {
     # separate from the rest, in that we're not going to join cust_main_county
     # in the outer query
@@ -425,12 +427,13 @@ if ( $cgi->param('nottax') ) {
     my $exempt_sub;
     if ( @exempt_where or @tax_where or $cgi->param('taxable') ) {
 
+      push @exempt_where, "cust_tax_exempt_pkg.creditbillpkgnum IS NULL";
+
       # process exemption restrictions, including @tax_where
       my $exempt_sub = 'SELECT SUM(amount) as exempt_amount, billpkgnum 
       FROM cust_tax_exempt_pkg JOIN cust_main_county USING (taxnum)';
 
-      $exempt_sub .= ' WHERE '.join(' AND ', @tax_where, @exempt_where)
-        if (@tax_where or @exempt_where);
+      $exempt_sub .= ' WHERE '.join(' AND ', @tax_where, @exempt_where);
 
       $exempt_sub .= ' GROUP BY billpkgnum';
 
@@ -443,44 +446,45 @@ if ( $cgi->param('nottax') ) {
       unshift @tax_where,
         'cust_main_county.tax > 0';
 
-      my $tax_sub = "SELECT invnum, cust_bill_pkg_tax_location.pkgnum
+      my $tax_sub = "SELECT cust_bill_pkg_tax_location.taxable_billpkgnum
       FROM cust_bill_pkg_tax_location
       JOIN cust_bill_pkg AS tax_item USING (billpkgnum)
       JOIN cust_main_county USING (taxnum)
       WHERE ". join(' AND ', @tax_where).
-      " GROUP BY invnum, cust_bill_pkg_tax_location.pkgnum";
+      " GROUP BY taxable_billpkgnum";
 
       $join_pkg .= " LEFT JOIN ($tax_sub) AS item_tax
-      ON (item_tax.invnum = cust_bill_pkg.invnum AND
-          item_tax.pkgnum = cust_bill_pkg.pkgnum)";
+      ON (item_tax.taxable_billpkgnum = cust_bill_pkg.billpkgnum)
+      ";
     }
 
     # now do something with that
-    if ( @exempt_where ) {
-
-      push @where,    'item_exempt.billpkgnum IS NOT NULL';
-      push @select,   'item_exempt.exempt_amount';
-      push @peritem,  'exempt_amount';
-      push @peritem_desc, 'Exempt';
-      push @total,    'SUM(exempt_amount)';
-      push @total_desc, "$money_char%.2f tax-exempt";
-
-    } elsif ( $cgi->param('taxable') ) {
+    if ( $cgi->param('taxable') ) {
+      # taxable query: needs sale amount - exempt amount
 
       my $taxable = 'cust_bill_pkg.setup + cust_bill_pkg.recur '.
                     '- COALESCE(item_exempt.exempt_amount, 0)';
 
-      push @where,    'item_tax.invnum IS NOT NULL';
+      push @where,    'item_tax.taxable_billpkgnum IS NOT NULL';
       push @select,   "($taxable) AS taxable_amount";
       push @peritem,  'taxable_amount';
       push @peritem_desc, 'Taxable';
       push @total,    "SUM($taxable)";
       push @total_desc, "$money_char%.2f taxable";
 
+    } elsif ( $cgi->param('exempt_cust') or $cgi->param('exempt_pkg') ) {
+
+      push @where,    'item_exempt.billpkgnum IS NOT NULL';
+      push @select,   'item_exempt.exempt_amount';
+      push @peritem,  'exempt_amount';
+      push @peritem_desc, 'Exempt';
+      push @total,    'SUM(exempt_amount)';
+      push @total_desc, "$money_char%.2f tax-exempt";
+
     } elsif ( @tax_where ) {
       # union of taxable + all exempt_ cases
       push @where,
-        '(item_tax.invnum IS NOT NULL OR item_exempt.billpkgnum IS NOT NULL)';
+        '(item_tax.taxable_billpkgnum IS NOT NULL OR item_exempt.billpkgnum IS NOT NULL)';
 
     }
 
@@ -583,6 +587,18 @@ if ( $cgi->param('nottax') ) {
     }
   }
 
+  # classnum (of underlying package)
+  # not specified: all classes
+  # 0: empty class
+  # N: classnum
+  if ( grep { $_ eq 'classnum' } $cgi->param ) {
+    my @classnums = grep /^\d+$/, $cgi->param('classnum');
+    push @where, "COALESCE(part_fee.classnum, $part_pkg.classnum, 0) IN ( ".
+                     join(',', @classnums ).
+                 ' )'
+      if @classnums;
+  }
+
 } # nottax / istax