[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 0ed24da8397a00b70aa03fe8bc494aad5cbb1d0c

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  0ed24da8397a00b70aa03fe8bc494aad5cbb1d0c (commit)
      from  ac53786ee24160a38b7f32ba2bf7370449c949a5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0ed24da8397a00b70aa03fe8bc494aad5cbb1d0c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Dec 17 13:44:48 2012 -0800

    add line item report, RT#18676

diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index 917ec89..48c7684 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -552,12 +552,23 @@ if ( $cgi->param('pkg_tax') ) {
 $join_cust =  '        JOIN cust_bill USING ( invnum )
                   LEFT JOIN cust_main USING ( custnum ) ';
 
+# then we want the package and its definition
+$join_pkg = 
+' LEFT JOIN cust_pkg      USING (pkgnum) 
+  LEFT JOIN part_pkg      USING (pkgpart)';
+
+#my $part_pkg = 'part_pkg';
+#if ( $cgi->param('use_override') ) {
+  # still need the real part_pkg for tax applicability, 
+  # so alias this one
+  $join_pkg .= " LEFT JOIN part_pkg AS override ON (
+  COALESCE(cust_bill_pkg.pkgpart_override, cust_pkg.pkgpart, 0) = part_pkg.pkgpart
+  )";
+#  $part_pkg = 'override';
+#}
+
 if ( $cgi->param('nottax') ) {
 
-  $join_pkg .=  ' LEFT JOIN cust_pkg USING ( pkgnum )
-                  LEFT JOIN part_pkg USING ( pkgpart )
-                  LEFT JOIN part_pkg AS override
-                    ON pkgpart_override = override.pkgpart ';
   $join_pkg .= ' LEFT JOIN cust_location USING ( locationnum ) '
     if $conf->exists('tax-pkg_address');
 

-----------------------------------------------------------------------

Summary of changes:
 httemplate/search/cust_bill_pkg.cgi |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)