From 4d9fde96e71e940ad0b6635dc4d70dde6d2a4c74 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Thu, 4 Mar 2010 14:10:43 +0100 Subject: [PATCH] Belegdatum in Warensuche MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix für Bug 1218 --- bin/mozilla/ic.pl | 17 ++++++++--------- doc/changelog | 2 +- locale/de/all | 1 + locale/de/ic | 1 + templates/webpages/ic/search_de.html | 4 ++++ templates/webpages/ic/search_master.html | 4 ++++ 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index add189593..b29daa63c 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -1124,12 +1124,7 @@ sub generate_report { if ($form->{l_linetotal}) { $form->{l_onhand} = "Y"; $form->{l_linetotalsellprice} = "Y" if $form->{l_sellprice}; - if ($form->{l_lastcost}) { - $form->{l_linetotallastcost} = "Y"; - if (($form->{searchitems} eq 'assembly') && !$form->{bom}) { - $form->{l_linetotallastcost} = ""; - } - } + $form->{l_linetotallastcost} = $form->{searchitems} eq 'assembly' && !$form->{bom} ? "" : 'Y' if $form->{l_lastcost}; $form->{l_linetotallistprice} = "Y" if $form->{l_listprice}; } @@ -1156,9 +1151,12 @@ sub generate_report { IC->all_parts(\%myconfig, \%$form); - my @columns = - qw(partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost - priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal deliverydate); + my @columns = qw( + partnumber description partsgroup bin onhand rop unit listprice + linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost + priceupdate weight image drawing microfiche invnumber ordnumber quonumber + transdate name serialnumber soldtotal deliverydate + ); my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs }; my @searchable_custom_variables = grep { $_->{searchable} } @{ $cvar_configs }; @@ -1190,6 +1188,7 @@ sub generate_report { 'sellprice' => { 'text' => $locale->text('Sell Price'), }, 'serialnumber' => { 'text' => $locale->text('Serial Number'), }, 'soldtotal' => { 'text' => $locale->text('soldtotal'), }, + 'transdate' => { 'text' => $locale->text('Transdate'), }, 'unit' => { 'text' => $locale->text('Unit'), }, 'weight' => { 'text' => $locale->text('Weight'), }, %column_defs_cvars, diff --git a/doc/changelog b/doc/changelog index debbd22f8..86e285362 100644 --- a/doc/changelog +++ b/doc/changelog @@ -163,7 +163,7 @@ 1044 1046 1051 1055 1057 1058 1072 1073 1077 1079 1081 1082 1095 1098 1100 1101 1108 1110 1118 1125 1127 1130 1133 1135 1136 1138 1144 1146 1147 1150 1151 1155 1164 1173 1177 1186 1188 1190 1191 1195 - 1197 1198 1199 1200 1201 1209 1213 1250 1286 1289 + 1197 1198 1199 1200 1201 1209 1213 1248 1250 1286 1289 2009-06-02 - Version 2.6.0 diff --git a/locale/de/all b/locale/de/all index 78cd7268c..ea3162dc0 100644 --- a/locale/de/all +++ b/locale/de/all @@ -1705,6 +1705,7 @@ $self->{texts} = { 'Transaction has been split on both the credit and the debit side' => 'Sowohl auf der Soll- als auch auf der Haben-Seite gesplittete Buchung', 'Transaction posted!' => 'Buchung verbucht!', 'Transactions, AR transactions, AP transactions' => 'Dialogbuchen, Debitorenrechnungen, Kreditorenrechnungen', + 'Transdate' => 'Belegdatum', 'Transfer' => 'Umlagern', 'Transfer Quantity' => 'Umlagermenge', 'Transfer To Stock' => 'Lagereingang', diff --git a/locale/de/ic b/locale/de/ic index 4bfb78a07..7fa3437ad 100644 --- a/locale/de/ic +++ b/locale/de/ic @@ -287,6 +287,7 @@ $self->{texts} = { 'Top 100' => 'Top 100', 'Top 100 hinzufuegen' => 'Top 100 hinzufügen', 'Transactions, AR transactions, AP transactions' => 'Dialogbuchen, Debitorenrechnungen, Kreditorenrechnungen', + 'Transdate' => 'Belegdatum', 'Transfer To Stock' => 'Lagereingang', 'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.', 'Unit' => 'Einheit', diff --git a/templates/webpages/ic/search_de.html b/templates/webpages/ic/search_de.html index 3b1da9654..543993450 100644 --- a/templates/webpages/ic/search_de.html +++ b/templates/webpages/ic/search_de.html @@ -241,6 +241,10 @@ + + + + diff --git a/templates/webpages/ic/search_master.html b/templates/webpages/ic/search_master.html index cdd66604e..1aa7cca2c 100644 --- a/templates/webpages/ic/search_master.html +++ b/templates/webpages/ic/search_master.html @@ -241,6 +241,10 @@ + + + + -- 2.20.1