projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
part_export
/
voip_ms.pm
diff --git
a/FS/FS/part_export/voip_ms.pm
b/FS/FS/part_export/voip_ms.pm
index
7766eac
..
2519884
100644
(file)
--- a/
FS/FS/part_export/voip_ms.pm
+++ b/
FS/FS/part_export/voip_ms.pm
@@
-7,7
+7,7
@@
use Tie::IxHash;
use LWP::UserAgent;
use URI;
use URI::Escape;
use LWP::UserAgent;
use URI;
use URI::Escape;
-use
JSON
;
+use
Cpanel::JSON::XS
;
use HTTP::Request::Common;
use Cache::FileCache;
use FS::Record qw(dbh);
use HTTP::Request::Common;
use Cache::FileCache;
use FS::Record qw(dbh);
@@
-408,6
+408,7
@@
sub subacct_content {
}
return {
username => $svc_acct->username,
}
return {
username => $svc_acct->username,
+ protocol => $self->option('protocol'),
description => $desc,
%auth,
device_type => $self->option('device_type'),
description => $desc,
%auth,
device_type => $self->option('device_type'),