From bf2f7ae280879262754499503fb086332a99e3f2 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 24 Jan 2013 16:51:44 +0100 Subject: [PATCH] Finanzcontrollingbericht: Spalte "Projekttyp" anzeigen --- SL/Controller/FinancialControllingReport.pm | 4 +++- locale/de/all | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SL/Controller/FinancialControllingReport.pm b/SL/Controller/FinancialControllingReport.pm index e587f2dd5..d4492c1d9 100644 --- a/SL/Controller/FinancialControllingReport.pm +++ b/SL/Controller/FinancialControllingReport.pm @@ -77,7 +77,7 @@ sub prepare_report { my $report = SL::ReportGenerator->new(\%::myconfig, $::form); $self->{report} = $report; - my @columns = qw(customer globalprojectnumber ordnumber netamount delivered_amount delivered_amount_p billed_amount billed_amount_p paid_amount paid_amount_p + my @columns = qw(customer globalprojectnumber project_type ordnumber netamount delivered_amount delivered_amount_p billed_amount billed_amount_p paid_amount paid_amount_p billable_amount billable_amount_p other_amount); my @sortable = qw(ordnumber transdate customer netamount globalprojectnumber); $self->{number_columns} = [ qw(netamount billed_amount billed_amount_p delivered_amount delivered_amount_p paid_amount paid_amount_p other_amount billable_amount billable_amount_p) ]; @@ -97,6 +97,8 @@ sub prepare_report { customer => { sub => sub { $_[0]->customer->name }, obj_link => sub { $self->link_to($_[0]->customer) } }, globalprojectnumber => { sub => sub { $_[0]->globalproject_id ? $_[0]->globalproject->projectnumber : '' } }, + project_type => { text => $::locale->text('Project type'), + sub => sub { $_[0]->globalproject_id ? $_[0]->globalproject->type : '' } }, ); map { $column_defs{$_}->{text} ||= $::locale->text( $self->get_sort_spec->{$_}->{title} ) } keys %column_defs; diff --git a/locale/de/all b/locale/de/all index 7c5f52a0b..dff08c875 100755 --- a/locale/de/all +++ b/locale/de/all @@ -309,7 +309,6 @@ $self->{texts} = { 'Billing/shipping address (country)' => 'Rechnungsadresse (Land)', 'Billing/shipping address (street)' => 'Rechnungsadresse (Straße)', 'Billing/shipping address (zipcode)' => 'Rechnungsadresse (PLZ)', - 'Bills receivable' => 'Offene Forderungen', 'Bin' => 'Lagerplatz', 'Bin From' => 'Quelllagerplatz', 'Bin List' => 'Lagerliste', @@ -1663,6 +1662,7 @@ $self->{texts} = { 'Project Number' => 'Projektnummer', 'Project Numbers' => 'Projektnummern', 'Project Transactions' => 'Projektbuchungen', + 'Project type' => 'Projekttyp', 'Projects' => 'Projekte', 'Projecttransactions' => 'Projektbuchungen', 'Prozentual/Absolut' => 'Prozentual/Absolut', -- 2.20.1