[freeside-commits] freeside/FS/FS Conf.pm, 1.180.2.10, 1.180.2.11 cust_bill.pm, 1.163.2.4, 1.163.2.5

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv15168/FS/FS

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	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.180.2.10
retrieving revision 1.180.2.11
diff -u -d -r1.180.2.10 -r1.180.2.11
--- Conf.pm	6 Jun 2007 20:02:33 -0000	1.180.2.10
+++ Conf.pm	6 Jun 2007 22:31:00 -0000	1.180.2.11
@@ -2119,6 +2119,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',
+  },
+
   
 
 );

Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.163.2.4
retrieving revision 1.163.2.5
diff -u -d -r1.163.2.4 -r1.163.2.5
--- cust_bill.pm	25 Apr 2007 01:35:33 -0000	1.163.2.4
+++ cust_bill.pm	6 Jun 2007 22:31:01 -0000	1.163.2.5
@@ -1552,8 +1552,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,
@@ -2488,10 +2492,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),