Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 7b18afd5

Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt

  • ID 7b18afd5605f453367326a3759ad2698c0b946be
  • Vorgänger 3056e61d
  • Nachfolger 6b00b949

customer: Mahnsperre in Bericht anzeigen, sortieren und filtern

Unterschiede anzeigen:

SL/CT.pm
88 88
      "ustid"              => "ct.ustid",
89 89
      "creditlimit"        => "ct.creditlimit",
90 90
      "commercial_court"   => "ct.commercial_court",
91
      "dunning_lock"       => "ct.dunning_lock",
91 92
    );
92 93

  
93 94
  $form->{sort} ||= "name";
......
102 103
  }
103 104
  my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
104 105

  
105
  if ($sortorder !~ /(business|creditlimit|id|discount|itime)/ && !$join_records) {
106
  if ($sortorder !~ /(business|creditlimit|id|discount|itime|dunning_lock)/ && !$join_records) {
106 107
    $sortorder  = "lower($sortorder) ${sortdir}";
107 108
  } else {
108 109
    $sortorder .= " ${sortdir}";
......
231 232
    push @values, conv_date($form->{insertdateto});
232 233
  }
233 234

  
235
  if($form->{dunning_lock} ne '') {
236
    $where .= qq| AND ct.dunning_lock = ?|;
237
    push @values, $form->{dunning_lock};
238
  }
239

  
234 240
  if ($form->{all}) {
235 241
    my @tokens = parse_line('\s+', 0, $form->{all});
236 242
      $where .= qq| AND (
bin/mozilla/ct.pl
160 160
  push @options, $locale->text('Billing/shipping address (GLN)')     . " : $form->{addr_gln}"              if $form->{addr_gln};
161 161
  push @options, $locale->text('Quick Search')                       . " : $form->{all}"                   if $form->{all};
162 162
  push @options, $locale->text('Factur-X/ZUGFeRD settings')          . " : $zugferd_filter"                if $zugferd_filter;
163
  push @options, $locale->text('Dunning lock')                       . " : $form->{dunning_lock}"          if $form->{dunning_lock} ne '';
163 164

  
164 165
  if ($form->{business_id}) {
165 166
    my $business = SL::DB::Manager::Business->find_by(id => $form->{business_id});
......
187 188
    'fax',       'email',   'taxnumber',           'street',    'zipcode' , 'city',
188 189
    'business',  'payment', 'invnumber', 'ordnumber',           'quonumber', 'salesman',
189 190
    'country',   'gln',     'insertdate',           'pricegroup', 'contact_origin', 'invoice_mail',
190
    'creditlimit', 'ustid', 'commercial_court', 'delivery_order_mail'
191
    'creditlimit', 'ustid', 'commercial_court', 'delivery_order_mail', 'dunning_lock'
191 192
  );
192 193

  
193 194
  my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
......
230 231
    'ustid'             => { 'text' => $locale->text('VAT ID'), },
231 232
    'commercial_court'  => { 'text' => $locale->text('Commercial court'), },
232 233
    create_zugferd_invoices => { text => $locale->text('Factur-X/ZUGFeRD settings'), },
234
    'dunning_lock'      => { 'text' => $locale->text('Dunning lock'), },
233 235
    %column_defs_cvars,
234 236
  );
235 237

  
......
238 240
  my @hidden_variables  = ( qw(
239 241
      db status obsolete name contact email cp_name addr_street addr_zipcode
240 242
      addr_city addr_country addr_gln business_id salesman_id insertdateto insertdatefrom all
241
      all_phonenumbers
243
      all_phonenumbers dunning_lock
242 244
    ), "$form->{db}number",
243 245
    map({ "cvar_$_->{name}" } @searchable_custom_variables),
244 246
    map({'cvar_'. $_->{name} .'_from'} grep({$_->{type} eq 'date'} @searchable_custom_variables)),
templates/design40_webpages/ct/search.html
37 37
          <th>[% 'All phone numbers' | $T8 %]</th>
38 38
          <td><input type="text" name="all_phonenumbers" class="wi-normal"></td>
39 39
        </tr>
40
        [% IF IS_CUSTOMER %]
41
        <tr>
42
          <th>[% 'Dunning lock' | $T8 %]</th>
43
          <td>[% L.yes_no_tag('dunning_lock', dunning_lock, default='', with_empty=1, class="wi-normal") %]</td>
44
        </tr>
45
        [% END %]
40 46
      </tbody>
41 47
    </table>
42 48

  
......
166 172
      <input name="l_creditlimit" id="l_creditlimit" type="checkbox" class="checkbox" value="Y">
167 173
      <label for="l_creditlimit">[% 'Credit Limit' | $T8 %]</label>
168 174
    </div>
175
    <div>
176
      <input name="l_dunning_lock" id="l_dunning_lock" type="checkbox" class="checkbox" value="Y">
177
      <label for="l_dunning_lock">[% 'Dunning lock' | $T8 %]</label>
178
    </div>
169 179
    <div>
170 180
      <input name="l_commercial_court" id="l_commercial_court" type="checkbox" class="checkbox" value="Y">
171 181
      <label for="l_commercial_court">[% 'Commercial court' | $T8 %]</label>
templates/webpages/ct/search.html
91 91
      [% L.date_tag('insertdateto') %]
92 92
    </td>
93 93
   </tr>
94
[% IF IS_CUSTOMER %]
95
   <tr>
96
     <th align="right" nowrap>[% 'Dunning lock' | $T8 %]</th>
97
     <td>[% L.yes_no_tag('dunning_lock', dunning_lock, default='', with_empty=1) %]</td>
98
   </tr>
99
[% END %]
94 100

  
95 101
   [% CUSTOM_VARIABLES_FILTER_CODE %]
96 102

  
......
262 268
        <input name="l_department_2" id="l_department_2" type="checkbox" class="checkbox" value="Y">
263 269
        <label for="l_department_2">[% 'Department' | $T8 %] 2</label>
264 270
       </td>
265
        <td></td>
271
       <td>
272
        <input name="l_dunning_lock" id="l_dunning_lock" type="checkbox" class="checkbox" value="Y">
273
        <label for="l_dunning_lock">[% 'Dunning lock' | $T8 %]</label>
274
       </td>
266 275
      </tr>
267 276
      [% END %]
268 277

  

Auch abrufbar als: Unified diff