common element for cust_pkg search form fields

[freeside.git] / httemplate / misc / xmlhttp-calculate_taxes.html

diff --git a/httemplate/misc/xmlhttp-calculate_taxes.html b/httemplate/misc/xmlhttp-calculate_taxes.html
index 774b893..2bb1f4c 100644 (file)
--- a/httemplate/misc/xmlhttp-calculate_taxes.html
+++ b/httemplate/misc/xmlhttp-calculate_taxes.html
@@ -1,4 +1,4 @@
-<% objToJson($return) %>
+<% encode_json($return) %>\
 <%init>
 
 my $DEBUG = 0;
@@ -62,14 +62,7 @@ if ( $sub eq 'calculate_taxes' ) {
 
     my $taxlisthash = {};
     foreach my $cust_bill_pkg (values %cust_bill_pkg) {
-      my $part_pkg = $cust_bill_pkg->part_pkg;
-      $cust_main->_handle_taxes( $part_pkg,
-                                 $taxlisthash,
-                                 $cust_bill_pkg,
-                                 $cust_bill_pkg->cust_pkg,
-                                 $cust_bill_pkg->cust_bill->_date,
-                                 $cust_bill_pkg->cust_pkg->pkgpart,
-                               );
+      $cust_main->_handle_taxes( $taxlisthash, $cust_bill_pkg );
     }
     my $listref_or_error = 
       $cust_main->calculate_taxes( [ values %cust_bill_pkg ], $taxlisthash, [ values %cust_bill_pkg ]->[0]->cust_bill->_date );
@@ -87,6 +80,7 @@ if ( $sub eq 'calculate_taxes' ) {
       foreach my $location ( @{$taxline->cust_bill_pkg_tax_location}, @{$taxline->cust_bill_pkg_tax_rate_location} ) {
         my $taxlocnum = $location->locationnum || '';
         my $taxratelocnum = $location->taxratelocationnum || '';
+        $location->cust_bill_pkg_desc($taxline->desc); #ugh @ that kludge
         push @taxlines,
           [ $location->desc, $taxline->setup, $taxlocnum, $taxratelocnum ];
         $amount -= $location->amount;