From 81978af92ecdaaefeff5156d9ab3b4f99586df1c Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Tue, 3 Jul 2012 18:51:51 -0700 Subject: quotations, RT#16996 --- httemplate/view/prospect_main.html | 31 +++++++++++++++++++++++++++++++ httemplate/view/quotation.html | 25 +++++++++++++++---------- 2 files changed, 46 insertions(+), 10 deletions(-) (limited to 'httemplate/view') diff --git a/httemplate/view/prospect_main.html b/httemplate/view/prospect_main.html index 9e85348af..801d64bda 100644 --- a/httemplate/view/prospect_main.html +++ b/httemplate/view/prospect_main.html @@ -64,6 +64,31 @@
+% if ( $curuser->access_right('Generate quotation') ) { + <% mt( 'Quotations' ) |h %> + New quotation +% my @quotations = $prospect_main->quotation; +% if ( @quotations ) { + <& /elements/table-grid.html &> +% my $bgcolor1 = '#eeeeee'; +% my $bgcolor2 = '#ffffff'; +% my $bgcolor = ''; + + # + <% mt('Date') |h %> + +% foreach my $quotation (@quotations) { + + <% $quotation->quotationnum %> + <% time2str($date_format, $quotation->_date) |h %> + +% } + +% } +

+% } + + % if ( $curuser->access_right('Qualify service') ) { <% include( '/elements/popup_link-prospect_main.html', 'action' => $p. 'misc/qual.html', @@ -80,6 +105,7 @@

% } + <%init> @@ -95,6 +122,10 @@ my $curuser = $FS::CurrentUser::CurrentUser; die "access denied" unless $curuser->access_right('View prospect'); +my $conf = new FS::Conf; + +my $date_format = $conf->config('date_format') || '%m/%d/%Y'; + my $prospectnum; if ( $cgi->param('prospectnum') =~ /^(\d+)$/ ) { $prospectnum = $1; diff --git a/httemplate/view/quotation.html b/httemplate/view/quotation.html index 2c2c6b7ca..866ade2c2 100755 --- a/httemplate/view/quotation.html +++ b/httemplate/view/quotation.html @@ -22,21 +22,20 @@ XXX resending quotations % } -XXX view typset quotation + -% if ( $conf->exists('invoice_latex') ) { +% if ( $conf->exists('quotation_latex') ) { - <% mt('View typeset invoice PDF') |h %> + <% mt('View typeset quotation PDF') |h %>

% } -XXX actually show the quotation - -% if ( $conf->exists('invoice_html') ) { - <% join('', $cust_bill->print_html(\%opt) ) %> +% if ( $conf->exists('quotation_html') ) { + <% join('', $quotation->print_html() ) %> % } else { -
<% join('', $cust_bill->print_text(\%opt) ) %>
-% } +% die "quotation_html config missing"; +% } +% #plaintext quotations?
<% join('', $quotation->print_text() ) %>
@@ -56,7 +55,7 @@ if ( $query =~ /^(\d+)$/ ) { $quotationnum = $cgi->param('quotationnum'); } -#my $conf = new FS::Conf; +my $conf = new FS::Conf; my $quotation = qsearchs({ 'select' => 'quotation.*', @@ -67,6 +66,7 @@ my $quotation = qsearchs({ }); die "Quotation #$quotationnum not found!" unless $quotation; +my $menubar; if ( my $custnum = $quotation->custnum ) { my $display_custnum = $quotation->cust_main->display_custnum; $menubar = menubar( @@ -78,4 +78,9 @@ if ( my $custnum = $quotation->custnum ) { ); } +my $link = "quotationnum=$quotationnum"; +#$link .= ';template='. uri_escape($template) if $template; +#$link .= ';notice_name='. $notice_name if $notice_name; + + -- cgit v1.2.1