[freeside-commits] freeside/FS/FS Conf.pm, 1.196, 1.197 cust_bill.pm, 1.169, 1.170
Jeff Finucane,420,,
jeff at wavetail.420.am
Wed Jun 6 15:34:21 PDT 2007
Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv15250/FS/FS
Modified Files:
Conf.pm cust_bill.pm
Log Message:
service dates on invoices optional (#1658)
Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- Conf.pm 6 Jun 2007 19:59:21 -0000 1.196
+++ Conf.pm 6 Jun 2007 22:34:19 -0000 1.197
@@ -1804,7 +1804,13 @@
'type' => 'text',
},
+ {
+ 'key' => 'disable_line_item_date_ranges',
+ 'section' => 'billing',
+ 'description' => 'Prevent freeside from automatically generating date ranges on invoice line items.',
+ 'type' => 'checkbox',
+ },
+
);
1;
-
Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- cust_bill.pm 25 Apr 2007 00:54:54 -0000 1.169
+++ cust_bill.pm 6 Jun 2007 22:34:19 -0000 1.170
@@ -1548,8 +1548,12 @@
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,
@@ -2530,10 +2534,22 @@
}
if ( $cust_bill_pkg->recur != 0 ) {
+ push @buf, [
+ $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 @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),
More information about the freeside-commits
mailing list