Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision be016390

Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt

  • ID be0163907f24ae34827289f42b85d3faa08e1881
  • Vorgänger 1b9d825f
  • Nachfolger 778abbc9

Kunden/Lieferanten-Bericht: nach Zahlungsbedingung filtern

Unterschiede anzeigen:

SL/CT.pm
224 224
    push(@values, conv_i($form->{salesman_id}));
225 225
  }
226 226

  
227
  if ($form->{payment_id}) {
228
    $where .= qq| AND (ct.payment_id = ?)|;
229
    push(@values, $form->{payment_id});
230
  }
231

  
227 232
  if($form->{insertdatefrom}) {
228 233
    $where .= qq| AND (ct.itime::DATE >= ?)|;
229 234
    push@values, conv_date($form->{insertdatefrom});
bin/mozilla/ct.pl
55 55
use SL::DB::Business;
56 56
use SL::DB::Default;
57 57
use SL::DB::DeliveryTerm;
58
use SL::DB::Manager::PaymentTerm;
58 59
use SL::ReportGenerator;
59 60
use SL::Locale::String qw(t8);
60 61
use SL::MoreCommon qw(uri_encode);
......
83 84

  
84 85
  $form->get_lists("business_types" => "ALL_BUSINESS_TYPES",
85 86
                   "salesmen"       => "ALL_SALESMEN");
87
  $form->{ALL_PAYMENT_TERMS} = SL::DB::Manager::PaymentTerm->get_all_sorted;
86 88
  $form->{SHOW_BUSINESS_TYPES} = scalar @{ $form->{ALL_BUSINESS_TYPES} } > 0;
87 89

  
88 90
  $form->{CUSTOM_VARIABLES}                  = CVar->get_configs('module' => 'CT');
......
178 180
    }
179 181
  }
180 182

  
183
  if ($form->{payment_id}) {
184
    my $payment = SL::DB::Manager::PaymentTerm->find_by(id => $form->{payment_id});
185
    if ($payment) {
186
      push @options, $locale->text('Payment Term') . " : " . $payment->description;
187
    }
188
  }
189

  
181 190
  if ( $form->{insertdatefrom} or $form->{insertdateto} ) {
182 191
    push @options, $locale->text('Insert Date');
183 192
    push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{insertdatefrom}, 1) if $form->{insertdatefrom};
......
242 251
  my @hidden_variables  = ( qw(
243 252
      db status obsolete name contact email cp_name addr_street addr_zipcode
244 253
      addr_city addr_country addr_gln business_id salesman_id insertdateto insertdatefrom all
245
      all_phonenumbers dunning_lock department_1 department_2
254
      all_phonenumbers dunning_lock department_1 department_2 payment_id
246 255
    ), "$form->{db}number",
247 256
    map({ "cvar_$_->{name}" } @searchable_custom_variables),
248 257
    map({'cvar_'. $_->{name} .'_from'} grep({$_->{type} eq 'date'} @searchable_custom_variables)),
templates/design40_webpages/ct/search.html
106 106
          <th>[% 'Insert Date' | $T8 %] [% 'From' | $T8 %] </th>
107 107
          <td>[% L.date_tag('insertdatefrom') %] [% 'Bis' | $T8 %] [% L.date_tag('insertdateto') %] <!-- PENDENT: Klassen implementieren in Funktion --></td>
108 108
        </tr>
109
        <tr>
110
          <th>[% 'Payment Term' | $T8 %]</th>
111
          <td>[% L.select_tag('payment_id', ALL_PAYMENT_TERMS, with_empty=1, title_key='description', with_empty=1, class="wi-lightwide") %]</td>
112
        </tr>
109 113
      [% CUSTOM_VARIABLES_FILTER_CODE %]
110 114
      <tr>
111 115
        <th>[% 'Scope' | $T8 %] </th>
templates/webpages/ct/search.html
74 74
   </tr>
75 75
   [% END %]
76 76

  
77
   <tr>
78
     <th align="right" nowrap>[% 'Payment Term' | $T8 %]</th>
79
     <td>[% L.select_tag('payment_id', ALL_PAYMENT_TERMS, with_empty=1, title_key='description', with_empty=1) %]</td>
80
   </tr>
81

  
77 82
[% IF IS_CUSTOMER %]
78 83
   <tr>
79 84
     <th align="right" nowrap>[% LxERP.t8("Factur-X/ZUGFeRD settings") %]</th>

Auch abrufbar als: Unified diff