X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg.pm;h=d97658496306a519f1e245b20b10bbd9041c1459;hb=7b5280c065aaa4887ce4e36fb4be7a80a74a8392;hp=de4d047debeadbbad8cb6e89d6e686ba24fa8102;hpb=c738a3c4923774b64960aa87fa58bd0751487edb;p=freeside.git

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index de4d047de..d97658496 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -576,20 +576,22 @@ sub freqs_href {
   #method, class method or sub? #my $self = shift;
 
   tie my %freq, 'Tie::IxHash', 
-    '0'  => '(no recurring fee)',
-    '1h' => 'hourly',
-    '1d' => 'daily',
-    '1w' => 'weekly',
-    '2w' => 'biweekly (every 2 weeks)',
-    '1'  => 'monthly',
-    '2'  => 'bimonthly (every 2 months)',
-    '3'  => 'quarterly (every 3 months)',
-    '6'  => 'semiannually (every 6 months)',
-    '12' => 'annually',
-    '24' => 'biannually (every 2 years)',
-    '36' => 'triannually (every 3 years)',
-    '48' => '(every 4 years)',
-    '60' => '(every 5 years)',
+    '0'   => '(no recurring fee)',
+    '1h'  => 'hourly',
+    '1d'  => 'daily',
+    '2d'  => 'every two days',
+    '1w'  => 'weekly',
+    '2w'  => 'biweekly (every 2 weeks)',
+    '1'   => 'monthly',
+    '45d' => 'every 45 days',
+    '2'   => 'bimonthly (every 2 months)',
+    '3'   => 'quarterly (every 3 months)',
+    '6'   => 'semiannually (every 6 months)',
+    '12'  => 'annually',
+    '24'  => 'biannually (every 2 years)',
+    '36'  => 'triannually (every 3 years)',
+    '48'  => '(every 4 years)',
+    '60'  => '(every 5 years)',
     '120' => '(every 10 years)',
   ;
 
@@ -608,7 +610,8 @@ sub freq_pretty {
   my $self = shift;
   my $freq = $self->freq;
 
-  my $freqs_href = $self->freqs_href;
+  #my $freqs_href = $self->freqs_href;
+  my $freqs_href = freqs_href();
 
   if ( exists($freqs_href->{$freq}) ) {
     $freqs_href->{$freq};
@@ -686,7 +689,8 @@ sub option {
   my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
                      split("\n", $self->get('plandata') );
   return $plandata{$opt} if exists $plandata{$opt};
-  cluck "Package definition option $opt not found in options or plandata!\n"
+  cluck "WARNING: (pkgpart ". $self->pkgpart. ") Package def option $opt ".
+        "NOT found in options or plandata!\n"
     unless $ornull;
   '';
 }