X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fselect-agent.html;h=54069a5cb12ca95c7b22a213c6a8a95697829f74;hb=f7cf4cb83f2fb242e59d9268f5154c42ea1e7753;hp=aa480a54b08504aec11b55cac2b34806dfa83fce;hpb=1a033848671cad2cbe7687b37fc718b3b2a68b83;p=freeside.git

diff --git a/httemplate/elements/select-agent.html b/httemplate/elements/select-agent.html
index aa480a54b..54069a5cb 100644
--- a/httemplate/elements/select-agent.html
+++ b/httemplate/elements/select-agent.html
@@ -1,16 +1,21 @@
-<%
-  my( $agentnum, %opt ) = @_;
-
-  my %select_opt = ();
-  $select_opt{'records'} = $opt{'agents'}
-    if $opt{'agents'};
-
-%><%= include( '/elements/select-table.html',
+<% include( '/elements/select-table.html',
                  'table'       => 'agent',
                  'name_col'    => 'agent',
-                 'value'       => $agentnum,
+                 'value'       => $agentnum || '',
                  'empty_label' => 'all',
                  'hashref'     => { 'disabled' => '' },
-                 %select_opt,
+                 'extra_sql'   => ' AND '.
+                                  $FS::CurrentUser::CurrentUser->agentnums_sql.
+                                  ' ORDER BY agent',
+                 %opt,
              )
 %>
+<%init>
+
+my %opt = @_;
+my $agentnum = $opt{'curr_value'} || $opt{'value'};
+
+$opt{'records'} = delete $opt{'agents'}
+  if $opt{'agents'};
+
+</%init>