From d370f2a1cbf494a16bf2d575f1310d9917193f5d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sven=20Sch=C3=B6ling?= <s.schoeling@linet-services.de>
Date: Thu, 3 Sep 2009 11:43:17 +0200
Subject: [PATCH] =?utf8?q?Bugfix:=20Bei=20Lieferschein->Rechnung=20Konvert?=
 =?utf8?q?ierung=20werden=20die=20Originallieferdaten=20=C3=BCbernommen=20?=
 =?utf8?q?in=20die=20Artikellieferdaten=20der=20Rechnung.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Fix für Bug 1125.
---
 SL/DO.pm          | 2 +-
 bin/mozilla/do.pl | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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);
   }
-- 
2.20.1