projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[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
ad2ff54
..
85b5d72
100755
(executable)
--- a/
httemplate/view/cust_bill-logo.cgi
+++ b/
httemplate/view/cust_bill-logo.cgi
@@
-3,18
+3,30
@@
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('View invoices')
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('View invoices')
+ or $FS::CurrentUser::CurrentUser->access_right('View quotations')
or $FS::CurrentUser::CurrentUser->access_right('Configuration');
or $FS::CurrentUser::CurrentUser->access_right('Configuration');
-my $conf
= new FS::Conf
;
+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';
+ $conf = $cust_bill->conf;
$agentnum = $cust_bill->cust_main->agentnum;
$agentnum = $cust_bill->cust_main->agentnum;
+} elsif ( $cgi->param('quotationnum') =~ /^(\d+)$/ ) {
+ my $quotationnum = $1;
+ my $quotation = FS::quotation->by_key($quotationnum)
+ or die 'unknown quotationnum';
+ $conf = $quotation->conf;
+ $agentnum = $quotation->agentnum;
} else {
} 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;