[freeside-commits] freeside/FS/FS cust_bill_pkg_tax_location.pm, 1.3, 1.4 cust_bill_pkg_tax_rate_location.pm, 1.2, 1.3

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv19310/FS/FS

Modified Files:
	cust_bill_pkg_tax_location.pm 
	cust_bill_pkg_tax_rate_location.pm 
Log Message:
fix handling of tax location records and add a 'clear' button for tax credits

Index: cust_bill_pkg_tax_rate_location.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill_pkg_tax_rate_location.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cust_bill_pkg_tax_rate_location.pm	26 Oct 2009 07:12:11 -0000	1.2
+++ cust_bill_pkg_tax_rate_location.pm	18 Dec 2009 18:20:36 -0000	1.3
@@ -165,7 +165,11 @@
   );
   $location .= ( $location && $self->locationtaxid ) ? ', ' : '';
   $location .= $self->locationtaxid;
-  $self->cust_bill_pkg->desc. " ($location)";
+  my $cust_bill_pkg_desc = $self->billpkgnum
+                         ? $self->cust_bill_pkg->desc
+                         : $self->cust_bill_pkg_desc;
+  "$cust_bill_pkg_desc ($location)";
+
 }
 
 

Index: cust_bill_pkg_tax_location.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill_pkg_tax_location.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cust_bill_pkg_tax_location.pm	26 Oct 2009 07:12:11 -0000	1.3
+++ cust_bill_pkg_tax_location.pm	18 Dec 2009 18:20:35 -0000	1.4
@@ -161,7 +161,10 @@
                            map { $cust_location->$_ }
                            qw( state county city )     # country?
   );
-  $self->cust_bill_pkg->desc. " ($location)";
+  my $cust_bill_pkg_desc = $self->billpkgnum
+                         ? $self->cust_bill_pkg->desc
+                         : $self->cust_bill_pkg_desc;
+  "$cust_bill_pkg_desc ($location)";
 }
 
 =item owed