From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 3 Sep 2009 09:43:17 +0000 (+0200)
Subject: Bugfix: Bei Lieferschein->Rechnung Konvertierung werden die Originallieferdaten übern... 
X-Git-Tag: release-2.6.1beta1~306
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=d370f2a1cbf494a16bf2d575f1310d9917193f5d;p=kivitendo-erp.git

Bugfix: Bei Lieferschein->Rechnung Konvertierung werden die Originallieferdaten übernommen in die Artikellieferdaten der Rechnung.

Fix für Bug 1125.
---

diff --git a/SL/DO.pm b/SL/DO.pm
index f2675d3e9..48baa7a87 100644
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -660,7 +660,7 @@ sub retrieve {
          doi.reqdate, doi.project_id, doi.serialnumber, doi.lastcost,
          doi.ordnumber, doi.transdate, doi.cusordnumber, doi.longdescription,
          doi.price_factor_id, doi.price_factor, doi.marge_price_factor,
-         pr.projectnumber,
+         pr.projectnumber, dord.transdate AS dord_transdate,
          pg.partsgroup
        FROM delivery_order_items doi
        JOIN parts p ON (doi.parts_id = p.id)
diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index a2eda3f03..ebaffc640 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -768,6 +768,7 @@ sub invoice_multi {
   $form->{rowcount} = 0;
   foreach my $ref (@{ $form->{form_details} }) {
     $form->{rowcount}++;
+    $ref->{reqdate} ||= $ref->{dord_transdate}; # copy transdates into each invoice row
     map { $form->{"${_}_$form->{rowcount}"} = $ref->{$_} } keys %{ $ref };
     map { $form->{"${_}_$form->{rowcount}"} = $form->format_amount(\%myconfig, $ref->{$_}) } qw(qty sellprice discount lastcost);
   }