projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix A/R report
[freeside.git]
/
httemplate
/
view
/
quotation.html
diff --git
a/httemplate/view/quotation.html
b/httemplate/view/quotation.html
index
5646fb9
..
cabf30a
100755
(executable)
--- a/
httemplate/view/quotation.html
+++ b/
httemplate/view/quotation.html
@@
-1,5
+1,8
@@
+% if ( $quotation->custnum ) {
+<& /elements/header-cust_main.html, view=>'quotations', custnum=>$quotation->custnum &>
+<h2>Quotation #<% $quotationnum %></h2>
+% } else { #eventually, header-prospect_main.html
<& /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">
@@
-9,6
+12,8
@@
function areyousure(href, message) {
}
</SCRIPT>
}
</SCRIPT>
+% }
+
% unless ( $quotation->disabled eq 'Y' ) {
% my $inrow = 0;
% unless ( $quotation->disabled eq 'Y' ) {
% my $inrow = 0;
@@
-23,9
+28,13
@@
function areyousure(href, message) {
% if ( $curuser->access_right('One-time charge') ) {
<% $inrow ? ' | ' : '' %>
% if ( $curuser->access_right('One-time charge') ) {
<% $inrow ? ' | ' : '' %>
- <& /elements/one_time_charge_link.html,
- map { $_ => $quotation->$_ } qw( quotationnum custnum prospectnum )
- &>
+% my $query = 'quotationnum=' . $quotation->get('quotationnum');
+% if ($quotation->custnum) {
+% $query .= ';custnum=' . $quotation->custnum;
+% } else {
+% $query .= ';prospectnum=' . $quotation->prospectnum;
+% }
+ <A HREF="<% $fsurl . 'edit/quick-charge.html?' . $query %>"><% emt('One-time charge') %></A>
% $inrow++;
% }
% $inrow++;
% }
@@
-63,7
+72,9
@@
function areyousure(href, message) {
<BR><BR>
% if ( $curuser->access_right('New customer') && $quotation->quotation_pkg ) {
<BR><BR>
% if ( $curuser->access_right('New customer') && $quotation->quotation_pkg ) {
+% # if we end up with more than one option, combine these links and add an interstitial screen
<A HREF="<%$p%>edit/process/quotation_convert.html?quotationnum=<% $quotation->quotationnum %>">Place order</A>
<A HREF="<%$p%>edit/process/quotation_convert.html?quotationnum=<% $quotation->quotationnum %>">Place order</A>
+ | <A HREF="<%$p%>edit/process/quotation_convert.html?quotationnum=<% $quotation->quotationnum %>&onhold=1">Order on hold</A>
<BR><BR>
% }
<BR><BR>
% }
@@
-110,7
+121,11
@@
function areyousure(href, message) {
% }
% #plaintext quotations? <PRE><% join('', $quotation->print_text() ) %></PRE>
% }
% #plaintext quotations? <PRE><% join('', $quotation->print_text() ) %></PRE>
-<& /elements/footer.html &>
+% if ( $quotation->custnum ) {
+ <& /elements/footer-cust_main.html &>
+% } else {
+ <& /elements/footer.html &>
+% }
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;