X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Fselect-agent.html;h=2bd0095dabdbbca8308520ded79fdc9e108f58fb;hp=009cc6e0638d88cfc05c83ebdd6683d2191b0a51;hb=7b0bbc4117a7959b9f7b7b2cf999b8188ba34160;hpb=e47e9758f480c664bfc3917d798cd69c7d354999

diff --git a/httemplate/elements/select-agent.html b/httemplate/elements/select-agent.html
index 009cc6e06..2bd0095da 100644
--- a/httemplate/elements/select-agent.html
+++ b/httemplate/elements/select-agent.html
@@ -1,18 +1,31 @@
-<%
-  my( $agentnum, %opt ) = @_;
+<& /elements/select-table.html,
+                 'table'         => 'agent',
+                 'name_col'      => 'agent',
+                 'value'         => $agentnum || '',
+                 'agent_virt'    => 1,
+                 'empty_label'   => $empty_label,
+                 'hashref'       => { 'disabled' => '' },
+                 'order_by'      => ' ORDER BY agent',
+                 'disable_empty' => $disable_empty,
+                 %opt,
+&>
+<%init>
 
-  $opt{'records'} = delete $opt{'agents'}
-    if $opt{'agents'};
+my %opt = @_;
+my $agentnum = $opt{'curr_value'} || $opt{'value'};
 
-%><%= include( '/elements/select-table.html',
-                 'table'       => 'agent',
-                 'name_col'    => 'agent',
-                 'value'       => $agentnum,
-                 'empty_label' => 'all',
-                 'hashref'     => { 'disabled' => '' },
-                 'extra_sql'   => ' AND '.
-                                  $FS::CurrentUser::CurrentUser->agentnums_sql.
-                                  ' ORDER BY agent',
-                 %opt,
-             )
-%>
+$opt{'records'} = delete $opt{'agents'}
+  if $opt{'agents'};
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+my $empty_label = $opt{'empty_label'} ? $opt{'empty_label'} : 'all';
+my $disable_empty = 0;
+if ( $opt{'agent_null_right'} ) {
+  if ( $curuser->access_right($opt{'agent_null_right'}) ) {
+    $disable_empty = 0;
+  } else {
+    $disable_empty = 1;
+  }
+}
+
+</%init>