[freeside-commits] branch master updated. 0ddb95ef7e09ada82657f30ce459fe229b2851c0

[Ivan]

The branch, master has been updated
       via  0ddb95ef7e09ada82657f30ce459fe229b2851c0 (commit)
       via  c6c33c7044e7669d79721b567b51487eefa0cc12 (commit)
      from  5b670255328fbe875196e16bc8dfc57771753e90 (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 0ddb95ef7e09ada82657f30ce459fe229b2851c0
Merge: c6c33c7 5b67025
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Jan 10 16:48:41 2014 -0800

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


commit c6c33c7044e7669d79721b567b51487eefa0cc12
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Jan 9 23:27:22 2014 -0800

    time/data/etc. unit pricing add-ons, RT#24392

diff --git a/FS/FS/cust_pkg_usageprice.pm b/FS/FS/cust_pkg_usageprice.pm
index 394ba0b..5b6b18c 100644
--- a/FS/FS/cust_pkg_usageprice.pm
+++ b/FS/FS/cust_pkg_usageprice.pm
@@ -2,7 +2,7 @@ package FS::cust_pkg_usageprice;
 use base qw( FS::Record );
 
 use strict;
-#use FS::Record qw( qsearch qsearchs );
+use FS::Record qw( dbh ); # qsearch qsearchs );
 
 =head1 NAME
 
@@ -156,8 +156,8 @@ sub apply {
     foreach my $cust_svc ($self->cust_pkg->cust_svc(svcdb=>'svc_conferencing')){
       my $svc_conferencing = $cust_svc->svc_x;
       my $base_amount = $cust_svc->part_svc->part_svc_column('participants')->columnvalue || 0; #assuming.. D?  F would get overridden  :/
-      $svc_acct->participants( $base_amount + $amount );
-      $error ||= $svc_acct->replace;
+      $svc_conferencing->participants( $base_amount + $amount );
+      $error ||= $svc_conferencing->replace;
     }
 
   #this has no multiplication involved, its just a set only

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

Summary of changes:
 FS/FS/cust_pkg_usageprice.pm |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)