From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 28 Oct 2015 14:57:45 +0000 (+0100)
Subject: Lieferschein: Übernahme einiger Felder aus Auftrag gefixt
X-Git-Tag: release-3.4.1~615
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c5b0750518740054929b551285747bf9524b6803;p=kivitendo-erp.git

Lieferschein: Übernahme einiger Felder aus Auftrag gefixt

Betroffen waren das Auftragsdatum, Angebotsnummer, BearbeiterIn,
Steuerzone. Ist in 464f44a kaputt gegangen.
---

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index cf210ce51..21384f4ba 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -841,6 +841,15 @@ sub invoice {
   my $currency = $form->{currency};
   invoice_links();
 
+  if ($form->{ordnumber}) {
+    require SL::DB::Order;
+    if (my $order = SL::DB::Manager::Order->find_by(ordnumber => $form->{ordnumber})) {
+      $order->load;
+      $form->{orddate} = $order->transdate_as_date;
+      $form->{$_}      = $order->$_ for qw(payment_id salesman_id taxzone_id quonumber);
+    }
+  }
+
   $form->{currency}     = $currency;
   $form->{exchangerate} = "";
   $form->{forex}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, $buysell);
diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
index 1fe72248d..52b0e7033 100644
--- a/templates/webpages/do/form_header.html
+++ b/templates/webpages/do/form_header.html
@@ -84,7 +84,6 @@
   <input type="hidden" name="max_dunning_level" value="[% HTML.escape(max_dunning_level) %]">
   <input type="hidden" name="media" value="[% HTML.escape(media) %]">
   <input type="hidden" name="message" value="[% HTML.escape(message) %]">
-  <input type="hidden" name="payment_id" value="[% HTML.escape(payment_id) %]">
   <input type="hidden" name="printed" value="[% HTML.escape(printed) %]">
   <input type="hidden" name="proforma" value="[% HTML.escape(proforma) %]">
   <input type="hidden" name="queued" value="[% HTML.escape(queued) %]">