use the mysql equivalent of array_to_string, #32548

[freeside.git] / FS / FS / Report / Tax.pm

diff --git a/FS/FS/Report/Tax.pm b/FS/FS/Report/Tax.pm
index acf9f44..76012fb 100644 (file)
--- a/FS/FS/Report/Tax.pm
+++ b/FS/FS/Report/Tax.pm
@@ -2,7 +2,7 @@ package FS::Report::Tax;
 
 use strict;
 use vars qw($DEBUG);
-use FS::Record qw(dbh qsearch qsearchs);
+use FS::Record qw(dbh qsearch qsearchs group_concat_sql);
 use Date::Format qw( time2str );
 
 use Data::Dumper;
@@ -95,6 +95,10 @@ sub report_internal {
   my $pkg_tax_exempt = "SELECT SUM(amount) AS exempt_charged, billpkgnum, taxnum ".
     "FROM cust_tax_exempt_pkg EXEMPT_WHERE GROUP BY billpkgnum, taxnum";
 
+  # This just calculates the sum of credit applications to a line item.
+  my $pkg_credited = "SELECT SUM(amount) AS credited, billpkgnum ".
+    "FROM cust_credit_bill_pkg GROUP BY billpkgnum";
+
   my $where = "WHERE cust_bill._date >= $beginning AND cust_bill._date <= $ending ".
               "AND COALESCE(cust_main_county.taxname,'Tax') = '$taxname' ".
               "AND cust_main_county.country = '$country'";
@@ -109,7 +113,8 @@ sub report_internal {
       $select .= "NULL AS $_, ";
     }
   }
-  $select .= "array_to_string(array_agg(DISTINCT(cust_main_county.taxnum)), ',') AS taxnums, ";
+  $select .= group_concat_sql('DISTINCT(cust_main_county.taxnum)', ',') .
+             ' AS taxnums, ';
   $group =~ s/, $//;
 
   # SELECT/GROUP clauses for second-level (totals) queries
@@ -120,7 +125,8 @@ sub report_internal {
     $select_all = "SELECT $breakdown{pkgclass} AS pkgclass, ";
     $group_all = "GROUP BY $breakdown{pkgclass}";
   }
