Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision b23ee626

Von Bernd Bleßmann vor fast 4 Jahren hinzugefügt

  • ID b23ee626fbfac14f9f245373ba8a541dd0913628
  • Vorgänger b4c84c7e
  • Nachfolger e8e9592c

Mahnungsbericht: Anzeige f. Dokumente/Mails abschaltbar

Unterschiede anzeigen:

SL/Presenter/Dunning.pm
20 20
  my $text = escape($dunning->dunning_config->dunning_description);
21 21

  
22 22
  if (! delete $params{no_link}) {
23
    my $href = 'dn.pl?action=show_dunning&showold=1&dunning_id=' . $dunning->dunning_id;
24
    $text    = link_tag($href, $text, %params);
23
    my @flags;
24
    push @flags, 'showold=1';
25
    push @flags, 'l_mails=1'      if $::instance_conf->get_email_journal;
26
    push @flags, 'l_webdav=1'     if $::instance_conf->get_webdav;
27
    push @flags, 'l_documents=1'  if $::instance_conf->get_doc_storage;
28

  
29
    my $href  = 'dn.pl?action=show_dunning&dunning_id=' . $dunning->dunning_id;
30
    $href    .= '&' . join '&', @flags if @flags;
31
    $text     = link_tag($href, $text, %params);
25 32
  }
26 33

  
27 34
  is_escaped($text);
bin/mozilla/dn.pl
362 362
  $main::auth->assert('dunning_edit');
363 363

  
364 364
  my @filter_field_list = qw(customer_id customer dunning_id dunning_level department_id invnumber ordnumber
365
                             transdatefrom transdateto dunningfrom dunningto notes showold l_salesman salesman_id);
365
                             transdatefrom transdateto dunningfrom dunningto notes showold l_salesman salesman_id
366
                             l_mails l_webdav l_documents);
366 367

  
367 368
  report_generator_set_default_sort('customername', 1);
368 369

  
......
405 406
    'fee'                 => { 'text' => $locale->text('Total Fees') },
406 407
    'interest'            => { 'text' => $locale->text('Interest') },
407 408
    'salesman'            => { 'text' => $locale->text('Salesperson'), 'visible' => $form->{l_salesman} ? 1 : 0 },
408
    'documents'           => { 'text' => $locale->text('Documents'),   'visible' => $::instance_conf->get_doc_storage   ? 1 : 0 },
409
    'webdav'              => { 'text' => $locale->text('WebDAV'),      'visible' => $::instance_conf->get_webdav        ? 1 : 0 },
410
    'mails'               => { 'text' => $locale->text('Mails'),       'visible' => $::instance_conf->get_email_journal ? 1 : 0 },
409
    'documents'           => { 'text' => $locale->text('Documents'),   'visible' => $form->{l_documents}? 1 : 0 },
410
    'webdav'              => { 'text' => $locale->text('WebDAV'),      'visible' => $form->{l_webdav}   ? 1 : 0 },
411
    'mails'               => { 'text' => $locale->text('Mails'),       'visible' => $form->{l_mails}    ? 1 : 0 },
411 412
  );
412 413

  
413 414
  $report->set_columns(%column_defs);
......
475 476
      $row->{language} = { };
476 477
    }
477 478

  
478
    if ($::instance_conf->get_doc_storage && $first_row_for_dunning) {
479
    if ($form->{l_documents} && $first_row_for_dunning) {
479 480
      my @files  = SL::File->get_all_versions(object_id   => $ref->{dunning_id},
480 481
                                              object_type => 'dunning',
481 482
                                              file_type   => 'document',);
......
487 488
        $row->{documents} = { };
488 489
      }
489 490
    }
