diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-01-09 17:20:53 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-01-09 17:20:53 -0800 |
| commit | cf7d2244c6f0c9395397bf98a9b2fa2799f3f491 (patch) | |
| tree | efc91b6a0c005163d3195496178f14c5a5cd37f7 | |
| parent | 412942bca717c2bc61085aa716c207ba673a440b (diff) | |
add cust_bill-line_item-date_style-non_monthly config setting, RT#20890
| -rw-r--r-- | FS/FS/cust_bill.pm | 11 |
1 files changed, 9 insertions, 2 deletions
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' ) { |