projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
customer quotations are work orders? RT#25561
[freeside.git]
/
httemplate
/
view
/
cust_bill-logo.cgi
diff --git
a/httemplate/view/cust_bill-logo.cgi
b/httemplate/view/cust_bill-logo.cgi
index
75321ef
..
dc8b674
100755
(executable)
--- a/
httemplate/view/cust_bill-logo.cgi
+++ b/
httemplate/view/cust_bill-logo.cgi
@@
-9,13
+9,17
@@
my $conf;
my $templatename;
my $agentnum = '';
my $templatename;
my $agentnum = '';
-if ( $cgi->param('invnum') ) {
+if ( $cgi->param('invnum') =~ /^(\d+)$/ ) {
+ my $invnum = $1;
$templatename = $cgi->param('template') || $cgi->param('templatename');
$templatename = $cgi->param('template') || $cgi->param('templatename');
- my $cust_bill = qsearchs('cust_bill', { 'invnum' => $cgi->param('invnum') } )
- or die 'unknown invnum';
+ my $cust_bill = FS::cust_bill->by_key($invnum)
+ || FS::cust_bill_void->by_key($invnum);
+ die 'unknown invnum' unless $cust_bill;
$conf = $cust_bill->conf;
$agentnum = $cust_bill->cust_main->agentnum;
} else {
$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;
my($query) = $cgi->keywords;
$query =~ /^([^\.\/]*)$/ or die 'illegal query';
$templatename = $1;