490
    if ($::instance_conf->get_webdav && $first_row_for_dunning) {
491
    if ($form->{l_webdav} && $first_row_for_dunning) {
491 492
      my $webdav = SL::Webdav->new(
492 493
        type     => 'dunning',
493 494
        number   => $ref->{dunning_id},
......
502 503
      }
503 504
    }
504 505

  
505
    if ($::instance_conf->get_email_journal) {
506
    if ($form->{l_mails}) {
506 507
      my @mail_links = RecordLinks->get_links(from_table => 'dunning', to_table => 'email_journal', from_id => $ref->{dunning_table_id});
507 508
      if (scalar @mail_links) {
508 509
        my $email_journals = SL::DB::Manager::EmailJournal->get_all(where => [id => [ map { $_->{to_id} } @mail_links ]]);
locale/de/all
3015 3015
  'Show AP transactions as part of AP invoice report' => 'Kreditorenbuchungen zusammen mit Verkaufsrechnungen anzeigen',
3016 3016
  'Show AR transactions as part of AR invoice report' => 'Debitorenbuchungen zusammen mit Verkaufsrechnungen anzeigen',
3017 3017
  'Show Bestbefore'             => 'Mindesthaltbarkeit anzeigen',
3018
  'Show E-Mails'                => 'E-Mails anzeigen',
3018 3019
  'Show Filter'                 => 'Filter zeigen',
3019 3020
  'Show Salesman'               => 'Verkäufer anzeigen',
3020 3021
  'Show Stornos'                => 'Stornos anzeigen',
......
3035 3036
  'Show delivery value report'  => 'Lieferwertbericht anzeigen',
3036 3037
  'Show details'                => 'Details anzeigen',
3037 3038
  'Show details and reports of parts, services, assemblies' => 'Details und Berichte von Waren, Dienstleistungen und Erzeugnissen anzeigen',
3039
  'Show documents in WebDAV'    => 'Dokumente im WebDAV anzeigen',
3040
  'Show documents in file storage' => 'Dokumente im Dateimanagement anzeigen',
3038 3041
  'Show fields used for the best before date?' => 'Felder zur Eingabe des Mindesthaltbarkeitsdatums anzeigen?',
3039 3042
  'Show follow ups...'          => 'Zeige Wiedervorlagen...',
3040 3043
  'Show help text'              => 'Hilfetext anzeigen',
locale/en/all
3015 3015
  'Show AP transactions as part of AP invoice report' => '',
3016 3016
  'Show AR transactions as part of AR invoice report' => '',
3017 3017
  'Show Bestbefore'             => '',
3018
  'Show E-Mails'                => '',
3018 3019
  'Show Filter'                 => '',
3019 3020
  'Show Salesman'               => '',
3020 3021
  'Show Stornos'                => '',
......
3035 3036
  'Show delivery value report'  => '',
3036 3037
  'Show details'                => '',
3037 3038
  'Show details and reports of parts, services, assemblies' => '',
3039
  'Show documents in WebDAV'    => '',
3040
  'Show documents in file storage' => '',
3038 3041
  'Show fields used for the best before date?' => '',
3039 3042
  'Show follow ups...'          => '',
3040 3043
  'Show help text'              => '',
templates/webpages/dunning/search.html
102 102
       <th align="right" nowrap>[% 'Show Salesman' | $T8 %]</th>
103 103
       <td><input type="checkbox" value="1" name="l_salesman"></td>
104 104
      </tr>
105
      <tr>
106
       [%- IF INSTANCE_CONF.get_email_journal %]
107
        <th align="right" nowrap>[% 'Show E-Mails' | $T8 %]</th>
108
        <td><input type="checkbox" value="1" name="l_mails" checked></td>
109
       [%- END %]
110
       [%- IF INSTANCE_CONF.get_webdav %]
111
        <th align="right" nowrap>[% 'Show documents in WebDAV' | $T8 %]</th>
112
        <td><input type="checkbox" value="1" name="l_webdav" checked></td>
113
       [%- END %]
114
       [%- IF INSTANCE_CONF.get_doc_storage %]
115
        <th align="right" nowrap>[% 'Show documents in file storage' | $T8 %]</th>
116
        <td><input type="checkbox" value="1" name="l_documents" checked></td>
117
       [%- END %]
118
      </tr>
105 119
     </table>
106 120
    </td>
107 121
   </tr>

Auch abrufbar als: Unified diff