X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Finventory_item.pm;h=477c9341061eacf083f637df432dec47a6c95cb6;hb=e5d6af11f52aabe8c9e6e12ce43c3401ccf025a8;hp=3bba1cdda3270b960b3aa20f1380a648fc8360e9;hpb=63a268637b2d51a8766412617724b9436439deb6;p=freeside.git

diff --git a/FS/FS/inventory_item.pm b/FS/FS/inventory_item.pm
index 3bba1cdda..477c93410 100644
--- 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' )
+    #|| $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_alphan('svc_field')
   ;
   return $error if $error;
 
@@ -127,6 +131,17 @@ sub cust_svc {
   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
@@ -142,7 +157,7 @@ sub process_batch_import {
 
   my $opt = { 'table'   => 'inventory_item',
               #'params'  => [ 'itembatch', 'classnum', ],
-              'params'  => [ 'classnum', ],
+              'params'  => [ 'classnum', 'agentnum', ],
               'formats' => { 'default' => [ 'item' ] },
               'default_csv' => 1,
             };