X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_bill_pkg.cgi;h=fa6dabc6e62bfca0dae7743cfabb04b93655514e;hb=ad1d603d9e9a813e697c267d29fefd00fee56ae7;hp=2d64466e1ad0cbdee7a1302eaccae6e62aab1dcb;hpb=e28aac72a20271f60b8f628e29e4908dcfe2b05c;p=freeside.git

diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index 2d64466e1..fa6dabc6e 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -422,6 +422,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
@@ -446,19 +448,22 @@ if ( $cgi->param('nottax') ) {
   } else {
     # everything that returns things joined to a tax definition
 
-    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)';
+      # 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';
+      $exempt_sub .= ' GROUP BY billpkgnum';
 
-    $join_pkg .= " LEFT JOIN ($exempt_sub) AS item_exempt
-    ON (cust_bill_pkg.billpkgnum = item_exempt.billpkgnum)";
+      $join_pkg .= " LEFT JOIN ($exempt_sub) AS item_exempt
+      ON (cust_bill_pkg.billpkgnum = item_exempt.billpkgnum)";
+
+    }
 
     my $credit_sub = 'SELECT SUM(amount) AS credit_amount, billpkgnum
     FROM cust_credit_bill_pkg GROUP BY billpkgnum';
@@ -471,18 +476,30 @@ if ( $cgi->param('nottax') ) {
       unshift @tax_where,
         'cust_main_county.tax > 0';
 
-      my $tax_sub = "SELECT taxable_billpkgnum AS billpkgnum
+      my $tax_sub = "SELECT taxable_billpkgnum
       FROM cust_bill_pkg_tax_location
       JOIN cust_main_county USING (taxnum)
       WHERE ". join(' AND ', @tax_where).
       " GROUP BY taxable_billpkgnum";
 
       $join_pkg .= " LEFT JOIN ($tax_sub) AS item_tax
-      ON (cust_bill_pkg.billpkgnum = item_tax.billpkgnum)"
+      ON (cust_bill_pkg.billpkgnum = item_tax.taxable_billpkgnum)"
     }
 
     # now do something with that
-    if ( @exempt_where ) {
+    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.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';
@@ -491,28 +508,11 @@ if ( $cgi->param('nottax') ) {
       push @total,    'SUM(exempt_amount)';
       push @total_desc, "$money_char%.2f tax-exempt";
 
-    } elsif ( @tax_where or $cgi->param('taxable') ) {
-
-      my $taxable = 'cust_bill_pkg.setup + cust_bill_pkg.recur '.
-                    '- COALESCE(item_exempt.exempt_amount, 0) '.
-                    '- COALESCE(item_credit.credit_amount, 0)';
-
-      push @where,    "(item_tax.billpkgnum IS NOT NULL OR item_exempt.billpkgnum IS NOT NULL)";
-      push @select,   "($taxable) AS taxable_amount";
-      push @peritem,  'taxable_amount';
-      push @peritem_desc, 'Taxable';
-
-      if ( $cgi->param('taxable') ) {
-        push @where, "($taxable) > 0";
-      } else {
-        push @total, 'SUM('.
-                        'cust_bill_pkg.setup + cust_bill_pkg.recur '.
-                        '- COALESCE(item_credit.credit_amount, 0) )';
-        push @total_desc, "$money_char%.2f net sales";
-      }
+    } elsif ( @tax_where ) {
+      # union of taxable + all exempt_ cases
+      push @where,
+        '(item_tax.taxable_billpkgnum IS NOT NULL OR item_exempt.billpkgnum IS NOT NULL)';
 
-      push @total,    "SUM($taxable)";
-      push @total_desc, "$money_char%.2f taxable";
     }
 
   } # handle all joins to cust_main_county
@@ -617,6 +617,18 @@ if ( $cgi->param('nottax') ) {
 
   } #end of "normal case"
 
+  # 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