Kontoauszug verbuchen -> Dialogbuchungsentwürfe verbessert

[mfinanz.git] / SL / Controller / Order.pm

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 1309f141e9e877ac76654c2626c8ca5d26a5116e..ace7accba5d000c733f6cadb8d87763c5485f856 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -629,7 +629,7 @@ sub action_show_customer_vendor_details_dialog {
   $details{language}            = $cv->language_obj->description  if $cv->language_obj;
   $details{delivery_terms}      = $cv->delivery_term->description if $cv->delivery_term;
   $details{payment_terms}       = $cv->payment->description       if $cv->payment;
   $details{language}            = $cv->language_obj->description  if $cv->language_obj;
   $details{delivery_terms}      = $cv->delivery_term->description if $cv->delivery_term;
   $details{payment_terms}       = $cv->payment->description       if $cv->payment;

-  $details{pricegroup}          = $cv->pricegroup->pricegroup     if $cv->pricegroup;
+  $details{pricegroup}          = $cv->pricegroup->pricegroup     if $is_customer && $cv->pricegroup;

 
   foreach my $entry (@{ $cv->shipto }) {
     push @{ $details{SHIPTO} },   { map { $_ => $entry->$_ } @{$entry->meta->columns} };
 
   foreach my $entry (@{ $cv->shipto }) {
     push @{ $details{SHIPTO} },   { map { $_ => $entry->$_ } @{$entry->meta->columns} };


@@ -1367,6 +1367,8 @@ sub _workflow_sales_or_purchase_order {
 
   my $destination_type = $::form->{type} eq _sales_quotation_type()   ? _sales_order_type()
                        : $::form->{type} eq _request_quotation_type() ? _purchase_order_type()
 
   my $destination_type = $::form->{type} eq _sales_quotation_type()   ? _sales_order_type()
                        : $::form->{type} eq _request_quotation_type() ? _purchase_order_type()

+                       : $::form->{type} eq _purchase_order_type()    ? _sales_order_type()
+                       : $::form->{type} eq _sales_order_type()       ? _purchase_order_type()

                        : '';
 
   $self->order(SL::DB::Order->new_from($self->order, destination_type => $destination_type));
                        : '';
 
   $self->order(SL::DB::Order->new_from($self->order, destination_type => $destination_type));


@@ -1379,7 +1381,8 @@ sub _workflow_sales_or_purchase_order {
 
   # change form type
   $::form->{type} = $destination_type;
 
   # change form type
   $::form->{type} = $destination_type;

-  $self->init_type;
+  $self->type($self->init_type);
+  $self->cv  ($self->init_cv);

   $self->_check_auth;
 
   $self->_recalc();
   $self->_check_auth;
 
   $self->_recalc();


@@ -1498,13 +1501,13 @@ sub _setup_edit_action_bar {
         action => [
           t8('Sales Order'),
           submit   => [ '#order_form', { action => "Order/sales_order" } ],
         action => [
           t8('Sales Order'),
           submit   => [ '#order_form', { action => "Order/sales_order" } ],

-          only_if  => (any { $self->type eq $_ } (_sales_quotation_type())),
+          only_if  => (any { $self->type eq $_ } (_sales_quotation_type(), _purchase_order_type())),

           disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
         ],
         action => [
           t8('Purchase Order'),
           submit   => [ '#order_form', { action => "Order/purchase_order" } ],
           disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
         ],
         action => [
           t8('Purchase Order'),
           submit   => [ '#order_form', { action => "Order/purchase_order" } ],

-          only_if  => (any { $self->type eq $_ } (_request_quotation_type())),
+          only_if  => (any { $self->type eq $_ } (_sales_order_type(), _request_quotation_type())),

           disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
         ],
       ], # end of combobox "Workflow"
           disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
         ],
       ], # end of combobox "Workflow"


@@ -1823,6 +1826,8 @@ java script functions
 
 =item * custom shipto address
 
 
 =item * custom shipto address
 

+=item * check for direct delivery (workflow sales order -> purchase order)
+

 =item * language / part translations
 
 =item * access rights
 =item * language / part translations
 
 =item * access rights