Bugfix: Bei Lieferschein->Rechnung Konvertierung werden die Originallieferdaten übern...

Fix für Bug 1125.

diff --git a/SL/DO.pm b/SL/DO.pm
index f2675d3e9752c60ca9300e0a0b72f158798bd7a7..48baa7a87c7576eb2ab99fae9a98238ee6cd20f2 100644 (file)
--- 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,
          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)
          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 a2eda3f0364490e39773695f6a5c37c7f160be11..ebaffc640ff0d8eca4df1224e19636e856b4051e 100644 (file)
--- 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}++;
   $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);
   }
     map { $form->{"${_}_$form->{rowcount}"} = $ref->{$_} } keys %{ $ref };
     map { $form->{"${_}_$form->{rowcount}"} = $form->format_amount(\%myconfig, $ref->{$_}) } qw(qty sellprice discount lastcost);
   }