From: Sven Schöling <s.schoeling@linet-services.de>
Date: Fri, 2 Feb 2007 15:55:22 +0000 (+0000)
Subject: Fix zu Bug 455, jetzt werden einfach beide Daten angezeigt.
X-Git-Tag: release-2.4.2~160
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=5ca651f0b08f68c1f977868204b3629217785157;p=kivitendo-erp.git

Fix zu Bug 455, jetzt werden einfach beide Daten angezeigt.
---

diff --git a/SL/GL.pm b/SL/GL.pm
index 2b9a67a40..4dbd703c7 100644
--- a/SL/GL.pm
+++ b/SL/GL.pm
@@ -487,11 +487,13 @@ sub all_transactions {
           $ref->{debit}{$k}        = $ref->{amount} * -1;
           $ref->{debit_accno}{$k}  = $ref->{accno};
           $ref->{debit_taxkey}{$k} = $ref->{taxkey};
+          $ref->{transdate}{$k}    = $ref->{transdate};
 
         } else {
           $ref->{credit}{$l}        = $ref->{amount} * 1;
           $ref->{credit_accno}{$l}  = $ref->{accno};
           $ref->{credit_taxkey}{$l} = $ref->{taxkey};
+          $ref->{transdate}{$l}     = $ref->{transdate};
 
 
         }
@@ -547,6 +549,7 @@ sub all_transactions {
           $ref->{debit}{$k}        = $ref2->{amount} * - 1;
           $ref->{debit_accno}{$k}  = $ref2->{accno};
           $ref->{debit_taxkey}{$k} = $ref2->{taxkey};
+          $ref->{transdate}{$k}    = $ref2->{transdate};
         } else {
           if ($ref->{credit_accno}{$l} ne "") {
             $l++;
@@ -554,6 +557,7 @@ sub all_transactions {
           $ref->{credit}{$l}        = $ref2->{amount};
           $ref->{credit_accno}{$l}  = $ref2->{accno};
           $ref->{credit_taxkey}{$l} = $ref2->{taxkey};
+          $ref->{transdate}{$l}     = $ref2->{transdate};
         }
       }
     }
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 57c1b09ed..2ffccd39b 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -750,16 +750,23 @@ sub generate_report {
       }
     }
 
+    $transdate = "";
+    foreach $key (sort keys(%{ $ref->{transdate} })) {
+      if ($key == 0) {
+        $transdate = "$ref->{transdate}{$key}";
+      } else {
+        $transdate .= "<br>$ref->{transdate}{$key}";
+      }
+    }
+
     #    $ref->{debit} = $form->format_amount(\%myconfig, $ref->{debit}, 2, "&nbsp;");
     #    $ref->{credit} = $form->format_amount(\%myconfig, $ref->{credit}, 2, "&nbsp;");
 
     $column_data{id}        = "<td align=right>&nbsp;$ref->{id}&nbsp;</td>";
-    $column_data{transdate} =
-      "<td align=center>&nbsp;$ref->{transdate}&nbsp;</td>";
+    $column_data{transdate}    = "<td align=center>$transdate</td>";
     $column_data{reference} =
       "<td align=center><a href=$ref->{module}.pl?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference}</td>";
-    $column_data{description} =
-      "<td align=center>$ref->{description}&nbsp;</td>";
+    $column_data{description}  = "<td align=center>$ref->{description}&nbsp;</td>";
     $column_data{source}       = "<td align=center>$ref->{source}&nbsp;</td>";
     $column_data{notes}        = "<td align=center>$ref->{notes}&nbsp;</td>";
     $column_data{debit}        = "<td align=right>$debit</td>";