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

diff --git a/FS/FS/inventory_item.pm b/FS/FS/inventory_item.pm
index 3bba1cdda..9a58a6463 100644
--- a/FS/FS/inventory_item.pm
+++ b/FS/FS/inventory_item.pm
@@ -1,13 +1,7 @@
 package FS::inventory_item;
+use base qw( FS::cust_main_Mixin FS::Record );
 
 use strict;
-use vars qw( @ISA );
-use FS::Record qw( dbh qsearch qsearchs );
-use FS::cust_main_Mixin;
-use FS::inventory_class;
-use FS::cust_svc;
-
-@ISA = qw( FS::cust_main_Mixin FS::Record );
 
 =head1 NAME
 
@@ -106,8 +100,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;
 
@@ -119,13 +117,9 @@ sub check {
 Returns the customer service associated with this inventory item, if the
 item has been used (see L<FS::cust_svc>).
 
-=cut
+=item agent 
 
-sub cust_svc {
-  my $self = shift;
-  return '' unless $self->svcnum;
-  qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
-}
+Returns the associated agent for this event, if any, as an FS::agent object.
 
 =back
 
@@ -142,7 +136,7 @@ sub process_batch_import {
 
   my $opt = { 'table'   => 'inventory_item',
               #'params'  => [ 'itembatch', 'classnum', ],
-              'params'  => [ 'classnum', ],
+              'params'  => [ 'classnum', 'agentnum', ],
               'formats' => { 'default' => [ 'item' ] },
               'default_csv' => 1,
             };
@@ -159,7 +153,7 @@ maybe batch_import should be a regular method in FS::inventory_class
 
 =head1 SEE ALSO
 
-L<inventory_class>, L<cust_svc>, L<FS::Record>, schema.html from the base
+L<FS::inventory_class>, L<FS::cust_svc>, L<FS::Record>, schema.html from the base
 documentation.
 
 =cut