Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision b2ee2159

Von Bernd Bleßmann vor 11 Monaten hinzugefügt

  • ID b2ee2159f9dccc2f2686e486e1e0fce189f98de2
  • Vorgänger ad0395fa
  • Nachfolger 7580b7ff

Bericht EK-Rgs/Kreditorenbuchungen: Nach Erfassungsdatum filtern und sortieren

Unterschiede anzeigen:

SL/AP.pm
697 697
    $where .= " AND a.datepaid <= ?";
698 698
    push(@values, trim($form->{datepaidto}));
699 699
  }
700
  if ($form->{insertdatefrom}) {
701
    $where .= " AND a.itime >= ?";
702
    push(@values, trim($form->{insertdatefrom}));
703
  }
704
  if ($form->{insertdateto}) {
705
    $where .= " AND a.itime <= ?";
706
    push(@values, trim($form->{insertdateto}));
707
  }
700 708
  if ($form->{open} || $form->{closed}) {
701 709
    unless ($form->{open} && $form->{closed}) {
702 710
      $where .= " AND a.amount <> a.paid" if ($form->{open});
bin/mozilla/ap.pl
1161 1161
  push @hidden_variables, "l_subtotal", qw(open closed vendor invnumber ordnumber transaction_description notes project_id
1162 1162
                                           transdatefrom transdateto duedatefrom duedateto datepaidfrom datepaidto
1163 1163
                                           parts_partnumber parts_description department_id taxzone_id payment_id
1164
                                           fulltext);
1164
                                           fulltext insertdatefrom insertdateto);
1165 1165

  
1166 1166
  my $href = build_std_url('action=ap_transactions', grep { $form->{$_} } @hidden_variables);
1167 1167

  
......
1196 1196
    'items'                   => { 'text' => $locale->text('Positions'), },
1197 1197
  );
1198 1198

  
1199
  foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit department taxzone)) {
1199
  foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit department taxzone insertdate)) {
1200 1200
    my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
1201 1201
    $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
1202 1202
  }
templates/design40_webpages/ap/search.html
62 62
      <th>[% 'Date Paid' | $T8 %]</th>
63 63
      <td><span class="wi-date">[% L.date_tag('datepaidfrom') %] [% 'Bis' | $T8 %] [% L.date_tag('datepaidto') %]</span></td>
64 64
    </tr>
65
    <tr>
66
      <th>[% 'Insert Date' | $T8 %]</th>
67
      <td><span class="wi-date">[% L.date_tag('insertdatefrom') %] [% 'Bis' | $T8 %] [% L.date_tag('insertdateto') %] </span></td>
68
    </tr>
65 69
    <tr>
66 70
      <th>[% 'Invoice Number' | $T8 %]</th>
67 71
      <td>[% L.input_tag("invnumber", "", class="wi-normal") %]</td>
templates/webpages/ap/search.html
81 81
       [% L.date_tag('datepaidto') %]
82 82
      </td>
83 83
     </tr>
84
     <tr>
85
      <th align=right nowrap>[% 'Insert Date' | $T8 %]</th>
86
      <td>
87
       [% L.date_tag('insertdatefrom') %]
88
       [% 'Bis' | $T8 %]
89
       [% L.date_tag('insertdateto') %]
90
      </td>
91
     </tr>
84 92
   </table>
85 93
    </td>
86 94
    </tr>

Auch abrufbar als: Unified diff