diff options
| author | jeff <jeff> | 2009-12-18 18:20:36 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2009-12-18 18:20:36 +0000 |
| commit | fafdaeca1af0771cefd8f6707b0f75ee8a33f03a (patch) | |
| tree | 72a0abc62079ad7a4b88c441d24546c9a668c489 /FS/FS | |
| parent | 40a7b3dc653e099f7bd0bd762b649b04c4432db2 (diff) | |
fix handling of tax location records and add a 'clear' button for tax credits
Diffstat (limited to 'FS/FS')
| -rw-r--r-- | FS/FS/cust_bill_pkg_tax_location.pm | 5 | ||||
| -rw-r--r-- | FS/FS/cust_bill_pkg_tax_rate_location.pm | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/FS/FS/cust_bill_pkg_tax_location.pm b/FS/FS/cust_bill_pkg_tax_location.pm index 0d3bd3a32..120a2d036 100644 --- a/FS/FS/cust_bill_pkg_tax_location.pm +++ b/FS/FS/cust_bill_pkg_tax_location.pm @@ -161,7 +161,10 @@ sub desc { 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 diff --git a/FS/FS/cust_bill_pkg_tax_rate_location.pm b/FS/FS/cust_bill_pkg_tax_rate_location.pm index 89c252978..39b2bb95a 100644 --- a/FS/FS/cust_bill_pkg_tax_rate_location.pm +++ b/FS/FS/cust_bill_pkg_tax_rate_location.pm @@ -165,7 +165,11 @@ sub desc { ); $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)"; + } |