X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Fselect-terms.html;h=eda439a4c20a521c4a26331685e5cb999ccc0e10;hp=ce37d2ae5e0580a391da0eda7e1f8c4061b5c3bf;hb=a983ba996fbd3d432443eff8afc4b09bb48ec443;hpb=46601e5fa23b2049dbcf055a98d340ab18555383

diff --git a/httemplate/elements/select-terms.html b/httemplate/elements/select-terms.html
index ce37d2ae5..eda439a4c 100644
--- a/httemplate/elements/select-terms.html
+++ b/httemplate/elements/select-terms.html
@@ -26,16 +26,15 @@ my $conf = new FS::Conf;
 
 my $empty_label =
   $opt{'empty_label'}
-  || emt('Default').' ('.
-       ($conf->config('invoice_default_terms') || emt('Payable upon receipt')).
-     ')';
+    || emt('Default').' ('.
+         ( $conf->config('invoice_default_terms', $opt{'agentnum'})
+             || emt('Payable upon receipt')
+         ).
+       ')';
 
 my $empty_value = $opt{'empty_value'} || '';
 
-my @terms = ( emt('Payable upon receipt'),
-              ( map "Net $_",
-                0, 3, 9, 10, 14, 15, 18, 20, 21, 25, 30, 45, 60, 90 ),
-            );
+my @terms = map emt($_), @FS::Conf::invoice_terms;
 
 my @pre_options = $opt{pre_options} ? @{ $opt{pre_options} } : ();