projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1dd8d47
)
remove spurious Setup on one-time package charges
author
ivan
<ivan>
Wed, 26 Nov 2003 15:37:14 +0000
(15:37 +0000)
committer
ivan
<ivan>
Wed, 26 Nov 2003 15:37:14 +0000
(15:37 +0000)
FS/FS/cust_bill.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_bill.pm
b/FS/FS/cust_bill.pm
index
d6e4ab6
..
aacb504
100644
(file)
--- 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 ) {
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;
$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 $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, {
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),
'pkgpart' => $part_pkg->pkgpart,
'pkgnum' => $cust_pkg->pkgnum,
'amount' => sprintf("%10.2f", $cust_bill_pkg->setup),