From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 11 Jan 2014 00:48:41 +0000 (-0800)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=0ddb95ef7e09ada82657f30ce459fe229b2851c0;hp=5b670255328fbe875196e16bc8dfc57771753e90;p=freeside.git

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

diff --git a/FS/FS/cust_pkg_usageprice.pm b/FS/FS/cust_pkg_usageprice.pm
index 394ba0ba9..5b6b18c70 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