From 438c47c01070704b143a79c9c0ea7a1512736eff Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Tue, 13 Mar 2012 19:59:20 +0100 Subject: [PATCH] mergefehler: orddate ist hier transdate --- SL/Controller/SellPriceInformation.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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) }}, -- 2.20.1