Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 43b9f08f

Von Bernd Bleßmann vor mehr als 2 Jahren hinzugefügt

  • ID 43b9f08f85b5544623b0c34716f689cdfa92d245
  • Vorgänger 447b0bbe
  • Nachfolger 0176fba8

VK/EK-Rechnung -> Suche. Filter nach Zahlungsdatum

Unterschiede anzeigen:

SL/AP.pm
658 658
    $where .= " AND a.duedate <= ?";
659 659
    push(@values, trim($form->{duedateto}));
660 660
  }
661
  if ($form->{datepaidfrom}) {
662
    $where .= " AND a.datepaid >= ?";
663
    push(@values, trim($form->{datepaidfrom}));
664
  }
665
  if ($form->{datepaidto}) {
666
    $where .= " AND a.datepaid <= ?";
667
    push(@values, trim($form->{datepaidto}));
668
  }
661 669
  if ($form->{open} || $form->{closed}) {
662 670
    unless ($form->{open} && $form->{closed}) {
663 671
      $where .= " AND a.amount <> a.paid" if ($form->{open});
SL/AR.pm
611 611
    $where .= " AND a.duedate <= ?";
612 612
    push(@values, trim($form->{duedateto}));
613 613
  }
614
  if ($form->{datepaidfrom}) {
615
    $where .= " AND a.datepaid >= ?";
616
    push(@values, trim($form->{datepaidfrom}));
617
  }
618
  if ($form->{datepaidto}) {
619
    $where .= " AND a.datepaid <= ?";
620
    push(@values, trim($form->{datepaidto}));
621
  }
614 622
  if ($form->{open} || $form->{closed}) {
615 623
    unless ($form->{open} && $form->{closed}) {
616 624
      $where .= " AND a.amount <> a.paid" if ($form->{open});
bin/mozilla/ap.pl
1049 1049

  
1050 1050
  my @hidden_variables = map { "l_${_}" } @columns;
1051 1051
  push @hidden_variables, "l_subtotal", qw(open closed vendor invnumber ordnumber transaction_description notes project_id
1052
                                           transdatefrom transdateto duedatefrom duedateto
1052
                                           transdatefrom transdateto duedatefrom duedateto datepaidfrom datepaidto
1053 1053
                                           parts_partnumber parts_description department_id taxzone_id);
1054 1054

  
1055 1055
  my $href = build_std_url('action=ap_transactions', grep { $form->{$_} } @hidden_variables);
......
1119 1119
  push @options, $locale->text('Part Number')             . " : $form->{parts_partnumber}"               if $form->{parts_partnumber};
1120 1120
  push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1)      if ($form->{transdatefrom});
1121 1121
  push @options, $locale->text('Bis')  . " " . $locale->date(\%myconfig, $form->{transdateto},   1)      if ($form->{transdateto});
1122
  push @options, $locale->text('Due Date') . " " . $locale->text('from') . " " . $locale->date(\%myconfig, $form->{duedatefrom}, 1)      if ($form->{duedatefrom});
1123
  push @options, $locale->text('Due Date') . " " . $locale->text('to')   . " " . $locale->date(\%myconfig, $form->{duedateto},   1)      if ($form->{duedateto});
1122
  push @options, $locale->text('Due Date') . " " . $locale->text('from') . " " . $locale->date(\%myconfig,  $form->{duedatefrom}, 1)      if ($form->{duedatefrom});
1123
  push @options, $locale->text('Due Date') . " " . $locale->text('to')   . " " . $locale->date(\%myconfig,  $form->{duedateto},   1)      if ($form->{duedateto});
1124
  push @options, $locale->text('Date Paid') . " " . $locale->text('from') . " " . $locale->date(\%myconfig, $form->{datepaidfrom}, 1)     if ($form->{datepaidfrom});
1125
  push @options, $locale->text('Date Paid') . " " . $locale->text('to')   . " " . $locale->date(\%myconfig, $form->{datepaidto},   1)     if ($form->{datepaidto});
1124 1126
  push @options, $locale->text('Open')                                                                   if ($form->{open});
1125 1127
  push @options, $locale->text('Closed')                                                                 if ($form->{closed});
1126 1128

  
bin/mozilla/ar.pl
1038 1038
  push @columns, map { "cvar_$_->{name}" } @ct_includeable_custom_variables;
1039 1039

  
1040 1040
  my @hidden_variables = map { "l_${_}" } @columns;
1041
  push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber cusordnumber transaction_description notes project_id transdatefrom transdateto duedatefrom duedateto
1041
  push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber cusordnumber transaction_description notes project_id
1042
                                           transdatefrom transdateto duedatefrom duedateto datepaidfrom datepaidto
1042 1043
                                           employee_id salesman_id business_id parts_partnumber parts_description department_id show_marked_as_closed show_not_mailed
1043 1044
                                           shippingpoint shipvia taxzone_id);
1044 1045
  push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
......
1156 1157
  if ($form->{duedateto}) {
1157 1158
    push @options, $locale->text('Due Date') . " " . $locale->text('to') . " " . $locale->date(\%myconfig, $form->{duedateto}, 1);
1158 1159
  }
1160
  if ($form->{datepaidfrom}) {
1161
    push @options, $locale->text('Date Paid') . " " . $locale->text('from') . " " . $locale->date(\%myconfig, $form->{datepaidfrom}, 1);
1162
  }
1163
  if ($form->{datepaidto}) {
1164
    push @options, $locale->text('Date Paid') . " " . $locale->text('to') . " " . $locale->date(\%myconfig, $form->{datepaidto}, 1);
1165
  }
1159 1166
  if ($form->{open}) {
1160 1167
    push @options, $locale->text('Open');
1161 1168
  }
templates/webpages/ap/search.html
65 65
       [% L.date_tag('duedateto') %]
66 66
     </td>
67 67
    </tr>
68
     <tr>
69
      <th align=right nowrap>[% 'Date Paid' | $T8 %]</th>
70
      <td>
71
       [% L.date_tag('datepaidfrom') %]
72
       [% 'Bis' | $T8 %]
73
       [% L.date_tag('datepaidto') %]
74
     </td>
75
    </tr>
68 76
   </table>
69 77
    </td>
70 78
    </tr>
templates/webpages/ar/search.html
101 101
       [% L.date_tag('duedateto') %]
102 102
     </td>
103 103
    </tr>
104
     <tr>
105
      <th align=right nowrap>[% 'Date Paid' | $T8 %]</th>
106
      <td>
107
       [% L.date_tag('datepaidfrom') %]
108
       [% 'Bis' | $T8 %]
109
       [% L.date_tag('datepaidto') %]
110
     </td>
111
    </tr>
104 112

  
105 113
[%- IF CT_CUSTOM_VARIABLES.size %]
106 114
    <tr>

Auch abrufbar als: Unified diff