[freeside-commits] branch master updated. 5983b3190e9b59e90f9dffc6a9d80cdcdeaa151a

Ivan ivan at 420.am
Tue Mar 12 22:53:28 PDT 2013


The branch, master has been updated
       via  5983b3190e9b59e90f9dffc6a9d80cdcdeaa151a (commit)
       via  821f900c5a594cdf3cff082e5d527eade23f2e18 (commit)
       via  1bcdfeb83a6757101cfc1e3122e5c8d157ecb8fd (commit)
      from  7af9fc1ac91f9e8673f12849153d7ac2a5f900f2 (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 5983b3190e9b59e90f9dffc6a9d80cdcdeaa151a
Merge: 821f900 7af9fc1
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Mar 12 22:53:21 2013 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 821f900c5a594cdf3cff082e5d527eade23f2e18
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Mar 12 22:53:10 2013 -0700

    fix quotation totals, RT#21103

diff --git a/FS/FS/quotation.pm b/FS/FS/quotation.pm
index 6d36f19..47f13e6 100644
--- a/FS/FS/quotation.pm
+++ b/FS/FS/quotation.pm
@@ -185,6 +185,27 @@ sub _items_nontax {
   shift->cust_bill_pkg;
 }
 
+sub _items_total {
+  my( $self, $total_items ) = @_;
+
+  if ( $self->total_setup > 0 ) {
+    push @$total_items, {
+      'total_item'   => $self->mt( $self->total_recur > 0 ? 'Total Setup' : 'Total' ),
+      'total_amount' => $self->total_setup,
+    };
+  }
+
+  #could/should add up the different recurring frequencies on lines of their own
+  # but this will cover the 95% cases for now
+  if ( $self->total_recur > 0 ) {
+    push @$total_items, {
+      'total_item'   => $self->mt('Total Recurring'),
+      'total_amount' => $self->total_recur,
+    };
+  }
+
+}
+
 =item enable_previous
 
 =cut
diff --git a/FS/FS/quotation_pkg.pm b/FS/FS/quotation_pkg.pm
index b5823f4..efff968 100644
--- a/FS/FS/quotation_pkg.pm
+++ b/FS/FS/quotation_pkg.pm
@@ -193,7 +193,8 @@ sub cust_bill_pkg_display {
     } elsif ( $type eq 'R' ) {
       return ($recur);
     } else {
-      return ($setup, $recur);
+      #return ($setup, $recur);
+      return ($self);
     }
 
   }

commit 1bcdfeb83a6757101cfc1e3122e5c8d157ecb8fd
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Mar 11 02:17:38 2013 -0700

    fix quotations, RT#21103

diff --git a/FS/FS/TemplateItem_Mixin.pm b/FS/FS/TemplateItem_Mixin.pm
index f9ab51a..324f052 100644
--- a/FS/FS/TemplateItem_Mixin.pm
+++ b/FS/FS/TemplateItem_Mixin.pm
@@ -275,7 +275,7 @@ sub cust_bill_pkg_display {
     my $order_by = $self->display_table_orderby || 'billpkgdisplaynum';
     
     @result = qsearch ({ 'table'    => $self->display_table,
-                         'hashref'  => { 'billpkgnum' => $self->billpkgnum },
+                         'hashref'  => $hashref,
                          'order_by' => "ORDER BY $order_by",
                       });
   }

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

Summary of changes:
 FS/FS/TemplateItem_Mixin.pm |    2 +-
 FS/FS/quotation.pm          |   21 +++++++++++++++++++++
 FS/FS/quotation_pkg.pm      |    3 ++-
 3 files changed, 24 insertions(+), 2 deletions(-)




More information about the freeside-commits mailing list