diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2014-09-16 23:41:40 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2014-09-16 23:41:40 -0700 |
| commit | ee17093f5b41c1544d00a2670d26794aee33077a (patch) | |
| tree | 6d11ca503666b991dd4b8987e301826c3fe9291f /httemplate/edit | |
| parent | f58e37b603c27dd0b2d2232e8cb0392088409437 (diff) | |
customer quotations are work orders? RT#25561
Diffstat (limited to 'httemplate/edit')
| -rw-r--r-- | httemplate/edit/process/quotation_convert.html | 15 | ||||
| -rw-r--r-- | httemplate/edit/quotation.html | 23 |
2 files changed, 25 insertions, 13 deletions
diff --git a/httemplate/edit/process/quotation_convert.html b/httemplate/edit/process/quotation_convert.html index b387d0607..dc00a88d3 100644 --- a/httemplate/edit/process/quotation_convert.html +++ b/httemplate/edit/process/quotation_convert.html @@ -10,8 +10,19 @@ my $quotation = qsearchs( 'quotation' => { quotationnum => scalar( $cgi->param('quotationnum') ), } ) or die 'unknown quotationnum'; -my $cust_main = $quotation->convert_cust_main; -errorpage($cust_main) unless ref($cust_main);# eq 'FS::cust_main'; +my $cust_main = $quotation->cust_main; +if ( $cust_main ) { + my $error = $quotation->order; + errorpage($error) if $error; + + #i should be part of the order transaction + $quotation->disabled('Y'); + $quotation->replace; + +} else { + $cust_main = $quotation->convert_cust_main; + errorpage($cust_main) unless ref($cust_main);# eq 'FS::cust_main'; +} </%init> diff --git a/httemplate/edit/quotation.html b/httemplate/edit/quotation.html index 8b6062355..cc95d8781 100644 --- a/httemplate/edit/quotation.html +++ b/httemplate/edit/quotation.html @@ -1,19 +1,20 @@ <% include( 'elements/edit.html', - 'name' => 'Quotation', - 'table' => 'quotation', - 'labels' => { - 'quotationnum' => 'Quotation number', - 'prospectnum' => 'Prospect', - 'custnum' => 'Customer', - '_date' => 'Date', - 'disabled' => 'Disabled', - }, - 'fields' => [ + 'name' => 'Quotation', + 'table' => 'quotation', + 'menubar' => [], + 'labels' => { + 'quotationnum' => 'Quotation number', + 'prospectnum' => 'Prospect', + 'custnum' => 'Customer', + '_date' => 'Date', + 'disabled' => 'Disabled', + }, + 'fields' => [ { field=>'prospectnum', type=>'fixed-prospect_main' }, { field=>'custnum', type=>'fixed-cust_main' }, { field=>'_date', type=>'fixed-date' }, { field=>'disabled', type=>'checkbox', value=>'Y'}, - ], + ], #XXX some way to disable the "view all" 'new_callback' => sub { my( $cgi, $quotation) = @_; $quotation->$_( $cgi->param($_) ) |