diff options
| author | Mark Wells <mark@freeside.biz> | 2016-07-19 12:56:49 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2016-07-19 12:56:49 -0700 |
| commit | 43f9be2fd8ef088788ade01d2e4bcc0667be36e5 (patch) | |
| tree | bfe014da84b63eca8263008e40335b5943ec5e4b /httemplate/edit/process | |
| parent | 0491d209351c209a64885a4d1fdf1398c1b56397 (diff) | |
| parent | 78a19c83d3cc5b3f22156d9ac19e5ae2d9170175 (diff) | |
Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
Diffstat (limited to 'httemplate/edit/process')
| -rw-r--r-- | httemplate/edit/process/quotation_convert.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/httemplate/edit/process/quotation_convert.html b/httemplate/edit/process/quotation_convert.html index dc00a88d3..26b5294f7 100644 --- a/httemplate/edit/process/quotation_convert.html +++ b/httemplate/edit/process/quotation_convert.html @@ -10,9 +10,12 @@ my $quotation = qsearchs( 'quotation' => { quotationnum => scalar( $cgi->param('quotationnum') ), } ) or die 'unknown quotationnum'; +my $params = {}; +$$params{'onhold'} = $cgi->param('onhold') ? 1 : 0; + my $cust_main = $quotation->cust_main; if ( $cust_main ) { - my $error = $quotation->order; + my $error = $quotation->order(undef,$params); errorpage($error) if $error; #i should be part of the order transaction @@ -20,7 +23,7 @@ if ( $cust_main ) { $quotation->replace; } else { - $cust_main = $quotation->convert_cust_main; + $cust_main = $quotation->convert_cust_main( $params ); errorpage($cust_main) unless ref($cust_main);# eq 'FS::cust_main'; } |