[freeside-commits] branch FREESIDE_2_3_BRANCH updated. 36dc4d773e99a8ff6a367e60fd1568911e5c1a5c

Ivan ivan at 420.am
Thu Nov 15 22:44:15 PST 2012


The branch, FREESIDE_2_3_BRANCH has been updated
       via  36dc4d773e99a8ff6a367e60fd1568911e5c1a5c (commit)
       via  3c647a6eb792e52100f3a85566f3295ef332d9d6 (commit)
      from  14a10ac6abb49a3098eaeac65925a7b1546b8a59 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 36dc4d773e99a8ff6a367e60fd1568911e5c1a5c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Nov 15 22:44:10 2012 -0800

    pkgpart in invoice templates (2.3 backport), #19907

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 955d767..1d7dca5 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -3070,6 +3070,7 @@ sub print_generic {
         ext_description => [],
       };
       $detail->{'ref'} = $line_item->{'pkgnum'};
+      $detail->{'pkgpart'} = $line_item->{'pkgpart'};
       $detail->{'quantity'} = 1;
       $detail->{'section'} = $multisection ? $previous_section
                                            : $default_section;
@@ -3168,6 +3169,7 @@ sub print_generic {
         ext_description => [],
       };
       $detail->{'ref'} = $line_item->{'pkgnum'};
+      $detail->{'pkgpart'} = $line_item->{'pkgpart'};
       $detail->{'quantity'} = $line_item->{'quantity'};
       $detail->{'section'} = $section;
       $detail->{'description'} = &$escape_function($line_item->{'description'});
@@ -4990,6 +4992,9 @@ sub _items_cust_bill_pkg {
  
         my $cust_pkg = $cust_bill_pkg->cust_pkg;
 
+        # which pkgpart to show for display purposes?
+        my $pkgpart = $cust_bill_pkg->pkgpart_override || $cust_pkg->pkgpart;
+
         # start/end dates for invoice formats that do nonstandard 
         # things with them
         my %item_dates = map { $_ => $cust_bill_pkg->$_ } ('sdate', 'edate');
@@ -5039,7 +5044,7 @@ sub _items_cust_bill_pkg {
             $s = {
               _is_setup       => 1,
               description     => $description,
-              #pkgpart         => $part_pkg->pkgpart,
+              pkgpart         => $pkgpart,
               pkgnum          => $cust_bill_pkg->pkgnum,
               amount          => $cust_bill_pkg->setup,
               setup_show_zero => $cust_bill_pkg->setup_show_zero,
@@ -5187,7 +5192,7 @@ sub _items_cust_bill_pkg {
             } else {
               $r = {
                 description     => $description,
-                #pkgpart         => $part_pkg->pkgpart,
+                pkgpart         => $pkgpart,
                 pkgnum          => $cust_bill_pkg->pkgnum,
                 amount          => $amount,
                 recur_show_zero => $cust_bill_pkg->recur_show_zero,
@@ -5211,7 +5216,7 @@ sub _items_cust_bill_pkg {
             } else {
               $u = {
                 description     => $description,
-                #pkgpart         => $part_pkg->pkgpart,
+                pkgpart         => $pkgpart,
                 pkgnum          => $cust_bill_pkg->pkgnum,
                 amount          => $amount,
                 recur_show_zero => $cust_bill_pkg->recur_show_zero,

commit 3c647a6eb792e52100f3a85566f3295ef332d9d6
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Nov 13 16:03:54 2012 -0800

    2.3.5

diff --git a/FS/FS.pm b/FS/FS.pm
index ccb015b..ea1bd33 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -3,7 +3,7 @@ package FS;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '2.3.5git';
+$VERSION = '2.3.5';
 
 #find missing entries in this file with:
 # for a in `ls *pm | cut -d. -f1`; do grep 'L<FS::'$a'>' ../FS.pm >/dev/null || echo "missing $a" ; done

-----------------------------------------------------------------------

Summary of changes:
 FS/FS.pm           |    2 +-
 FS/FS/cust_bill.pm |   11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)




More information about the freeside-commits mailing list