From: jeff <jeff>
Date: Thu, 23 Sep 2010 21:27:36 +0000 (+0000)
Subject: fix bad conflict resolution between ivan's and jeff's idea of how to use a different... 
X-Git-Tag: TORRUS_1_0_9~271
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=e6c54cd41c23d8c0da9d5e0f66c20a571470d435

fix bad conflict resolution between ivan's and jeff's idea of how to use a different freq
---

diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm
index b267a62f4..85269c5a6 100644
--- a/FS/FS/part_pkg.pm
+++ b/FS/FS/part_pkg.pm
@@ -823,7 +823,7 @@ argument.
 
 sub add_freq {
   my( $self, $date, $freq ) = @_;
-  $freq = $self->freq if !defined($freq);
+  $freq = $self->freq unless $freq;
 
   #change this bit to use Date::Manip? CAREFUL with timezones (see
   # mailing list archive)