From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 4 Mar 2010 13:10:43 +0000 (+0100)
Subject: Belegdatum in Warensuche
X-Git-Tag: release-2.6.1beta1~33^2~4^2~1
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=4d9fde96e71e940ad0b6635dc4d70dde6d2a4c74;p=kivitendo-erp.git

Belegdatum in Warensuche

Fix für Bug 1218
---

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 @@
          </tr>
 
          <tr>
+          <td>
+           <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y">
+           <label for="l_transdate">Belegdatum</label>
+          </td>
           <td>
            <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
            <label for="l_subtotal">Zwischensumme</label>
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 @@
          </tr>
 
          <tr>
+          <td>
+           <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y">
+           <label for="l_transdate"><translate>Transdate</translate></label>
+          </td>
           <td>
            <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
            <label for="l_subtotal"><translate>Subtotal</translate></label>