-  $select_all .= "array_to_string(array_agg(DISTINCT(cust_main_county.taxnum)), ',') AS taxnums, ";
+  $select_all .= group_concat_sql('DISTINCT(cust_main_county.taxnum)', ',') .
+                 ' AS taxnums, ';
 
   my $agentnum;
   if ( $opt{agentnum} and $opt{agentnum} =~ /^(\d+)$/ ) {
@@ -176,25 +182,40 @@ sub report_internal {
   $all_sql{exempt_monthly} =~ s/EXEMPT_WHERE/WHERE exempt_monthly = 'Y'/;
 
   # taxable sales
+  # (sale - exemptions - credits, except not negative)
   $sql{taxable} = "$select
-    SUM(cust_bill_pkg.setup + cust_bill_pkg.recur - COALESCE(exempt_charged, 0))
-    FROM cust_main_county
-    JOIN ($pkg_tax) AS pkg_tax USING (taxnum)
-    JOIN cust_bill_pkg USING (billpkgnum)
+    SUM(
+      cust_bill_pkg.setup + cust_bill_pkg.recur
+        - COALESCE(exempt_charged, 0)
+        - COALESCE(credited, 0)
+      )
+    FROM cust_bill_pkg
+    LEFT JOIN ($pkg_tax) AS pkg_tax
+      ON (cust_bill_pkg.billpkgnum = pkg_tax.billpkgnum)
     LEFT JOIN ($pkg_tax_exempt) AS pkg_tax_exempt
-      ON (pkg_tax_exempt.billpkgnum = cust_bill_pkg.billpkgnum 
-          AND pkg_tax_exempt.taxnum = cust_main_county.taxnum)
+      ON (cust_bill_pkg.billpkgnum = pkg_tax_exempt.billpkgnum)
+    LEFT JOIN ($pkg_credited) AS pkg_credited
+      ON (cust_bill_pkg.billpkgnum = pkg_credited.billpkgnum)
+    LEFT JOIN cust_main_county
+      ON (COALESCE(pkg_tax.taxnum, pkg_tax_exempt.taxnum) = cust_main_county.taxnum)
     $join_cust_pkg $where AND $nottax 
     $group";
 
   $all_sql{taxable} = "$select_all
-    SUM(cust_bill_pkg.setup + cust_bill_pkg.recur - COALESCE(exempt_charged, 0))
-    FROM cust_main_county
-    JOIN ($pkg_tax) AS pkg_tax USING (taxnum)
-    JOIN cust_bill_pkg USING (billpkgnum)
+    SUM(
+      cust_bill_pkg.setup + cust_bill_pkg.recur
+        - COALESCE(exempt_charged, 0)
+        - COALESCE(credited, 0)
+      )
+    FROM cust_bill_pkg
+    LEFT JOIN ($pkg_tax) AS pkg_tax
+      ON (cust_bill_pkg.billpkgnum = pkg_tax.billpkgnum)
     LEFT JOIN ($pkg_tax_exempt) AS pkg_tax_exempt
-      ON (pkg_tax_exempt.billpkgnum = cust_bill_pkg.billpkgnum 
-          AND pkg_tax_exempt.taxnum = cust_main_county.taxnum)
+      ON (cust_bill_pkg.billpkgnum = pkg_tax_exempt.billpkgnum)
+    LEFT JOIN ($pkg_credited) AS pkg_credited
+      ON (cust_bill_pkg.billpkgnum = pkg_credited.billpkgnum)
+    LEFT JOIN cust_main_county
+      ON (COALESCE(pkg_tax.taxnum, pkg_tax_exempt.taxnum) = cust_main_county.taxnum)
     $join_cust_pkg $where AND $nottax 
     $group_all";
 
@@ -204,27 +225,39 @@ sub report_internal {
   # estimated tax (taxable * rate)
   $sql{estimated} = "$select
     SUM(cust_main_county.tax / 100 * 
-      (cust_bill_pkg.setup + cust_bill_pkg.recur - COALESCE(exempt_charged, 0))
+      ( cust_bill_pkg.setup + cust_bill_pkg.recur
+        - COALESCE(exempt_charged, 0)
+        - COALESCE(credited, 0)
+      )
     )
-    FROM cust_main_county
-    JOIN ($pkg_tax) AS pkg_tax USING (taxnum)
-    JOIN cust_bill_pkg USING (billpkgnum)
+    FROM cust_bill_pkg
+    LEFT JOIN ($pkg_tax) AS pkg_tax
+      ON (cust_bill_pkg.billpkgnum = pkg_tax.billpkgnum)
     LEFT JOIN ($pkg_tax_exempt) AS pkg_tax_exempt
-      ON (pkg_tax_exempt.billpkgnum = cust_bill_pkg.billpkgnum 
-          AND pkg_tax_exempt.taxnum = cust_main_county.taxnum)
+      ON (cust_bill_pkg.billpkgnum = pkg_tax_exempt.billpkgnum)
+    LEFT JOIN ($pkg_credited) AS pkg_credited
+      ON (cust_bill_pkg.billpkgnum = pkg_credited.billpkgnum)
+    LEFT JOIN cust_main_county
+      ON (COALESCE(pkg_tax.taxnum, pkg_tax_exempt.taxnum) = cust_main_county.taxnum)
     $join_cust_pkg $where AND $nottax 
     $group";
 
   $all_sql{estimated} = "$select_all
     SUM(cust_main_county.tax / 100 * 
-      (cust_bill_pkg.setup + cust_bill_pkg.recur - COALESCE(exempt_charged, 0))
+      ( cust_bill_pkg.setup + cust_bill_pkg.recur
+        - COALESCE(exempt_charged, 0)
+        - COALESCE(credited, 0)
+      )
     )
-    FROM cust_main_county
-    JOIN ($pkg_tax) AS pkg_tax USING (taxnum)
-    JOIN cust_bill_pkg USING (billpkgnum)
+    FROM cust_bill_pkg
+    LEFT JOIN ($pkg_tax) AS pkg_tax
+      ON (cust_bill_pkg.billpkgnum = pkg_tax.billpkgnum)
     LEFT JOIN ($pkg_tax_exempt) AS pkg_tax_exempt
-      ON (pkg_tax_exempt.billpkgnum = cust_bill_pkg.billpkgnum 
-          AND pkg_tax_exempt.taxnum = cust_main_county.taxnum)
+      ON (cust_bill_pkg.billpkgnum = pkg_tax_exempt.billpkgnum)
+    LEFT JOIN ($pkg_credited) AS pkg_credited
+      ON (cust_bill_pkg.billpkgnum = pkg_credited.billpkgnum)
+    LEFT JOIN cust_main_county
+      ON (COALESCE(pkg_tax.taxnum, pkg_tax_exempt.taxnum) = cust_main_county.taxnum)
     $join_cust_pkg $where AND $nottax 
     $group_all";
 
@@ -358,13 +391,13 @@ sub report_internal {
       SELECT 1 FROM cust_tax_exempt_pkg
         JOIN cust_main_county USING (taxnum)
         WHERE cust_tax_exempt_pkg.billpkgnum = cust_bill_pkg.billpkgnum
-          AND cust_main_county.taxname = '$taxname'
+          AND COALESCE(cust_main_county.taxname,'Tax') = '$taxname'
     )
     AND NOT EXISTS(
       SELECT 1 FROM cust_bill_pkg_tax_location
         JOIN cust_main_county USING (taxnum)
         WHERE cust_bill_pkg_tax_location.taxable_billpkgnum = cust_bill_pkg.billpkgnum
-          AND cust_main_county.taxname = '$taxname'
+          AND COALESCE(cust_main_county.taxname,'Tax') = '$taxname'
     )
   ";
   warn "\nOUTSIDE:\n$sql_outside\n" if $DEBUG;