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
/
quotation.html
diff --git
a/httemplate/view/quotation.html
b/httemplate/view/quotation.html
index
81c7cdd
..
4abef9f
100755
(executable)
--- a/
httemplate/view/quotation.html
+++ b/
httemplate/view/quotation.html
@@
-17,9
+17,15
@@
function areyousure(href, message) {
'actionlabel' => emt('Add package'),
map { $_ => $quotation->$_ } qw( quotationnum custnum prospectnum )
&>
'actionlabel' => emt('Add package'),
map { $_ => $quotation->$_ } qw( quotationnum custnum prospectnum )
&>
- <BR><BR>
% }
% }
+% if ( $curuser->access_right('One-time charge') ) {
+ | <& /elements/one_time_charge_link.html,
+ map { $_ => $quotation->$_ } qw( quotationnum custnum prospectnum )
+ &>
+% }
+ <BR><BR>
+
% if ( 1 ) { #if ( $curuser->access_right('Send quotations') )
<& /elements/popup_link.html,
% if ( 1 ) { #if ( $curuser->access_right('Send quotations') )
<& /elements/popup_link.html,
@@
-66,6
+72,9
@@
function areyousure(href, message) {
<BR><BR>
% }
<BR><BR>
% }
+% if ( $error ) {
+<& /elements/error.html, $error &>
+% }
% if ( $conf->exists('quotation_html') ) {
<% join('', $quotation->print_html( preref_callback=>$preref_callback )) %>
% if ( $conf->exists('quotation_html') ) {
<% join('', $quotation->print_html( preref_callback=>$preref_callback )) %>
@@
-101,6
+110,8
@@
my $quotation = qsearchs({
});
die "Quotation #$quotationnum not found!" unless $quotation;
});
die "Quotation #$quotationnum not found!" unless $quotation;
+my $error = $quotation->estimate;
+
my $menubar = menubar( $quotation->cust_or_prospect_label_link($p) );
my $link = "quotationnum=$quotationnum";
my $menubar = menubar( $quotation->cust_or_prospect_label_link($p) );
my $link = "quotationnum=$quotationnum";