[freeside-commits] freeside/FS/FS cust_bill_pkg.pm, 1.56.2.10, 1.56.2.11 part_pkg.pm, 1.123.2.4, 1.123.2.5

[Mark Wells]

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

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	cust_bill_pkg.pm part_pkg.pm 
Log Message:
correct unused-time credits for discounted packages, #16352

Index: cust_bill_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill_pkg.pm,v
retrieving revision 1.56.2.10
retrieving revision 1.56.2.11
diff -u -w -d -r1.56.2.10 -r1.56.2.11
--- cust_bill_pkg.pm	13 Dec 2011 20:40:43 -0000	1.56.2.10
+++ cust_bill_pkg.pm	8 Feb 2012 02:18:26 -0000	1.56.2.11
@@ -896,7 +896,7 @@
     my $sth = dbh->prepare($sql) or die dbh->errstr;
     $sth->execute or die $sth->errstr;
 
-    return $sth->fetchrow_arrayref->[0];
+    return $sth->fetchrow_arrayref->[0] || 0;
 
   }
 

Index: part_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg.pm,v
retrieving revision 1.123.2.4
retrieving revision 1.123.2.5
diff -u -w -d -r1.123.2.4 -r1.123.2.5
--- part_pkg.pm	13 Dec 2011 20:40:43 -0000	1.123.2.4
+++ part_pkg.pm	8 Feb 2012 02:18:26 -0000	1.123.2.5
@@ -1293,6 +1293,10 @@
 sub calc_cancel { 0; }
 sub calc_units  { 0; }
 
+#fallback for everything not based on flat.pm
+sub recur_temporality { 'upcoming'; }
+sub calc_cancel { 0; }
+
 #fallback for everything except bulk.pm
 sub hide_svc_detail { 0; }