diff options
| author | ivan <ivan> | 2003-11-26 15:37:16 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2003-11-26 15:37:16 +0000 |
| commit | 70382f2b8b92f6634656403b8f8766e4aa396d7f (patch) | |
| tree | e3dcfb7e4f977512e39b098c55429bc8c225457e | |
| parent | 41a3ae0d45397dd5662c0eea8c2e64dac99da581 (diff) | |
remove spurious Setup on one-time package charges
| -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 e5221d8f9..2efcbd91f 100644 --- a/FS/FS/cust_bill.pm +++ b/FS/FS/cust_bill.pm @@ -1098,7 +1098,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; @@ -1515,10 +1517,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), |