projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#29903 Import accountcodes
[freeside.git]
/
FS
/
FS
/
access_user.pm
diff --git
a/FS/FS/access_user.pm
b/FS/FS/access_user.pm
index
509cc09
..
de3c884
100644
(file)
--- a/
FS/FS/access_user.pm
+++ b/
FS/FS/access_user.pm
@@
-10,6
+10,8
@@
use FS::access_user_pref;
use FS::access_usergroup;
use FS::agent;
use FS::cust_main;
use FS::access_usergroup;
use FS::agent;
use FS::cust_main;
+use FS::sales;
+use FS::sched_item;
$DEBUG = 0;
$me = '[FS::access_user]';
$DEBUG = 0;
$me = '[FS::access_user]';
@@
-254,6
+256,7
@@
sub check {
|| $self->ut_text('last')
|| $self->ut_text('first')
|| $self->ut_foreign_keyn('user_custnum', 'cust_main', 'custnum')
|| $self->ut_text('last')
|| $self->ut_text('first')
|| $self->ut_foreign_keyn('user_custnum', 'cust_main', 'custnum')
+ || $self->ut_foreign_keyn('report_salesnum', 'sales', 'salesnum')
|| $self->ut_enum('disabled', [ '', 'Y' ] )
;
return $error if $error;
|| $self->ut_enum('disabled', [ '', 'Y' ] )
;
return $error if $error;
@@
-286,6
+289,18
@@
sub user_cust_main {
qsearchs( 'cust_main', { 'custnum' => $self->user_custnum } );
}
qsearchs( 'cust_main', { 'custnum' => $self->user_custnum } );
}
+=item report_sales
+
+Returns the FS::sales object (see L<FS::sales>), if any, for this
+user.
+
+=cut
+
+sub report_sales {
+ my $self = shift;
+ qsearchs( 'sales', { 'salesnum' => $self->report_salesnum } );
+}
+
=item access_usergroup
Returns links to the the groups this user is a part of, as FS::access_usergroup
=item access_usergroup
Returns links to the the groups this user is a part of, as FS::access_usergroup
@@
-427,6
+442,7
@@
sub agents {
'table' => 'agent',
'hashref' => { disabled=>'' },
'extra_sql' => ' AND '. $self->agentnums_sql(@_),
'table' => 'agent',
'hashref' => { disabled=>'' },
'extra_sql' => ' AND '. $self->agentnums_sql(@_),
+ 'order_by' => 'ORDER BY agent',
});
}
});
}
@@
-454,7
+470,7
@@
sub access_right {
unless ( grep !exists($self->{_ACLcache}{$_}), @$rightname ) {
warn "$me ACL cache hit for ". join(', ', @$rightname). "\n"
if $DEBUG;
unless ( grep !exists($self->{_ACLcache}{$_}), @$rightname ) {
warn "$me ACL cache hit for ". join(', ', @$rightname). "\n"
if $DEBUG;
- return
grep $self->{_ACLcache}{$_}, @$rightname
+ return
scalar( grep $self->{_ACLcache}{$_}, @$rightname );
}
warn "$me ACL cache miss for ". join(', ', @$rightname). "\n"
}
warn "$me ACL cache miss for ". join(', ', @$rightname). "\n"
@@
-566,6
+582,11
@@
sub is_system_user {
) );
}
) );
}
+sub sched_item {
+ my $self = shift;
+ qsearch( 'sched_item', { 'usernum' => $self->usernum } );
+}
+
=back
=head1 BUGS
=back
=head1 BUGS