projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch-19' of https://github.com/gjones2/Freeside
[freeside.git]
/
FS
/
FS
/
inventory_item.pm
diff --git
a/FS/FS/inventory_item.pm
b/FS/FS/inventory_item.pm
index
3bba1cd
..
477c934
100644
(file)
--- a/
FS/FS/inventory_item.pm
+++ b/
FS/FS/inventory_item.pm
@@
-106,8
+106,12
@@
sub check {
my $error =
$self->ut_numbern('itemnum')
|| $self->ut_foreign_key('classnum', 'inventory_class', 'classnum' )
my $error =
$self->ut_numbern('itemnum')
|| $self->ut_foreign_key('classnum', 'inventory_class', 'classnum' )
+ #|| $self->ut_foreign_keyn('agentnum', 'agent', 'agentnum' )
+ || $self->ut_agentnum_acl('agentnum', ['Configuration',
+ 'Edit global inventory'] )
|| $self->ut_text('item')
|| $self->ut_foreign_keyn('svcnum', 'cust_svc', 'svcnum' )
|| $self->ut_text('item')
|| $self->ut_foreign_keyn('svcnum', 'cust_svc', 'svcnum' )
+ || $self->ut_alphan('svc_field')
;
return $error if $error;
;
return $error if $error;
@@
-127,6
+131,17
@@
sub cust_svc {
qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
}
qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
}
+=item agent
+
+Returns the associated agent for this event, if any, as an FS::agent object.
+
+=cut
+
+sub agent {
+ my $self = shift;
+ qsearchs('agent', { 'agentnum' => $self->agentnum } );
+}
+
=back
=head1 SUBROUTINES
=back
=head1 SUBROUTINES
@@
-142,7
+157,7
@@
sub process_batch_import {
my $opt = { 'table' => 'inventory_item',
#'params' => [ 'itembatch', 'classnum', ],
my $opt = { 'table' => 'inventory_item',
#'params' => [ 'itembatch', 'classnum', ],
- 'params' => [ 'classnum', ],
+ 'params' => [ 'classnum',
'agentnum',
],
'formats' => { 'default' => [ 'item' ] },
'default_csv' => 1,
};
'formats' => { 'default' => [ 'item' ] },
'default_csv' => 1,
};