X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill-logo.cgi;h=d55ec041ebf1a0bba7b0da0c7ba60c2dc74f2e7c;hb=fe4515eb37d76849dd08c62782d86bc7ba311dcd;hp=09ac9a717ba841cd7b9a845ac44544d1638d04ff;hpb=a4b8ce8cd1d309de00c64f38049a8dda38798046;p=freeside.git

diff --git a/httemplate/view/cust_bill-logo.cgi b/httemplate/view/cust_bill-logo.cgi
index 09ac9a717..d55ec041e 100755
--- a/httemplate/view/cust_bill-logo.cgi
+++ b/httemplate/view/cust_bill-logo.cgi
@@ -5,16 +5,19 @@ die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('View invoices')
       or $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
-my $conf = new FS::Conf;
+my $conf;
 
 my $templatename;
 my $agentnum = '';
 if ( $cgi->param('invnum') ) {
-  $templatename = $cgi->param('templatename');
+  $templatename = $cgi->param('template') || $cgi->param('templatename');
   my $cust_bill = qsearchs('cust_bill', { 'invnum' => $cgi->param('invnum') } )
     or die 'unknown invnum';
+  $conf = $cust_bill->conf;
   $agentnum = $cust_bill->cust_main->agentnum;
 } else {
+  # assume the default config
+  $conf = FS::Conf->new;
   my($query) = $cgi->keywords;
   $query =~ /^([^\.\/]*)$/ or die 'illegal query';
   $templatename = $1;