diff options
| -rw-r--r-- | FS/FS/cdr/ispphone.pm | 28 | ||||
| -rw-r--r-- | FS/FS/cust_bill_pkg.pm | 1 | ||||
| -rw-r--r-- | FS/FS/cust_pkg.pm | 46 | ||||
| -rw-r--r-- | FS/FS/part_pkg/recur_Common.pm | 2 | ||||
| -rw-r--r-- | FS/FS/prospect_main.pm | 6 | ||||
| -rw-r--r-- | FS/FS/quotation.pm | 306 | ||||
| -rw-r--r-- | FS/FS/quotation_pkg.pm | 18 | ||||
| -rw-r--r-- | httemplate/misc/cacti_graphs.html | 15 | ||||
| -rw-r--r-- | httemplate/misc/process/cacti_graphs.cgi | 16 |
9 files changed, 289 insertions, 149 deletions
diff --git a/FS/FS/cdr/ispphone.pm b/FS/FS/cdr/ispphone.pm index 49d1b07f4..2817d53c1 100644 --- a/FS/FS/cdr/ispphone.pm +++ b/FS/FS/cdr/ispphone.pm @@ -3,7 +3,7 @@ package FS::cdr::ispphone; use strict; use vars qw( @ISA %info $tmp_mon $tmp_mday $tmp_year ); use Time::Local; -use FS::cdr; +use FS::cdr qw ( _cdr_date_parser_maker ); use Date::Parse; @ISA = qw(FS::cdr); @@ -11,29 +11,15 @@ use Date::Parse; %info = ( 'name' => 'ISPPhone', 'weight' => 123, - 'header' => 2, + 'header' => 1, 'import_fields' => [ + 'accountcode', # Accountcode 'src', # Form 'dst', # To - 'upstream_dst_regionname', # Country - 'dcontext', # Description - - sub { my ($cdr, $calldate) = @_; - $cdr->set('calldate', $calldate); - - my $tmp_date; - - if ($calldate =~ /^(\d{2})\/(\d{2})\/(\d{2})\s*(\d{1,2}):(\d{2})$/){ - - $tmp_date = "$2/$1/$3 $4:$5:$6"; - - } else { $tmp_date = $calldate; } - - $tmp_date = str2time($tmp_date); - $cdr->set('startdate', $tmp_date); - - }, #DateTime + skip(1), # Country + 'upstream_dst_regionname', # Description +_cdr_date_parser_maker('startdate'), #DateTime sub { my ($cdr, $duration) = @_; my ($min,$sec) = split(/:/, $duration); @@ -47,5 +33,7 @@ use Date::Parse; ); +sub skip { map {''} (1..$_[0]) } + 1; diff --git a/FS/FS/cust_bill_pkg.pm b/FS/FS/cust_bill_pkg.pm index d0cec90dc..b6e439552 100644 --- a/FS/FS/cust_bill_pkg.pm +++ b/FS/FS/cust_bill_pkg.pm @@ -207,7 +207,6 @@ sub insert { { my $tax_location = $self->get($tax_link_table) || []; foreach my $link ( @$tax_location ) { - $DB::single=1; #XXX my $pkey = $link->primary_key; next if $link->get($pkey); # don't try to double-insert # This cust_bill_pkg can be linked on either side (i.e. it can be the diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index be5bdea8f..eaadd95db 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -1967,6 +1967,40 @@ sub change { my $error; + if ( $opt->{'cust_location'} ) { + $error = $opt->{'cust_location'}->find_or_insert; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return "creating location record: $error"; + } + $opt->{'locationnum'} = $opt->{'cust_location'}->locationnum; + } + + # Before going any further here: if the package is still in the pre-setup + # state, it's safe to modify it in place. No need to charge/credit for + # partial period, transfer services, transfer usage pools, copy invoice + # details, or change any dates. + if ( ! $self->setup and ! $opt->{cust_pkg} and ! $opt->{cust_main} ) { + foreach ( qw( locationnum pkgpart quantity refnum salesnum ) ) { + if ( length($opt->{$_}) ) { + $self->set($_, $opt->{$_}); + } + } + # almost. if the new pkgpart specifies start/adjourn/expire timers, + # apply those. + if ( $opt->{'pkgpart'} and $opt->{'pkgpart'} != $self->pkgpart ) { + $self->set_initial_timers; + } + $error = $self->replace; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return "modifying package: $error"; + } else { + $dbh->commit if $oldAutoCommit; + return ''; + } + } + my %hash = (); my $time = time; @@ -1977,15 +2011,6 @@ sub change { $hash{"change_$_"} = $self->$_() foreach qw( pkgnum pkgpart locationnum ); - if ( $opt->{'cust_location'} ) { - $error = $opt->{'cust_location'}->find_or_insert; - if ( $error ) { - $dbh->rollback if $oldAutoCommit; - return "creating location record: $error"; - } - $opt->{'locationnum'} = $opt->{'cust_location'}->locationnum; - } - if ( $opt->{'cust_pkg'} ) { # treat changing to a package with a different pkgpart as a # pkgpart change (because it is) @@ -2032,6 +2057,9 @@ sub change { # 2. (more importantly) changing a package before it's billed $hash{'waive_setup'} = $self->waive_setup; + # if this package is scheduled for a future package change, preserve that + $hash{'change_to_pkgnum'} = $self->change_to_pkgnum; + my $custnum = $self->custnum; if ( $opt->{cust_main} ) { my $cust_main = $opt->{cust_main}; diff --git a/FS/FS/part_pkg/recur_Common.pm b/FS/FS/part_pkg/recur_Common.pm index ebf8869f6..b73c62c25 100644 --- a/FS/FS/part_pkg/recur_Common.pm +++ b/FS/FS/part_pkg/recur_Common.pm @@ -34,7 +34,7 @@ sub calc_setup { delete $param->{'setup_charge'}; } - sprintf('%.2f', $charge - $discount); + sprintf('%.2f', ($cust_pkg->quantity || 1) * ($charge - $discount) ); } sub cutoff_day { diff --git a/FS/FS/prospect_main.pm b/FS/FS/prospect_main.pm index 81f71a996..7c58de304 100644 --- a/FS/FS/prospect_main.pm +++ b/FS/FS/prospect_main.pm @@ -339,9 +339,9 @@ sub convert_cust_main { $cust_main->set('last', 'Unknown'); } - #v3 payby - $cust_main->payby('BILL'); - $cust_main->paydate('12/2037'); + #v3 payby no longer allowed + #$cust_main->payby('BILL'); + #$cust_main->paydate('12/2037'); $cust_main->insert( {}, \@invoicing_list, 'prospectnum' => $self->prospectnum, diff --git a/FS/FS/quotation.pm b/FS/FS/quotation.pm index 60abd3803..930083e10 100644 --- a/FS/FS/quotation.pm +++ b/FS/FS/quotation.pm @@ -5,7 +5,7 @@ use base qw( FS::Template_Mixin FS::cust_main_Mixin FS::otaker_Mixin FS::Record use strict; use Tie::RefHash; use FS::CurrentUser; -use FS::UID qw( dbh ); +use FS::UID qw( dbh myconnect ); use FS::Maketext qw( emt ); use FS::Record qw( qsearch qsearchs ); use FS::Conf; @@ -15,6 +15,9 @@ use FS::quotation_pkg; use FS::quotation_pkg_tax; use FS::type_pkgs; +our $DEBUG = 1; +use Data::Dumper; + =head1 NAME FS::quotation - Object methods for quotation records @@ -383,7 +386,7 @@ sub convert_cust_main { } -=item order +=item order [ HASHREF ] This method is for use with quotations which are already associated with a customer. @@ -391,14 +394,21 @@ Orders this quotation's packages as real packages for the customer. If there is an error, returns an error message, otherwise returns false. +If HASHREF is passed, it will be filled with a hash mapping the +C<quotationpkgnum> of each quoted package to the C<pkgnum> of the package +as ordered. + =cut sub order { my $self = shift; + my $pkgnum_map = shift || {}; tie my %all_cust_pkg, 'Tie::RefHash'; foreach my $quotation_pkg ($self->quotation_pkg) { my $cust_pkg = FS::cust_pkg->new; + $pkgnum_map->{ $quotation_pkg->quotationpkgnum } = $cust_pkg; + foreach (qw(pkgpart locationnum start_date contract_end quantity waive_setup)) { $cust_pkg->set( $_, $quotation_pkg->get($_) ); } @@ -412,8 +422,15 @@ sub order { $all_cust_pkg{$cust_pkg} = []; # no services } - $self->cust_main->order_pkgs( \%all_cust_pkg ); + my $error = $self->cust_main->order_pkgs( \%all_cust_pkg ); + + foreach my $quotationpkgnum (keys %$pkgnum_map) { + # convert the objects to just pkgnums + my $cust_pkg = $pkgnum_map->{$quotationpkgnum}; + $pkgnum_map->{$quotationpkgnum} = $cust_pkg->pkgnum; + } + $error; } =item charge @@ -583,126 +600,195 @@ sub estimate { my $self = shift; my $conf = FS::Conf->new; - my $dbh = dbh; - my $oldAutoCommit = $FS::UID::AutoCommit; - local $FS::UID::AutoCommit = 0; + my %pkgnum_of; # quotationpkgnum => temporary pkgnum + + my $me = "[quotation #".$self->quotationnum."]"; # for debug messages + + my @return_bill = ([]); + my $error; + + ###### BEGIN TRANSACTION ###### + local $@; + eval { + my $temp_dbh = myconnect(); + local $FS::UID::dbh = $temp_dbh; + local $FS::UID::AutoCommit = 0; + + my $fake_self = FS::quotation->new({ $self->hash }); + + # if this is a prospect, make them into a customer for now + # XXX prospects currently can't have service locations + my $cust_or_prospect = $self->cust_or_prospect; + my $cust_main; + if ( $cust_or_prospect->isa('FS::prospect_main') ) { + $cust_main = $cust_or_prospect->convert_cust_main; + die "$cust_main (simulating customer signup)\n" unless ref $cust_main; + $fake_self->set('prospectnum', ''); + $fake_self->set('custnum', $cust_main->custnum); + } else { + $cust_main = $cust_or_prospect; + } - # bring individual items up to date (set setup/recur and discounts) - my @quotation_pkg = $self->quotation_pkg; - foreach my $pkg (@quotation_pkg) { - my $error = $pkg->estimate; - if ($error) { - $dbh->rollback if $oldAutoCommit; - die "error calculating estimate for pkgpart " . $pkg->pkgpart.": $error\n"; + # order packages + $error = $fake_self->order(\%pkgnum_of); + die "$error (simulating package order)\n" if $error; + + my @new_pkgs = map { FS::cust_pkg->by_key($_) } values(%pkgnum_of); + + # simulate the first bill + my %bill_opt = ( + 'pkg_list' => \@new_pkgs, + 'time' => time, # an option to adjust this? + 'return_bill' => $return_bill[0], + 'no_usage_reset' => 1, + ); + $error = $cust_main->bill(%bill_opt); + die "$error (simulating initial billing)\n" if $error; + + # pick dates for future bills + my %next_bill_pkgs; + foreach (@new_pkgs) { + my $bill = $_->get('bill'); + next if !$bill; + push @{ $next_bill_pkgs{$bill} ||= [] }, $_; } - # delete old tax records - foreach my $quotation_pkg_tax ($pkg->quotation_pkg_tax) { - $error = $quotation_pkg_tax->delete; - if ( $error ) { - $dbh->rollback if $oldAutoCommit; - die "error flushing tax records for pkgpart ". $pkg->pkgpart.": $error\n"; - } + my $i = 1; + foreach my $next_bill (keys %next_bill_pkgs) { + $bill_opt{'time'} = $next_bill; + $bill_opt{'return_bill'} = $return_bill[$i] = []; + $bill_opt{'pkg_list'} = $next_bill_pkgs{$next_bill}; + $error = $cust_main->bill(%bill_opt); + die "$error (simulating recurring billing cycle $i)\n" if $error; + $i++; } + + $temp_dbh->rollback; + }; + return $@ if $@; + ###### END TRANSACTION ###### + my %quotationpkgnum_of = reverse %pkgnum_of; + + if ($DEBUG) { + warn "pkgnums:\n".Dumper(\%pkgnum_of); + warn Dumper(\@return_bill); } - # annoyingly duplicates handle_taxes--fix this in 4.x - if ( $conf->exists('enable_taxproducts') ) { - warn "can't calculate external taxes for quotations yet\n"; - # then we're done - return; + # careful: none of the pkgnums in here are correct outside the sandbox. + my %quotation_pkg; # quotationpkgnum => quotation_pkg + foreach my $qp ($self->quotation_pkg) { + $quotation_pkg{$qp->quotationpkgnum} = $qp; + $qp->set($_, 0) foreach qw(unitsetup unitrecur); + $qp->set('freq', ''); + # flush old tax records + foreach ($qp->quotation_pkg_tax, $qp->quotation_pkg_discount) { + $error = $_->delete; + return "$error (flushing tax records for pkgpart ".$qp->part_pkg->pkgpart.")" + if $error; + } } - my %taxnum_exemptions; # for monthly exemptions; as yet unused - - foreach my $pkg (@quotation_pkg) { - my $location = $pkg->cust_location; - - my $part_item = $pkg->part_pkg; # we don't have fees on these yet - my @loc_keys = qw( district city county state country); - my %taxhash = map { $_ => $location->$_ } @loc_keys; - $taxhash{'taxclass'} = $part_item->taxclass; - my @taxes; - my %taxhash_elim = %taxhash; - my @elim = qw( district city county state ); - do { - @taxes = qsearch( 'cust_main_county', \%taxhash_elim ); - if ( !scalar(@taxes) && $taxhash_elim{'taxclass'} ) { - #then try a match without taxclass - my %no_taxclass = %taxhash_elim; - $no_taxclass{ 'taxclass' } = ''; - @taxes = qsearch( 'cust_main_county', \%no_taxclass ); - } - - $taxhash_elim{ shift(@elim) } = ''; - } while ( !scalar(@taxes) && scalar(@elim) ); - - foreach my $tax_def (@taxes) { - my $taxnum = $tax_def->taxnum; - $taxnum_exemptions{$taxnum} ||= []; - - # XXX do some kind of equivalent to set_exemptions here - # but for now just declare that there are no exemptions, - # and then hack the taxable amounts if the package def - # excludes setup/recur - $pkg->set('cust_tax_exempt_pkg', []); - - if ( $part_item->setuptax or $tax_def->setuptax ) { - $pkg->set('unitsetup', 0); - } - if ( $part_item->recurtax or $tax_def->recurtax ) { - $pkg->set('unitrecur', 0); - } + my %quotation_pkg_tax; # quotationpkgnum => taxnum => quotation_pkg_tax obj - my %taxline; - foreach my $pass (qw(first recur)) { - if ($pass eq 'recur') { - $pkg->set('unitsetup', 0); - } + for (my $i = 0; $i < scalar(@return_bill); $i++) { + my $this_bill = $return_bill[$i]->[0]; + if (!$this_bill) { + warn "$me billing cycle $i produced no invoice\n"; + next; + } - my $taxline = $tax_def->taxline( - [ $pkg ], - exemptions => $taxnum_exemptions{$taxnum} - ); - if ($taxline and !ref($taxline)) { - $dbh->rollback if $oldAutoCommit; - die "error calculating '".$tax_def->taxname . - "' for pkgpart '".$pkg->pkgpart."': $taxline\n"; - } - $taxline{$pass} = $taxline; + my @nonpkg_lines; + my %cust_bill_pkg; + foreach my $cust_bill_pkg (@{ $this_bill->get('cust_bill_pkg') }) { + my $pkgnum = $cust_bill_pkg->pkgnum; + $cust_bill_pkg{ $cust_bill_pkg->billpkgnum } = $cust_bill_pkg; + if ( !$pkgnum ) { + # taxes/fees; come back to it + push @nonpkg_lines, $cust_bill_pkg; + next; } - - my $quotation_pkg_tax = FS::quotation_pkg_tax->new({ - quotationpkgnum => $pkg->quotationpkgnum, - itemdesc => ($tax_def->taxname || 'Tax'), - taxnum => $taxnum, - taxtype => ref($tax_def), - }); - my $setup_amount = 0; - my $recur_amount = 0; - if ($taxline{first}) { - $setup_amount = $taxline{first}->setup; # "first cycle", not setup + my $quotationpkgnum = $quotationpkgnum_of{$pkgnum}; + my $qp = $quotation_pkg{$quotationpkgnum}; + if (!$qp) { + # XXX supplemental packages could do this (they have separate pkgnums) + # handle that special case at some point + warn "$me simulated bill returned a package not on the quotation (pkgpart ".$cust_bill_pkg->pkgpart.")\n"; + next; + } + if ( $i == 0 ) { + # then this is the first (setup) invoice + $qp->set('start_date', $cust_bill_pkg->sdate); + $qp->set('unitsetup', $qp->unitsetup + $cust_bill_pkg->unitsetup); + # pkgpart_override is a possibility + } else { + # recurring invoice (should be only one of these per package, though + # it may have multiple lineitems with the same pkgnum) + $qp->set('unitrecur', $qp->unitrecur + $cust_bill_pkg->unitrecur); } - if ($taxline{recur}) { - $recur_amount = $taxline{recur}->setup; - $setup_amount -= $recur_amount; # to get the actual setup amount + } + foreach my $cust_bill_pkg (@nonpkg_lines) { + if ($cust_bill_pkg->feepart) { + warn "$me simulated bill included a non-package fee (feepart ". + $cust_bill_pkg->feepart.")\n"; + next; } - if ( $recur_amount > 0 or $setup_amount > 0 ) { - $quotation_pkg_tax->set('setup_amount', sprintf('%.2f', $setup_amount)); - $quotation_pkg_tax->set('recur_amount', sprintf('%.2f', $recur_amount)); - - my $error = $quotation_pkg_tax->insert; - if ($error) { - $dbh->rollback if $oldAutoCommit; - die "error recording '".$tax_def->taxname . - "' for pkgpart '".$pkg->pkgpart."': $error\n"; - } # if $error - } # else there are no non-zero taxes; continue - } # foreach $tax_def - } # foreach $pkg - - $dbh->commit if $oldAutoCommit; - ''; + my $links = $cust_bill_pkg->get('cust_bill_pkg_tax_location') || + $cust_bill_pkg->get('cust_bill_pkg_tax_rate_location') || + []; + # breadth-first unrolled recursion + while (my $tax_link = shift @$links) { + my $target = $cust_bill_pkg{ $tax_link->taxable_billpkgnum } + or die "$me unable to resolve tax link (taxnum ".$tax_link->taxnum.")\n"; + if ($target->pkgnum) { + my $quotationpkgnum = $quotationpkgnum_of{$target->pkgnum}; + # create this if there isn't one yet + my $qpt = + $quotation_pkg_tax{$quotationpkgnum}{$tax_link->taxnum} ||= + FS::quotation_pkg_tax->new({ + quotationpkgnum => $quotationpkgnum, + itemdesc => $cust_bill_pkg->itemdesc, + taxnum => $tax_link->taxnum, + taxtype => $tax_link->taxtype, + setup_amount => 0, + recur_amount => 0, + }); + if ( $i == 0 ) { # first invoice + $qpt->set('setup_amount', $qpt->setup_amount + $tax_link->amount); + } else { # subsequent invoices + # this isn't perfectly accurate, but that's why it's an estimate + $qpt->set('recur_amount', $qpt->recur_amount + $tax_link->amount); + $qpt->set('setup_amount', sprintf('%.2f', $qpt->setup_amount - $tax_link->amount)); + $qpt->set('setup_amount', 0) if $qpt->setup_amount < 0; + } + } elsif ($target->feepart) { + # do nothing; we already warned for the fee itself + } else { + # tax on tax: the tax target is another tax item + # since this is an estimate, I'm just going to assign it to the + # first of the underlying packages + my $sublinks = $target->cust_bill_pkg_tax_rate_location; + if ($sublinks and $sublinks->[0]) { + $tax_link->set('taxable_billpkgnum', $sublinks->[0]->taxable_billpkgnum); + push @$links, $tax_link; #try again + } else { + warn "$me unable to assign tax on tax; ignoring\n"; + } + } + } # while my $tax_link + } # foreach my $cust_bill_pkg + #XXX discounts + } + foreach my $quotation_pkg (values %quotation_pkg) { + $error = $quotation_pkg->replace; + return "$error (recording estimate for ".$quotation_pkg->part_pkg->pkg.")" + if $error; + } + foreach my $quotation_pkg_tax (map { values %$_ } values %quotation_pkg_tax) { + $error = $quotation_pkg_tax->insert; + return "$error (recording estimated tax for ".$quotation_pkg_tax->itemdesc.")" + if $error; + } + return; } =back diff --git a/FS/FS/quotation_pkg.pm b/FS/FS/quotation_pkg.pm index 1b5b41950..1674d2bc9 100644 --- a/FS/FS/quotation_pkg.pm +++ b/FS/FS/quotation_pkg.pm @@ -70,6 +70,11 @@ The amount per package that will be charged in setup/one-time fees. The amount per package that will be charged per billing cycle. +=item freq + +The length of the billing cycle. If zero it's a one-time charge; if any +other number it's that many months; other values are in L<FS::Misc::pkg_freqs>. + =back =head1 METHODS @@ -180,6 +185,8 @@ and replace methods. sub check { my $self = shift; + my @freqs = ('', keys (%{ FS::Misc->pkg_freqs })); + my $error = $self->ut_numbern('quotationpkgnum') || $self->ut_foreign_key( 'quotationnum', 'quotation', 'quotationnum' ) @@ -190,6 +197,7 @@ sub check { || $self->ut_numbern('quantity') || $self->ut_moneyn('unitsetup') || $self->ut_moneyn('unitrecur') + || $self->ut_enum('freq', \@freqs) || $self->ut_enum('waive_setup', [ '', 'Y'] ) ; @@ -431,11 +439,6 @@ sub cust_bill_pkg_display { $recur->{'type'} = 'R'; if ( $type eq 'S' ) { -sub tax_locationnum { - my $self = shift; - $self->locationnum; -} - return ($setup); } elsif ( $type eq 'R' ) { return ($recur); @@ -472,6 +475,11 @@ sub prospect_main { $quotation->prospect_main; } +sub tax_locationnum { + my $self = shift; + $self->locationnum; +} + sub _upgrade_data { my $class = shift; diff --git a/httemplate/misc/cacti_graphs.html b/httemplate/misc/cacti_graphs.html index 90a435091..9a90b894d 100644 --- a/httemplate/misc/cacti_graphs.html +++ b/httemplate/misc/cacti_graphs.html @@ -43,6 +43,21 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('View customer services'); my $svcnum = $cgi->param('svcnum') or die 'Illegal svcnum'; + +# false laziness with view/elements/svc_Common.html +# only doing this to check agent access, don't actually use $svc_x +my $svc_x = qsearchs({ + 'select' => 'svc_broadband.*', + 'table' => 'svc_broadband', + 'addl_from' => ' LEFT JOIN cust_svc USING ( svcnum ) '. + ' LEFT JOIN cust_pkg USING ( pkgnum ) '. + ' LEFT JOIN cust_main USING ( custnum ) ', + 'hashref' => { 'svcnum' => $svcnum }, + 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql( + 'null_right' => 'View/link unlinked services' + ), +}) or die "Unknown svcnum $svcnum in svc_broadband table\n"; + my $load = $cgi->param('load'); my $graphnum = $cgi->param('graphnum') || ''; diff --git a/httemplate/misc/process/cacti_graphs.cgi b/httemplate/misc/process/cacti_graphs.cgi index f2baeb455..a4df72288 100644 --- a/httemplate/misc/process/cacti_graphs.cgi +++ b/httemplate/misc/process/cacti_graphs.cgi @@ -4,6 +4,22 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('View customer services'); +# false laziness with view/elements/svc_Common.html +# only doing this to check agent access, don't actually use $svc_x +my %param = $cgi->param('arg'); +my $svcnum = $param{'svcnum'}; +my $svc_x = qsearchs({ + 'select' => 'svc_broadband.*', + 'table' => 'svc_broadband', + 'addl_from' => ' LEFT JOIN cust_svc USING ( svcnum ) '. + ' LEFT JOIN cust_pkg USING ( pkgnum ) '. + ' LEFT JOIN cust_main USING ( custnum ) ', + 'hashref' => { 'svcnum' => $svcnum }, + 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql( + 'null_right' => 'View/link unlinked services' + ), +}) or die "Unknown svcnum $svcnum in svc_broadband table\n"; + my $server = FS::UI::Web::JSRPC->new('FS::part_export::cacti::process_graphs', $cgi); </%init> |