[freeside-commits] freeside/FS/FS/cust_main Billing.pm, 1.38.2.10, 1.38.2.11

[Mark Wells]

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

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	Billing.pm 
Log Message:
show prorate details on invoice, #16010

Index: Billing.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main/Billing.pm,v
retrieving revision 1.38.2.10
retrieving revision 1.38.2.11
diff -u -w -d -r1.38.2.10 -r1.38.2.11
--- Billing.pm	31 Jan 2012 01:40:43 -0000	1.38.2.10
+++ Billing.pm	7 Feb 2012 01:35:30 -0000	1.38.2.11
@@ -1111,7 +1111,12 @@
         'freq'      => $part_pkg->freq,
       };
 
-      if ( $part_pkg->recur_temporality eq 'preceding' ) {
+      if ( $part_pkg->option('prorate_defer_bill',1) 
+           and !$hash{last_bill} ) {
+        # both preceding and upcoming, technically
+        $cust_bill_pkg->sdate( $cust_pkg->setup );
+        $cust_bill_pkg->edate( $cust_pkg->bill );
+      } elsif ( $part_pkg->recur_temporality eq 'preceding' ) {
         $cust_bill_pkg->sdate( $hash{last_bill} );
         $cust_bill_pkg->edate( $sdate - 86399   ); #60s*60m*24h-1
         $cust_bill_pkg->edate( $time ) if $options{cancel};