[freeside-commits] branch FREESIDE_3_BRANCH updated. 442bc38bc3cf8d95f0b39e42446a193ad0caaf31
Ivan
ivan at 420.am
Mon May 19 23:11:22 PDT 2014
The branch, FREESIDE_3_BRANCH has been updated
via 442bc38bc3cf8d95f0b39e42446a193ad0caaf31 (commit)
from 234cbab9e4f6e843b016ac56c79df895a425d962 (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 442bc38bc3cf8d95f0b39e42446a193ad0caaf31
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon May 19 23:11:21 2014 -0700
agent-virtualize VoIP rates, RT#29183
diff --git a/FS/FS/rate.pm b/FS/FS/rate.pm
index 88e93b6..1b2236f 100644
--- a/FS/FS/rate.pm
+++ b/FS/FS/rate.pm
@@ -3,7 +3,6 @@ package FS::rate;
use strict;
use vars qw( @ISA $DEBUG );
use FS::Record qw( qsearch qsearchs dbh fields );
-#use FS::agent; #causes a weird dep loop in freeside-cdrrated, only needed for v3-style manual FK-checking, so, probably not bother
use FS::rate_detail;
@ISA = qw(FS::Record);
diff --git a/httemplate/edit/elements/rate_detail.html b/httemplate/edit/elements/rate_detail.html
index 72a86ae..1b597fb 100644
--- a/httemplate/edit/elements/rate_detail.html
+++ b/httemplate/edit/elements/rate_detail.html
@@ -204,10 +204,10 @@ if ( $ratenum ) {
)";
}
@rows = qsearch({ table => 'rate_region',
- hashref => { },
+ hashref => {},
extra_sql => $where,
});
- die "no region found" if !@rows;
+ #die "no region found" if !@rows;
unshift @header, 'Region', 'Prefix(es)';
unshift @hlinks, '', '';
diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index 652c1a6..183ea8a 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -5,7 +5,7 @@
<% include('/elements/progress-init.html',
'OneTrueForm',
- [ 'rate', 'preserve_rate_detail' ], # 'rate', 'min_', 'sec_' ],
+ [ 'rate', 'agentnum', 'preserve_rate_detail' ], # 'rate', 'min_', 'sec_' ],
'process/rate.cgi',
$p.'browse/rate.cgi',
)
-----------------------------------------------------------------------
Summary of changes:
FS/FS/rate.pm | 1 -
httemplate/edit/elements/rate_detail.html | 4 ++--
httemplate/edit/rate.cgi | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
More information about the freeside-commits
mailing list