X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/00402ae67e8b4edf686585752a2193da8ecfc169..7ff8f33c49bc503d16ddda159c9848f88b80d5ad:/SL/Controller/Order.pm

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 845115cc2..ace7accba 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -576,6 +576,9 @@ sub action_purchase_order {
 sub action_customer_vendor_changed {
   my ($self) = @_;
 
+  _setup_order_from_cv($self->order);
+  $self->_recalc();
+
   my $cv_method = $self->cv;
 
   if ($self->order->$cv_method->contacts && scalar @{ $self->order->$cv_method->contacts } > 0) {
@@ -590,19 +593,7 @@ sub action_customer_vendor_changed {
     $self->js->hide('#shipto_row');
   }
 
-  $self->order->taxzone_id($self->order->$cv_method->taxzone_id);
-
-  if ($self->order->is_sales) {
-    $self->order->taxincluded(defined($self->order->$cv_method->taxincluded_checked)
-                              ? $self->order->$cv_method->taxincluded_checked
-                              : $::myconfig{taxincluded_checked});
-    $self->js->val('#order_salesman_id', $self->order->$cv_method->salesman_id);
-  }
-
-  $self->order->payment_id($self->order->$cv_method->payment_id);
-  $self->order->delivery_term_id($self->order->$cv_method->delivery_term_id);
-
-  $self->_recalc();
+  $self->js->val( '#order_salesman_id',      $self->order->salesman_id)        if $self->order->is_sales;
 
   $self->js
     ->replaceWith('#order_cp_id',            $self->build_contact_select)
@@ -612,7 +603,7 @@ sub action_customer_vendor_changed {
     ->val(        '#order_taxincluded',      $self->order->taxincluded)
     ->val(        '#order_payment_id',       $self->order->payment_id)
     ->val(        '#order_delivery_term_id', $self->order->delivery_term_id)
-    ->val(        '#order_intnotes',         $self->order->$cv_method->notes)
+    ->val(        '#order_intnotes',         $self->order->intnotes)
     ->focus(      '#order_' . $self->cv . '_id');
 
   $self->_js_redisplay_amounts_and_taxes;
@@ -638,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{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} };
@@ -1132,6 +1123,12 @@ sub _make_order {
   $order ||= SL::DB::Order->new(orderitems => [],
                                 quotation  => (any { $self->type eq $_ } (_sales_quotation_type(), _request_quotation_type())));
 
+  my $cv_id_method = $self->cv . '_id';
+  if (!$::form->{id} && $::form->{$cv_id_method}) {
+    $order->$cv_id_method($::form->{$cv_id_method});
+    _setup_order_from_cv($order);
+  }
+
   my $form_orderitems               = delete $::form->{order}->{orderitems};
   my $form_periodic_invoices_config = delete $::form->{order}->{periodic_invoices_config};
 
@@ -1251,6 +1248,22 @@ sub _new_item {
   return $item;
 }
 
+sub _setup_order_from_cv {
+  my ($order) = @_;
+
+  $order->$_($order->customervendor->$_) for (qw(taxzone_id payment_id delivery_term_id));
+
+  $order->intnotes($order->customervendor->notes);
+
+  if ($order->is_sales) {
+    $order->salesman_id($order->customer->salesman_id);
+    $order->taxincluded(defined($order->customer->taxincluded_checked)
+                        ? $order->customer->taxincluded_checked
+                        : $::myconfig{taxincluded_checked});
+  }
+
+}
+
 # recalculate prices and taxes
 #
 # Using the PriceTaxCalculator. Store linetotals in the item objects.
@@ -1354,14 +1367,22 @@ 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()
+                       : $::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->{converted_from_oe_id} = delete $::form->{id};
 
+  # set item ids to new fake id, to identify them as new items
+  foreach my $item (@{$self->order->items_sorted}) {
+    $item->{new_fake_id} = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
+  }
+
   # 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();
@@ -1480,13 +1501,13 @@ sub _setup_edit_action_bar {
         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" } ],
-          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"
@@ -1805,6 +1826,8 @@ java script functions
 
 =item * custom shipto address
 
+=item * check for direct delivery (workflow sales order -> purchase order)
+
 =item * language / part translations
 
 =item * access rights