From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 10 Jan 2013 01:20:53 +0000 (-0800)
Subject: add cust_bill-line_item-date_style-non_monthly config setting, RT#20890
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=cf7d2244c6f0c9395397bf98a9b2fa2799f3f491;p=freeside.git

add cust_bill-line_item-date_style-non_monthly config setting, RT#20890
---

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index e8052448c..8c68d6565 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -5075,14 +5075,21 @@ sub _items_cust_bill_pkg {
           my $description = ($is_summary && $type && $type eq 'U')
                             ? "Usage charges" : $desc;
 
+          my $part_pkg = $cust_pkg->part_pkg;
+
           #pry be a bit more efficient to look some of this conf stuff up
           # outside the loop
           unless (
             $conf->exists('disable_line_item_date_ranges')
-              || $cust_pkg->part_pkg->option('disable_line_item_date_ranges',1)
+              || $part_pkg->option('disable_line_item_date_ranges',1)
           ) {
             my $time_period;
-            my $date_style = $conf->config( 'cust_bill-line_item-date_style',
+            my $date_style = '';                                               
+            $date_style = $conf->config( 'cust_bill-line_item-date_style-non_monthly',
+                                         $cust_main->agentnum                  
+                                       )                                       
+              if $part_pkg && $part_pkg->freq !~ /^1m?$/;                      
+            $date_style ||= $conf->config( 'cust_bill-line_item-date_style',   
                                             $cust_main->agentnum
                                           );
             if ( defined($date_style) && $date_style eq 'month_of' ) {