From c1e4b5a725a27b26a9e4211923959c469955276f Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Wed, 6 Aug 2008 04:05:54 +0000
Subject: [PATCH] fix bug(s) introduced with billing loop refactor

---
 FS/FS/cust_main.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index b74c75d50..8873a5bf6 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2092,9 +2092,11 @@ sub bill {
 
     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 @@ sub _make_lines {
   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
   ###
-- 
2.11.0