combine ticket notification scrips, #15353

[freeside.git] / httemplate / elements / select-cust-part_pkg.html

diff --git a/httemplate/elements/select-cust-part_pkg.html b/httemplate/elements/select-cust-part_pkg.html
index 2926629..731beae 100644 (file)
--- a/httemplate/elements/select-cust-part_pkg.html
+++ b/httemplate/elements/select-cust-part_pkg.html
@@ -18,12 +18,11 @@ Example:
 
 </%doc>
 
-<% include( '/elements/select-part_pkg.html',
-              'empty_label'    => 'Select package', #? need here in case removed
+<& /elements/select-part_pkg.html,
+              'empty_label'    => emt('Select package'), #? need here in case removed
                                                     #from select-part_pkg ??
               %opt,
-          )
-%>
+&>
 <%init>
 
 my( %opt ) = @_;
@@ -31,11 +30,6 @@ my( %opt ) = @_;
 my $cust_main = $opt{'cust_main'}
   or die "cust_main not specified";
 
-$opt{'extra_sql'} .=
-  ' AND ( agentnum IS NOT NULL '.
-  '         OR 0 < ( SELECT COUNT(*) FROM type_pkgs '.
-  '                    WHERE typenum = '. $cust_main->agent->typenum.
-  '                      AND type_pkgs.pkgpart = part_pkg.pkgpart )'.
-  '     )';
+$opt{'extra_sql'} .= ' AND '. FS::part_pkg->agent_pkgs_sql( $cust_main->agent );
 
 </%init>