[freeside-commits] freeside/httemplate/elements select-did.html, 1.11, 1.12

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail.420.am:/tmp/cvs-serv8996/httemplate/elements

Modified Files:
	select-did.html 
Log Message:
VoipNow export, #11170

Index: select-did.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-did.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -d -r1.11 -r1.12
--- select-did.html	11 Jan 2011 15:49:12 -0000	1.11
+++ select-did.html	1 Mar 2011 04:09:22 -0000	1.12
@@ -99,7 +99,6 @@
 my %opt = @_;
 
 my $conf = new FS::Conf;
-my $country = $conf->config('countrydefault') || 'US';
 
 #false laziness w/tr-select-did.html
 #XXX make sure this comes through on errors too
@@ -122,6 +121,10 @@
 
 my $bulknum = $opt{'bulknum'} || 0;
 
+my $country = $export->option('country') ||
+              $conf->config('countrydefault') ||
+              'US';
+
 #my $field = $opt{'field'} || 'phonenum';
 
 </%init>