[freeside-commits] branch FREESIDE_2_3_BRANCH updated. cf7d2244c6f0c9395397bf98a9b2fa2799f3f491

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  cf7d2244c6f0c9395397bf98a9b2fa2799f3f491 (commit)
      from  412942bca717c2bc61085aa716c207ba673a440b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cf7d2244c6f0c9395397bf98a9b2fa2799f3f491
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jan 9 17:20:53 2013 -0800

    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 e805244..8c68d65 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' ) {

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_bill.pm |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)