[freeside-commits] freeside/FS/FS cust_bill.pm, 1.263.2.4, 1.263.2.5

Jeff Finucane,420,, jeff at wavetail.420.am
Tue Nov 24 09:07:03 PST 2009


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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	cust_bill.pm 
Log Message:
cope with sections lacking a pkg_category

Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.263.2.4
retrieving revision 1.263.2.5
diff -u -d -r1.263.2.4 -r1.263.2.5
--- cust_bill.pm	20 Nov 2009 17:39:39 -0000	1.263.2.4
+++ cust_bill.pm	24 Nov 2009 17:07:01 -0000	1.263.2.5
@@ -3213,8 +3213,11 @@
   push @$late, map { { 'description' => &{$escape}($_),
                        'subtotal'    => $late_subtotal{$_},
                        'post_total'  => 1,
-                       'sort_weight' => _pkg_category($_)->weight,
-                       (_pkg_category($_)->condense
+                       'sort_weight' => ( _pkg_category($_)
+                                            ? _pkg_category($_)->weight
+                                            : 0
+                                       ),
+                       ((_pkg_category($_) && _pkg_category($_)->condense)
                                            ? $self->_condense_section($format)
                                            : ()
                        ),
@@ -3233,8 +3236,11 @@
                       'subtotal'    => $subtotal{$_},
                       'summarized'  => $not_tax{$_} ? '' : 'Y',
                       'tax_section' => $not_tax{$_} ? '' : 'Y',
-                      'sort_weight' => _pkg_category($_)->weight,
-                       (_pkg_category($_)->condense
+                      'sort_weight' => ( _pkg_category($_)
+                                           ? _pkg_category($_)->weight
+                                           : 0
+                                       ),
+                       ((_pkg_category($_) && _pkg_category($_)->condense)
                                            ? $self->_condense_section($format)
                                            : ()
                        ),



More information about the freeside-commits mailing list