[freeside-commits] branch master updated. b7cf1606a66cca95e3540f803ffa66d223f23a40

Ivan ivan at 420.am
Fri Jan 16 18:37:53 PST 2015


The branch, master has been updated
       via  b7cf1606a66cca95e3540f803ffa66d223f23a40 (commit)
       via  edb6acc2180c1a00262ef3572560a0a05862c8d1 (commit)
       via  8f19cd0b1cc92315df1a9c979fbcc77b48ef1ea6 (commit)
       via  efdd51f41e878349a942b0cb97e97e9feda1b3f0 (commit)
      from  d8eb6e54c5bee38f48ee3f7e22210e1b1f373efd (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 b7cf1606a66cca95e3540f803ffa66d223f23a40
Merge: edb6acc d8eb6e5
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Jan 16 18:37:43 2015 -0800

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


commit edb6acc2180c1a00262ef3572560a0a05862c8d1
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Jan 16 18:37:41 2015 -0800

    no reason for multi-select to be disabled on these

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 62cb633..94eec0c 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -293,25 +293,21 @@ sub table_info {
                          label => 'Quota', #Mail storage limit
                          type => 'text',
                          disable_inventory => 1,
-                         disable_select => 1,
                        },
         'file_quota'=> { 
                          label => 'File storage limit',
                          type => 'text',
                          disable_inventory => 1,
-                         disable_select => 1,
                        },
         'file_maxnum'=> { 
                          label => 'Number of files limit',
                          type => 'text',
                          disable_inventory => 1,
-                         disable_select => 1,
                        },
         'file_maxsize'=> { 
                          label => 'File size limit',
                          type => 'text',
                          disable_inventory => 1,
-                         disable_select => 1,
                        },
         '_password' => 'Password',
         'gid'       => {

commit 8f19cd0b1cc92315df1a9c979fbcc77b48ef1ea6
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Jan 16 18:37:22 2015 -0800

    unused?

diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm
index 8278afe..f007029 100644
--- a/FS/FS/part_pkg/voip_cdr.pm
+++ b/FS/FS/part_pkg/voip_cdr.pm
@@ -678,6 +678,7 @@ sub reset_usage {
 
 # tells whether cust_bill_pkg_detail should return a single line for 
 # each phonenum
+# i think this is currently unused?
 sub sum_usage {
   my $self = shift;
   $self->option('output_format') =~ /^sum_/;

commit efdd51f41e878349a942b0cb97e97e9feda1b3f0
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jan 14 03:10:06 2015 -0800

    ensure realtime_bop can properly use transactions for its state

diff --git a/FS/FS/cust_main/Billing_Realtime.pm b/FS/FS/cust_main/Billing_Realtime.pm
index 6c75fe9..330a454 100644
--- a/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@ -3,6 +3,7 @@ package FS::cust_main::Billing_Realtime;
 use strict;
 use vars qw( $conf $DEBUG $me );
 use vars qw( $realtime_bop_decline_quiet ); #ugh
+use Carp;
 use Data::Dumper;
 use Business::CreditCard 0.28;
 use FS::UID qw( dbh );
@@ -319,6 +320,10 @@ my %bop_method2payby = (
 sub realtime_bop {
   my $self = shift;
 
+  confess "Can't call realtime_bop within another transaction ".
+          '($FS::UID::AutoCommit is false)'
+    unless $FS::UID::AutoCommit;
+
   local($DEBUG) = $FS::cust_main::DEBUG if $FS::cust_main::DEBUG > $DEBUG;
  
   my %options = ();

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

Summary of changes:
 FS/FS/cust_main/Billing_Realtime.pm |    5 +++++
 FS/FS/part_pkg/voip_cdr.pm          |    1 +
 FS/FS/svc_acct.pm                   |    4 ----
 3 files changed, 6 insertions(+), 4 deletions(-)




More information about the freeside-commits mailing list