diff options
| author | ivan <ivan> | 2003-11-26 15:37:14 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2003-11-26 15:37:14 +0000 |
| commit | e6c8cca8d3daec590f248e9ca16384dc8c94e21e (patch) | |
| tree | 6f3f5b2d9e85a6d50ef782d2d417aceece8e0036 /FS | |
| parent | 1dd8d47eedcd31384b510ad69c122d9d6e56ec5d (diff) | |
remove spurious Setup on one-time package charges
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/cust_bill.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm index d6e4ab655..aacb50425 100644 --- a/FS/FS/cust_bill.pm +++ b/FS/FS/cust_bill.pm @@ -704,7 +704,9 @@ sub print_text { my $pkg = $part_pkg->pkg; if ( $cust_bill_pkg->setup != 0 ) { - push @buf, [ "$pkg Setup", + my $description = $pkg; + $description .= ' Setup' if $cust_bill_pkg->recur != 0; + push @buf, [ $description, $money_char. sprintf("%10.2f", $cust_bill_pkg->setup) ]; push @buf, map { [ " ". $_->[0]. ": ". $_->[1], '' ] } $cust_pkg->labels; @@ -1123,10 +1125,12 @@ sub _items_cust_bill_pkg { my $pkg = $part_pkg->pkg; if ( $cust_bill_pkg->setup != 0 ) { + my $description = $pkg; + $description .= ' Setup' if $cust_bill_pkg->recur != 0; my @d = (); @d = $cust_bill_pkg->details if $cust_bill_pkg->recur == 0; push @b, { - 'description' => "$pkg Setup", + 'description' => $description, 'pkgpart' => $part_pkg->pkgpart, 'pkgnum' => $cust_pkg->pkgnum, 'amount' => sprintf("%10.2f", $cust_bill_pkg->setup), |