projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4875cef
)
RT# 74666 - fixed display error on v3.
author
Christopher Burger
<burgerc@freeside.biz>
Tue, 30 May 2017 18:25:18 +0000
(14:25 -0400)
committer
Christopher Burger
<burgerc@freeside.biz>
Tue, 30 May 2017 18:25:18 +0000
(14:25 -0400)
httemplate/view/quotation.html
patch
|
blob
|
history
diff --git
a/httemplate/view/quotation.html
b/httemplate/view/quotation.html
index
41a5a87
..
b73ce0d
100755
(executable)
--- a/
httemplate/view/quotation.html
+++ b/
httemplate/view/quotation.html
@@
-1,14
+1,11
@@
% if ( $quotation->custnum ) {
% if ( $quotation->custnum ) {
-<& /elements/header-cust_main.html, view=>'quotations', custnum=>$quotation->custnum &>
<h2>Quotation #<% $quotationnum %>
% if ($quotation->quotation_description) {
(<% $quotation->quotation_description %>)
% }
</h2>
% } else { #eventually, header-prospect_main.html
<h2>Quotation #<% $quotationnum %>
% if ($quotation->quotation_description) {
(<% $quotation->quotation_description %>)
% }
</h2>
% } else { #eventually, header-prospect_main.html
->>>>>>> 512a0bd... RT# 74666, Added quotation description to customer quotation list and quotation view
<& /elements/header.html, mt('Quotation View'), $menubar &>
<& /elements/header.html, mt('Quotation View'), $menubar &>
-
<& /elements/init_overlib.html &>
<SCRIPT TYPE="text/javascript">
<& /elements/init_overlib.html &>
<SCRIPT TYPE="text/javascript">
@@
-18,6
+15,8
@@
function areyousure(href, message) {
}
</SCRIPT>
}
</SCRIPT>
+% }
+
% unless ( $quotation->disabled eq 'Y' ) {
% my $inrow = 0;
% unless ( $quotation->disabled eq 'Y' ) {
% my $inrow = 0;
@@
-123,7
+122,7
@@
function areyousure(href, message) {
my $curuser = $FS::CurrentUser::CurrentUser;
my $curuser = $FS::CurrentUser::CurrentUser;
-#die "access denied"
+#die "access denied"
;
# unless $curuser->access_right('View quotations');
my $can_generate_quotation = $curuser->access_right('Generate quotation');
# unless $curuser->access_right('View quotations');
my $can_generate_quotation = $curuser->access_right('Generate quotation');