[freeside-commits] freeside/FS/FS part_pkg.pm,1.108,1.109

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv7326

Modified Files:
	part_pkg.pm 
Log Message:
fix bad conflict resolution between ivan's and jeff's idea of how to use a different freq

Index: part_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg.pm,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -w -d -r1.108 -r1.109
--- part_pkg.pm	22 Sep 2010 19:16:17 -0000	1.108
+++ part_pkg.pm	23 Sep 2010 21:27:36 -0000	1.109
@@ -823,7 +823,7 @@
 
 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)