[freeside-commits] freeside/FS/FS cust_main.pm,1.355,1.356

[Jeff Finucane,420,,]

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

Modified Files:
	cust_main.pm 
Log Message:
fix bug(s) introduced with billing loop refactor

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -d -r1.355 -r1.356
--- cust_main.pm	2 Aug 2008 04:20:16 -0000	1.355
+++ cust_main.pm	6 Aug 2008 04:05:54 -0000	1.356
@@ -2092,9 +2092,11 @@
 
     my $real_pkgpart = $cust_pkg->pkgpart;
     my %hash = $cust_pkg->hash;
-    my $old_cust_pkg = new FS::cust_pkg \%hash;
 
     foreach my $part_pkg ( $cust_pkg->part_pkg->self_and_bill_linked ) {
+
+      $cust_pkg->set($_, $hash{$_}) foreach qw ( setup last_bill bill );
+
       my $error =
         $self->_make_lines( 'part_pkg'            => $part_pkg,
                             'cust_pkg'            => $cust_pkg,
@@ -2302,13 +2304,12 @@
   my %hash = $cust_pkg->hash;
   my $old_cust_pkg = new FS::cust_pkg \%hash;
 
-  $cust_pkg->pkgpart($part_pkg->pkgpart); 
-  $cust_pkg->set($_, $hash{$_}) foreach qw( setup last_bill bill );
-  
   my @details = ();
 
   my $lineitems = 0;
 
+  $cust_pkg->pkgpart($part_pkg->pkgpart);
+
   ###
   # bill setup
   ###