projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cruft removal
[freeside.git]
/
FS
/
FS
/
cust_bill.pm
diff --git
a/FS/FS/cust_bill.pm
b/FS/FS/cust_bill.pm
index
877d364
..
da36a85
100644
(file)
--- a/
FS/FS/cust_bill.pm
+++ b/
FS/FS/cust_bill.pm
@@
-1548,8
+1548,12
@@
sub print_text {
if ( $cust_bill_pkg->recur != 0 ) {
push @buf, [
if ( $cust_bill_pkg->recur != 0 ) {
push @buf, [
- "$desc (" . time2str("%x", $cust_bill_pkg->sdate) . " - " .
- time2str("%x", $cust_bill_pkg->edate) . ")",
+ $desc .
+ ( $conf->exists('disable_line_item_date_ranges')
+ ? ''
+ : " (" . time2str("%x", $cust_bill_pkg->sdate) . " - " .
+ time2str("%x", $cust_bill_pkg->edate) . ")"
+ ),
$money_char. sprintf("%10.2f", $cust_bill_pkg->recur)
];
push @buf,
$money_char. sprintf("%10.2f", $cust_bill_pkg->recur)
];
push @buf,
@@
-2105,10
+2109,21
@@
sub print_ps {
unlink("$lfile");
my $ps = '';
unlink("$lfile");
my $ps = '';
+
+ if ( $conf->exists('lpr-postscript_prefix') ) {
+ my $prefix = $conf->config('lpr-postscript_prefix');
+ $ps .= eval qq("$prefix");
+ }
+
while (<POSTSCRIPT>) {
$ps .= $_;
}
while (<POSTSCRIPT>) {
$ps .= $_;
}
+ if ( $conf->exists('lpr-postscript_suffix') ) {
+ my $suffix = $conf->config('lpr-postscript_suffix');
+ $ps .= eval qq("$suffix");
+ }
+
close POSTSCRIPT;
return $ps;
close POSTSCRIPT;
return $ps;
@@
-2520,9
+2535,12
@@
sub _items_cust_bill_pkg {
if ( $cust_bill_pkg->recur != 0 ) {
push @b, {
if ( $cust_bill_pkg->recur != 0 ) {
push @b, {
- description => "$desc (" .
- time2str('%x', $cust_bill_pkg->sdate). ' - '.
- time2str('%x', $cust_bill_pkg->edate). ')',
+ description => $desc .
+ ( $conf->exists('disable_line_item_date_ranges')
+ ? ''
+ : " (" .time2str("%x", $cust_bill_pkg->sdate).
+ " - ".time2str("%x", $cust_bill_pkg->edate).")"
+ ),
#pkgpart => $part_pkg->pkgpart,
pkgnum => $cust_bill_pkg->pkgnum,
amount => sprintf("%.2f", $cust_bill_pkg->recur),
#pkgpart => $part_pkg->pkgpart,
pkgnum => $cust_bill_pkg->pkgnum,
amount => sprintf("%.2f", $cust_bill_pkg->recur),