X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/f65440cb9d28d4862facc50858bd25fa138cb211..92f6fae1e8c4861460ae364ac7dc243b429a9cb6:/SL/Controller/Order.pm diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm index c17180324..a79e3653c 100644 --- a/SL/Controller/Order.pm +++ b/SL/Controller/Order.pm @@ -600,7 +600,12 @@ sub action_save_and_invoice { # workflow from sales order to sales quotation sub action_sales_quotation { - $_[0]->workflow_sales_quotation(); + $_[0]->workflow_sales_or_request_for_quotation(); +} + +# workflow from sales order to sales quotation +sub action_request_for_quotation { + $_[0]->workflow_sales_or_request_for_quotation(); } # workflow from sales quotation to sales order @@ -1585,7 +1590,7 @@ sub save { return $errors; } -sub workflow_sales_quotation { +sub workflow_sales_or_request_for_quotation { my ($self) = @_; # always save @@ -1596,7 +1601,7 @@ sub workflow_sales_quotation { return $self->js->render(); } - my $destination_type = sales_quotation_type(); + my $destination_type = $::form->{type} eq sales_order_type() ? sales_quotation_type() : request_quotation_type(); $self->order(SL::DB::Order->new_from($self->order, destination_type => $destination_type)); $self->{converted_from_oe_id} = delete $::form->{id}; @@ -1791,6 +1796,11 @@ sub setup_edit_action_bar { submit => [ '#order_form', { action => "Order/sales_quotation" } ], only_if => (any { $self->type eq $_ } (sales_order_type())), ], + action => [ + t8('Save and RFQ'), + submit => [ '#order_form', { action => "Order/request_for_quotation" } ], + only_if => (any { $self->type eq $_ } (purchase_order_type())), + ], action => [ t8('Save and Sales Order'), submit => [ '#order_form', { action => "Order/sales_order" } ], @@ -2203,8 +2213,6 @@ java script functions =item * credit limit -=item * more workflows (rfq) - =item * price sources: little symbols showing better price / better discount =item * select units in input row?