]> wagnertech.de Git - mfinanz.git/commitdiff
projects / mfinanz.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ec5c731)
Lagerbestand auch für andere Daten als heute anzeigbar.
authorSven Schöling <s.schoeling@linet-services.de>
Wed, 11 Jan 2012 10:33:31 +0000 (11:33 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 11 Jan 2012 10:33:50 +0000 (11:33 +0100)
SL/WH.pm patch | blob | history
bin/mozilla/wh.pl patch | blob | history
locale/de/all patch | blob | history
templates/webpages/wh/report_filter.html patch | blob | history

diff --git a/SL/WH.pm b/SL/WH.pm
index 352ca1af889b3ecd250d98ff2f6de0bedf632170..f760f5e9b36ad7fb9b4abc465fb9141394bb2f90 100644 (file)
--- a/SL/WH.pm
+++ b/SL/WH.pm
@@ -620,6 +620,11 @@ sub get_warehouse_report {
     push @filter_vars, '%' . $filter{ean} . '%';
   }
 
     push @filter_vars, '%' . $filter{ean} . '%';
   }
 
+  if ($filter{date}) {
+    push @filter_ary, "i.itime <= ?";
+    push @filter_vars, $filter{date};
+  }
+
   # prepare qty comparison for later filtering
   my ($f_qty_op, $f_qty, $f_qty_base_unit);
 
   # prepare qty comparison for later filtering
   my ($f_qty_op, $f_qty, $f_qty_base_unit);
 
diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl
index 2b49ba00cf6ab806727d121918577a399f0d9042..62be1d1d73e7689dc7ba048318fa5f40c7b10e0b 100644 (file)
--- a/bin/mozilla/wh.pl
+++ b/bin/mozilla/wh.pl
@@ -824,7 +824,7 @@ sub generate_report {
   my @columns = qw(warehousedescription bindescription partnumber partdescription chargenumber bestbefore qty stock_value);
 
   # filter stuff
   my @columns = qw(warehousedescription bindescription partnumber partdescription chargenumber bestbefore qty stock_value);
 
   # filter stuff
-  map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber bestbefore);
+  map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber bestbefore date);
 
   $filter{qty_op} = WH->convert_qty_op($form->{qty_op});
   if ($filter{qty_op}) {
 
   $filter{qty_op} = WH->convert_qty_op($form->{qty_op});
   if ($filter{qty_op}) {
diff --git a/locale/de/all b/locale/de/all
index 6e5013b2f59a8b982be2f0da479a0994f762850f..9e3ba9eae53e63f108a5e8f670cdfc4a8d2459ba 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1407,7 +1407,7 @@ $self->{texts} = {
   'Proforma Invoice'            => 'Proformarechnung',
   'Program'                     => 'Programm',
   'Project'                     => 'Projekt',
   'Proforma Invoice'            => 'Proformarechnung',
   'Program'                     => 'Programm',
   'Project'                     => 'Projekt',
-  'Project Description'         => '',
+  'Project Description'         => 'Projektbeschreibung',
   'Project Number'              => 'Projektnummer',
   'Project Number missing!'     => 'Projektnummer fehlt!',
   'Project Numbers'             => 'Projektnummern',
   'Project Number'              => 'Projektnummer',
   'Project Number missing!'     => 'Projektnummer fehlt!',
   'Project Numbers'             => 'Projektnummern',
@@ -1655,6 +1655,7 @@ $self->{texts} = {
   'Step 3 of 3: Default units'  => 'Schritt 3 von 3: Standardeinheiten',
   'Steuersatz'                  => 'Steuersatz',
   'Stock'                       => 'Einlagern',
   'Step 3 of 3: Default units'  => 'Schritt 3 von 3: Standardeinheiten',
   'Steuersatz'                  => 'Steuersatz',
   'Stock'                       => 'Einlagern',
+  'Stock Qty for Date'          => 'Lagerbestand am',
   'Stock value'                 => 'Bestandswert',
   'Stocked Qty'                 => 'Lagermenge',
   'Storno'                      => 'Storno',
   'Stock value'                 => 'Bestandswert',
   'Stocked Qty'                 => 'Lagermenge',
   'Storno'                      => 'Storno',
diff --git a/templates/webpages/wh/report_filter.html b/templates/webpages/wh/report_filter.html
index affe4c265117d8c0630725c6e6cda0ff0947e514..a5cbe12d864daffe0e96b91e48c4d30d2fde6c80 100644 (file)
--- a/templates/webpages/wh/report_filter.html
+++ b/templates/webpages/wh/report_filter.html
@@ -1,4 +1,5 @@
 [%- USE T8 %]
 [%- USE T8 %]
+[%- USE L %]
 [% USE HTML %][% USE JavaScript %]<body onload="on_load();">
 
  <script type="text/javascript">
 [% USE HTML %][% USE JavaScript %]<body onload="on_load();">
 
  <script type="text/javascript">
@@ -129,6 +130,10 @@
          </select>
         </td>
        </tr>
          </select>
         </td>
        </tr>
+        <th align="right" nowrap>[% 'Stock Qty for Date' | $T8 %]:</th>
+        <td>[% L.date_tag('date') %]</td>
+       <tr>
+       </tr>
       </table>
      </td>
     </tr>
       </table>
      </td>
     </tr>
Unnamed repository; edit this file 'description' to name the repository.