X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fselect-terms.html;h=a330df17cbaf548c880197f725c028618e960959;hb=8eb6542c022ac84b125416f3fb0828b278ba600a;hp=629d1e4647d473644705ae860bdd02f3437dbc04;hpb=bdf4497fd8d3778e9cc0f8b90dd8a742f3a84158;p=freeside.git

diff --git a/httemplate/elements/select-terms.html b/httemplate/elements/select-terms.html
index 629d1e464..a330df17c 100644
--- a/httemplate/elements/select-terms.html
+++ b/httemplate/elements/select-terms.html
@@ -2,7 +2,18 @@
         ID   = "invoice_terms"
         <% $opt{'disabled'} ? 'DISABLED' : ''%>
 >
-  <OPTION VALUE=""><% $empty_label %>
+# #false laziness w/select-table.html
+% while ( @pre_options ) { 
+%   my $pre_opt   = shift(@pre_options);
+%   my $pre_label = shift(@pre_options);
+%   my $selected = #   ( ref($value) && $value->{$pre_opt} ) ||
+%                   ( $curr_value eq $pre_opt );
+    <OPTION VALUE="<% $pre_opt %>"
+            <% $selected ? 'SELECTED' : '' %>
+    ><% $pre_label %>
+% } 
+
+  <OPTION VALUE="<% $empty_value %>"><% $empty_label %>
 % foreach my $term ( @terms ) {
     <OPTION VALUE="<% $term %>" <% $curr_value eq $term ? ' SELECTED' : '' %>><% $term %>
 % }
@@ -15,12 +26,19 @@ my $conf = new FS::Conf;
 
 my $empty_label =
   $opt{'empty_label'}
-  || 'Default ('.
-       ($conf->config('invoice_default_terms') || 'Payable upon receipt').
-     ')';
+    || emt('Default').' ('.
+         ( $conf->config('invoice_default_terms', $opt{'agentnum'})
+             || emt('Payable upon receipt')
+         ).
+       ')';
+
+my $empty_value = $opt{'empty_value'} || '';
 
-my @terms = ( 'Payable upon receipt',
-              ( map "Net $_", 0, 10, 15, 20, 30, 45, 60 ),
+my @terms = ( emt('Payable upon receipt'),
+              ( map "Net $_",
+                0, 3, 5, 7, 9, 10, 14, 15, 18, 20, 21, 25, 30, 45, 60, 90 ),
             );
 
+my @pre_options = $opt{pre_options} ? @{ $opt{pre_options} } : ();
+
 </%init>