Order-Controller: Workflow Lieferantenauftrag → Preisanfrage

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index c17180324613bb63e7484b88c9b4ae2c24ed79fe..a79e3653c0a5b36744c37a23cb3678854411dec4 100644 (file)
--- 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 {
 
 # 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
 }
 
 # workflow from sales quotation to sales order


@@ -1585,7 +1590,7 @@ sub save {
   return $errors;
 }
 
   return $errors;
 }
 

-sub workflow_sales_quotation {
+sub workflow_sales_or_request_for_quotation {

   my ($self) = @_;
 
   # always save
   my ($self) = @_;
 
   # always save


@@ -1596,7 +1601,7 @@ sub workflow_sales_quotation {
     return $self->js->render();
   }
 
     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};
 
   $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())),
         ],
           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" } ],
         action => [
           t8('Save and Sales Order'),
           submit   => [ '#order_form', { action => "Order/sales_order" } ],


@@ -2203,8 +2213,6 @@ java script functions
 
 =item * credit limit
 
 
 =item * credit limit
 

-=item * more workflows (rfq)
-

 =item * price sources: little symbols showing better price / better discount
 
 =item * select units in input row?
 =item * price sources: little symbols showing better price / better discount
 
 =item * select units in input row?

diff --git a/SL/DB/Order.pm b/SL/DB/Order.pm
index 415896919e53ecc31d3e84481fe05a8ef99dcd6d..dc4bbebd85a31378a939ec55860c8a2704e7c7c8 100644 (file)
--- a/SL/DB/Order.pm
+++ b/SL/DB/Order.pm
@@ -311,6 +311,7 @@ sub new_from {
     { from => 'sales_order',       to => 'purchase_order',    abbr => 'sopo' },
     { from => 'purchase_order',    to => 'sales_order',       abbr => 'poso' },
     { from => 'sales_order',       to => 'sales_quotation',   abbr => 'sosq' },
     { from => 'sales_order',       to => 'purchase_order',    abbr => 'sopo' },
     { from => 'purchase_order',    to => 'sales_order',       abbr => 'poso' },
     { from => 'sales_order',       to => 'sales_quotation',   abbr => 'sosq' },

+    { from => 'purchase_order',    to => 'request_quotation', abbr => 'porq' },

   );
   my $from_to = (grep { $_->{from} eq $source->type && $_->{to} eq $destination_type} @from_tos)[0];
   croak("Cannot convert from '" . $source->type . "' to '" . $destination_type . "'") if !$from_to;
   );
   my $from_to = (grep { $_->{from} eq $source->type && $_->{to} eq $destination_type} @from_tos)[0];
   croak("Cannot convert from '" . $source->type . "' to '" . $destination_type . "'") if !$from_to;


@@ -355,7 +356,7 @@ sub new_from {
   if ( $is_abbr_any->(qw(soso)) ) {
     $args{periodic_invoices_config} = $source->periodic_invoices_config->clone_and_reset if $source->periodic_invoices_config;
   }
   if ( $is_abbr_any->(qw(soso)) ) {
     $args{periodic_invoices_config} = $source->periodic_invoices_config->clone_and_reset if $source->periodic_invoices_config;
   }

-  if ( $is_abbr_any->(qw(sosq)) ) {
+  if ( $is_abbr_any->(qw(sosq porq)) ) {

     $args{ordnumber} = undef;
     $args{quonumber} = undef;
     $args{reqdate}   = DateTime->today_local->next_workday();
     $args{ordnumber} = undef;
     $args{quonumber} = undef;
     $args{reqdate}   = DateTime->today_local->next_workday();