From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 13 Mar 2012 18:59:20 +0000 (+0100)
Subject: mergefehler: orddate ist hier transdate
X-Git-Tag: release-3.0.0beta1~343^2~20
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=438c47c01070704b143a79c9c0ea7a1512736eff;p=kivitendo-erp.git

mergefehler: orddate ist hier transdate
---

diff --git a/SL/Controller/SellPriceInformation.pm b/SL/Controller/SellPriceInformation.pm
index 8255e4140..da82660b0 100644
--- a/SL/Controller/SellPriceInformation.pm
+++ b/SL/Controller/SellPriceInformation.pm
@@ -71,13 +71,13 @@ sub prepare_report {
   my $report = SL::ReportGenerator->new(\%::myconfig, $::form);
   $self->{report} = $report;
 
-  my @columns  = qw(orddate ordnumber customer ship qty sellprice discount amount);
-  my @visible  = qw(orddate ordnumber customer ship qty sellprice discount amount);
-  my @sortable = qw(orddate ordnumber customer          sellprice discount       );
+  my @columns  = qw(transdate ordnumber customer ship qty sellprice discount amount);
+  my @visible  = qw(transdate ordnumber customer ship qty sellprice discount amount);
+  my @sortable = qw(transdate ordnumber customer          sellprice discount       );
 
   my %column_defs = (
-    orddate                 => { text => $::locale->text('Date'),
-                                  sub => sub { $_[0]->order->orddate_as_date }},
+    transdate               => { text => $::locale->text('Date'),
+                                  sub => sub { $_[0]->order->transdate_as_date }},
     ordnumber               => { text => $::locale->text('Number'),
                                   sub => sub { $_[0]->order->ordnumber },
                              obj_link => sub { $self->link_to($_[0]->order) }},