From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 31 Dec 2014 03:20:08 +0000 (-0800)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=46ba9270a226ef01d0c29635373aef09ae42d372;hp=-c;p=freeside.git

Merge branch 'master' of git.freeside.biz:/home/git/freeside
---

46ba9270a226ef01d0c29635373aef09ae42d372
diff --combined FS/FS/Record.pm
index 43b9ca13b,10b1cf64c..765880e5e
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@@ -1711,7 -1711,7 +1711,7 @@@ Table name (required)
  
  =item params
  
- Listref of field names for static fields.  They will be given values from the
+ Arrayref of field names for static fields.  They will be given values from the
  PARAMS hashref and passed as a "params" hashref to batch_import.
  
  =item formats
@@@ -1760,10 -1760,10 +1760,10 @@@ format_types)
  
  =back
  
- PARAMS is a base64-encoded Storable string containing the POSTed data as
- a hash ref.  It normally contains at least one field, "uploaded files",
- generated by /elements/file-upload.html and containing the list of uploaded
- files.  Currently only supports a single file named "file".
+ PARAMS is a hashref (or base64-encoded Storable hashref) containing the 
+ POSTed data.  It must contain the field "uploaded files", generated by 
+ /elements/file-upload.html and containing the list of uploaded files.
+ Currently only supports a single file named "file".
  
  =cut
  
@@@ -3133,12 -3133,12 +3133,12 @@@ sub ut_agentnum_acl 
  
    if ( $self->$field() ) {
  
 -    return "Access denied"
 +    return 'Access denied to agent '. $self->$field()
        unless $curuser->agentnum($self->$field());
  
    } else {
  
 -    return "Access denied"
 +    return 'Access denied to global'
        unless grep $curuser->access_right($_), @$null_acl;
  
    }
@@@ -3161,7 -3161,7 +3161,7 @@@ sub fields 
      $table = $something->table;
    } else {
      $table = $something;
 -    $something = "FS::$table";
 +    #$something = "FS::$table";
    }
    return (real_fields($table));
  }