Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 813b99ca

Von Jan Büren vor mehr als 15 Jahren hinzugefügt

  • ID 813b99ca601a5279d963549caeccf386ff8b85d7
  • Vorgänger 469cbdd7
  • Nachfolger 27174cb6

Berichte->Aufträge nach Lieferdatum auswählen

Zusätzlich zu dem Auftragsdatum kann in der Berichtsmaske für Aufträge nun auch das Lieferdatum eingegrenzt werden.

Unterschiede anzeigen:

SL/OE.pm
144 144
    push(@values, conv_date($form->{transdateto}));
145 145
  }
146 146

  
147
  if($form->{reqdatefrom}) {
148
    $query .= qq| AND o.reqdate >= ?|;
149
    push(@values, conv_date($form->{reqdatefrom}));
150
  }
151

  
152
  if($form->{reqdateto}) {
153
    $query .= qq| AND o.reqdate <= ?|;
154
    push(@values, conv_date($form->{reqdateto}));
155
  }
156

  
147 157
  if ($form->{transaction_description}) {
148 158
    $query .= qq| AND o.transaction_description ILIKE ?|;
149 159
    push(@values, '%' . $form->{transaction_description} . '%');
bin/mozilla/oe.pl
660 660
     <input type=button name=transdateto name=transdateto id="trigger4" value=|
661 661
    . $locale->text('button') . qq|></td>
662 662
   |;
663

  
663
  $button3 = qq|
664
     <td><input name=reqdatefrom id=reqdatefrom size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
665
     <input type=button name=reqdatefrom id="trigger5" value=|
666
    . $locale->text('button') . qq|></td>
667
    |;
668
  $button4 = qq|
669
     <td><input name=reqdateto id=reqdateto size=11 title="$myconfig{dateformat}" onBlur=\"check_right_date_format(this)\">
670
     <input type=button name=reqdateto name=reqdateto id="trigger6" value=|
671
    . $locale->text('button') . qq|></td>
672
   |;
673
 
664 674
  #write Trigger
665 675
  $jsscript =
666
    Form->write_trigger(\%myconfig, "2", "transdatefrom", "BR", "trigger3",
667
                        "transdateto", "BL", "trigger4");
676
   Form->write_trigger(\%myconfig, "4", "transdatefrom", "BR", "trigger3",
677
                       "transdateto", "BL", "trigger4",
678
                       "reqdatefrom", "BR", "trigger5", "reqdateto", "BL", "trigger6");
668 679

  
669 680
  my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
670 681

  
......
766 777
          <td colspan="3">$projectnumber</td>
767 778
        </tr>
768 779
        <tr>
769
          <th align=right>| . $locale->text('From') . qq|</th> $button1
780
          <th align=right>| . $locale->text('Order Date') . " " . $locale->text('From') . qq|</th> $button1
770 781
          <th align=right>| . $locale->text('Bis') . qq|</th> $button2
771 782
        </tr>
772 783
        <input type=hidden name=sort value=transdate>
784
        <tr>
785
          <th align=right>| . $locale->text('Delivery Date') . " " . $locale->text('From') . qq|</th> $button3
786
          <th align=right>| . $locale->text('Bis') . qq|</th> $button4
787
        </tr>
788
        <input type=hidden name=sort value=reqdate>
773 789
        <tr>
774 790
          <th align=right>| . $locale->text('Include in Report') . qq|</th>
775 791
          <td colspan=5>
......
915 931

  
916 932
  my @hidden_variables = map { "l_${_}" } @columns;
917 933
  push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber
918
                                                        transaction_description transdatefrom transdateto type vc employee_id salesman_id);
934
                                                        transaction_description transdatefrom transdateto type vc employee_id salesman_id
935
                                                        reqdatefrom reqdateto);
919 936

  
920 937
  my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
921 938

  
......
967 984
  push @options, $locale->text('Order Number')            . " : $form->{ordnumber}"                       if $form->{ordnumber};
968 985
  push @options, $locale->text('Notes')                   . " : $form->{notes}"                           if $form->{notes};
969 986
  push @options, $locale->text('Transaction description') . " : $form->{transaction_description}"         if $form->{transaction_description};
970
  push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1)       if $form->{transdatefrom};
971
  push @options, $locale->text('Bis')  . " " . $locale->date(\%myconfig, $form->{transdateto},   1)       if $form->{transdateto};
987
  if ( $form->{transdatefrom} or $form->{transdateto} ) {
988
    push @options, $locale->text('Order Date');
989
    push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1)     if $form->{transdatefrom};
990
    push @options, $locale->text('Bis')  . " " . $locale->date(\%myconfig, $form->{transdateto},   1)     if $form->{transdateto};
991
  };
992
  if ( $form->{reqdatefrom} or $form->{reqdateto} ) {
993
    push @options, $locale->text('Delivery Date');
994
    push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{reqdatefrom}, 1)       if $form->{reqdatefrom};
995
    push @options, $locale->text('Bis')  . " " . $locale->date(\%myconfig, $form->{reqdateto},   1)       if $form->{reqdateto};
996
  };
972 997
  push @options, $locale->text('Open')                                                                    if $form->{open};
973 998
  push @options, $locale->text('Closed')                                                                  if $form->{closed};
974 999
  push @options, $locale->text('Delivered')                                                               if $form->{delivered};

Auch abrufbar als: Unified diff