Verkauf->Berichte->Lieferscheine: Lieferdatum mit anzeigen lassen.

diff --git a/SL/DO.pm b/SL/DO.pm
index 15e16cc16c44a96858cfdd5667ae19f1532fbb9f..8d71fbcda0dfcbc7578f9dbbfb33a9d5e918a275 100644 (file)
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -61,7 +61,8 @@ sub transactions {
   my $vc = $form->{vc} eq "customer" ? "customer" : "vendor";
 
   my $query =
   my $vc = $form->{vc} eq "customer" ? "customer" : "vendor";
 
   my $query =

-    qq|SELECT dord.id, dord.donumber, dord.ordnumber, dord.transdate,
+    qq|SELECT dord.id, dord.donumber, dord.ordnumber,
+         dord.transdate, dord.reqdate,

          ct.${vc}number, ct.name, dord.${vc}_id, dord.globalproject_id,
          dord.closed, dord.delivered, dord.shippingpoint, dord.shipvia,
          dord.transaction_description,
          ct.${vc}number, ct.name, dord.${vc}_id, dord.globalproject_id,
          dord.closed, dord.delivered, dord.shippingpoint, dord.shipvia,
          dord.transaction_description,


@@ -143,6 +144,7 @@ sub transactions {
 
   my %allowed_sort_columns = (
     "transdate"               => "dord.transdate",
 
   my %allowed_sort_columns = (
     "transdate"               => "dord.transdate",

+    "reqdate"                 => "dord.reqdate",

     "id"                      => "dord.id",
     "donumber"                => "dord.donumber",
     "ordnumber"               => "dord.ordnumber",
     "id"                      => "dord.id",
     "donumber"                => "dord.donumber",
     "ordnumber"               => "dord.ordnumber",

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 576564fe78f22f611099cacf1b61bc75ad78b964..a155e8aacbfb3de908e69b7ca9cc07748c50e78b 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -489,7 +489,7 @@ sub orders {
   $form->{rowcount} = scalar @{ $form->{DO} };
 
   my @columns = qw(
   $form->{rowcount} = scalar @{ $form->{DO} };
 
   my @columns = qw(

-    ids                     transdate
+    ids                     transdate               reqdate

     id                      donumber
     ordnumber               customernumber
     name                    employee  salesman
     id                      donumber
     ordnumber               customernumber
     name                    employee  salesman


@@ -516,6 +516,7 @@ sub orders {
   my %column_defs = (
     'ids'                     => { 'text' => '', },
     'transdate'               => { 'text' => $locale->text('Date'), },
   my %column_defs = (
     'ids'                     => { 'text' => '', },
     'transdate'               => { 'text' => $locale->text('Date'), },

+    'reqdate'                 => { 'text' => $locale->text('Reqdate'), },

     'id'                      => { 'text' => $locale->text('ID'), },
     'donumber'                => { 'text' => $locale->text('Delivery Order'), },
     'ordnumber'               => { 'text' => $locale->text('Order'), },
     'id'                      => { 'text' => $locale->text('ID'), },
     'donumber'                => { 'text' => $locale->text('Delivery Order'), },
     'ordnumber'               => { 'text' => $locale->text('Order'), },


@@ -531,7 +532,7 @@ sub orders {
     'department'              => { 'text' => $locale->text('Department'), },
   );
 
     'department'              => { 'text' => $locale->text('Department'), },
   );
 

-  foreach my $name (qw(id transdate donumber ordnumber name employee salesman shipvia transaction_description department)) {
+  foreach my $name (qw(id transdate reqdate donumber ordnumber name employee salesman shipvia transaction_description department)) {

     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
     $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
   }
     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
     $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
   }

diff --git a/templates/webpages/do/search.html b/templates/webpages/do/search.html
index 6e1bedc15a5211633f0ae5d611a26add4793fa3a..5bc2a192b771c766a56ca43ab81b4c3443f748cc 100644 (file)
--- a/templates/webpages/do/search.html
+++ b/templates/webpages/do/search.html
@@ -163,7 +163,13 @@
          <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
          <label for="l_transdate">[% 'Date' | $T8 %]</label>
         </td>
          <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
          <label for="l_transdate">[% 'Date' | $T8 %]</label>
         </td>

+        <td>
+         <input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked>
+         <label for="l_reqdate">[% 'Reqdate' | $T8 %]</label>
+        </td>
+       </tr>

 
 

+       <tr>

         <td>
          <input name="l_name" id="l_name" class="checkbox" type="checkbox" value="Y" checked>
          <label for="l_name">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</label>
         <td>
          <input name="l_name" id="l_name" class="checkbox" type="checkbox" value="Y" checked>
          <label for="l_name">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</label>