[freeside-commits] freeside/FS/FS/cust_main Billing.pm, 1.18.2.10, 1.18.2.11

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	Billing.pm 
Log Message:
fix UI for package editing w/recur_show_zero, add setup_show_zero, RT#9777

Index: Billing.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main/Billing.pm,v
retrieving revision 1.18.2.10
retrieving revision 1.18.2.11
diff -u -w -d -r1.18.2.10 -r1.18.2.11
--- Billing.pm	6 Jul 2011 04:16:06 -0000	1.18.2.10
+++ Billing.pm	12 Jul 2011 23:00:33 -0000	1.18.2.11
@@ -593,15 +593,18 @@
 				&& scalar(@{$cust_bill_pkg->get('discounts')})
 				&& $conf->exists('discount-show-always'));
 
-    warn "  pkgnum ". $cust_bill_pkg->pkgnum.
-         " sum $sum, recur_show_zero ". $cust_bill_pkg->recur_show_zero. "\n"
+    warn "  pkgnum ". $cust_bill_pkg->pkgnum. " sum $sum, ".
+         "setup_show_zero ". $cust_bill_pkg->setup_show_zero.
+         "recur_show_zero ". $cust_bill_pkg->recur_show_zero. "\n"
       if $DEBUG > 0;
 
     if (scalar(@cust_bill_pkg_bundle) && !$cust_bill_pkg->pkgpart_override) {
       push @cust_bill_pkg, @cust_bill_pkg_bundle 
         if $sum > 0
         || ($sum == 0 && (    $discount_show_always
-                           || grep $_->recur_show_zero, @cust_bill_pkg_bundle )
+                           || grep {$_->recur_show_zero || $_->setup_show_zero}
+                                   @cust_bill_pkg_bundle
+                         )
            );
       @cust_bill_pkg_bundle = ();
       $sum = 0;
@@ -615,7 +618,9 @@
   push @cust_bill_pkg, @cust_bill_pkg_bundle
     if $sum > 0
     || ($sum == 0 && (    $discount_show_always
-                       || grep $_->recur_show_zero, @cust_bill_pkg_bundle )
+                       || grep {$_->recur_show_zero || $_->setup_show_zero}
+                               @cust_bill_pkg_bundle
+                     )
        );
 
   warn "  _omit_zero_value_bundles: ". scalar(@in).
@@ -1011,7 +1016,8 @@
          || $recur != 0
          || (!$part_pkg->hidden && $options{has_hidden}) #include some $0 lines
          || $discount_show_always
-         || ($recur == 0 && $part_pkg->recur_show_zero)
+         || ($setup == 0 && $cust_pkg->_X_show_zero('setup'))
+         || ($recur == 0 && $cust_pkg->_X_show_zero('recur'))
        ) 
     {