Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 4aa9760e

Von G. Richardson vor mehr als 5 Jahren hinzugefügt

  • ID 4aa9760e3d155fccea859b2c56f75946c12633f9
  • Vorgänger 5018666c
  • Nachfolger 9d262289

Mahnungen erzeugen - nach Abteilung filtern und anzeigen

Unterschiede anzeigen:

SL/DN.pm
534 534
    push(@values, like($form->{customer}));
535 535
  }
536 536

  
537
  if ($form->{department_id}) {
538
    $where .= qq| AND (a.department_id = ?)|;
539
    push(@values, $form->{department_id});
540
  }
541

  
537 542
  my %columns = (
538 543
    "ordnumber" => "a.ordnumber",
539 544
    "invnumber" => "a.invnumber",
......
573 578
         ct.name AS customername, a.customer_id, a.duedate,
574 579
         a.amount - a.paid AS open_amount,
575 580
         a.direct_debit,
581
         dep.description as departmentname,
576 582

  
577 583
         cfg.dunning_description, cfg.dunning_level,
578 584

  
......
590 596
       FROM ar a
591 597

  
592 598
       LEFT JOIN customer ct ON (a.customer_id = ct.id)
599
       LEFT JOIN department dep ON (a.department_id = dep.id)
593 600
       LEFT JOIN dunning_config cfg ON (a.dunning_config_id = cfg.id)
594 601
       LEFT JOIN dunning_config nextcfg ON
595 602
         (nextcfg.id =
bin/mozilla/dn.pl
103 103

  
104 104
  DN->get_config(\%myconfig, \%$form);
105 105

  
106
  $form->get_lists("departments" => "ALL_DEPARTMENTS");
107

  
106 108
  $form->{SHOW_DUNNING_LEVEL_SELECTION} = $form->{DUNNING}         && scalar @{ $form->{DUNNING} };
107
  $form->{SHOW_DEPARTMENT_SELECTION}    = $form->{all_departments} && scalar @{ $form->{all_departments} || [] };
109
  $form->{SHOW_DEPARTMENT_SELECTION}    = $form->{ALL_DEPARTMENTS} && scalar @{ $form->{ALL_DEPARTMENTS} || [] };
108 110

  
109 111
  $form->{title}    = $locale->text('Start Dunning Process');
110 112

  
......
362 364
    'checkbox'            => { 'text' => '', 'visible' => 'HTML' },
363 365
    'dunning_description' => { 'text' => $locale->text('Dunning Level') },
364 366
    'customername'        => { 'text' => $locale->text('Customername') },
367
    'departmentname'      => { 'text' => $locale->text('Department') },
365 368
    'language'            => { 'text' => $locale->text('Language') },
366 369
    'invnumber'           => { 'text' => $locale->text('Invnumber') },
367 370
    'transdate'           => { 'text' => $locale->text('Invdate') },
doc/changelog
14 14

  
15 15
- Part Controller - neuer Tab mit Lagerinformationen - was ist wo gelagert
16 16

  
17
Kleinere neue Features und Detailverbesserungen:
18

  
19
- Mahnungen nach Abteilung filtern
20

  
17 21
2019-08-07 - Release 3.5.4
18 22

  
19 23

  
templates/webpages/dunning/add.html
1
[%- USE T8 %]
1
[%- USE T8 %][%- USE L %]
2 2
[% USE HTML %]<script type="text/javascript" src="js/common.js"></script>
3 3
<h1>[% title %]</h1>
4 4

  
......
12 12
    </td>
13 13
   </tr>
14 14

  
15
   [% IF SHOW_DEPARTMENT_SELECTION %]
16
    <tr>
17
     <th align="right">[% 'Department' | $T8 %]</th>
18
     <td colspan="3">
19
     [% L.select_tag('department_id', ALL_DEPARTMENTS, title_key = 'description', with_empty = 1, style=style) %]
20
     </td>
21
    </tr>
22
   [% END %]
23

  
15 24
   [% IF SHOW_DUNNING_LEVEL_SELECTION %]
16 25
    <tr>
17 26
     <th align="right">[% 'Next Dunning Level' | $T8 %]</th>
templates/webpages/dunning/show_invoices.html
30 30
   </th>
31 31

  
32 32
   <th class="listheading">[% 'Customername' | $T8 %]</th>
33
   <th class="listheading">[% 'Department' | $T8 %]</th>
33 34
   <th class="listheading">[% 'Language' | $T8 %]</th>
34 35
   <th class="listheading">[% 'Invno.' | $T8 %]</th>
35 36
   <th class="listheading">[% 'Invdate' | $T8 %]</th>
......
63 64
     <td><input type="checkbox" name="active_[% loop.count %]" value="1" [% IF row.active %]checked[% END %]></td>
64 65
     <td><input type="checkbox" name="email_[% loop.count %]" value="1" [% IF row.email %]checked[% END %]></td>
65 66
     <td><input type="hidden" name="customername_[% loop.count %]" size="6" value="[% HTML.escape(row.customername) %]">[% HTML.escape(row.customername) %]</td>
67
     <td><input type="hidden" name="department_[% loop.count %]" size="6" value="[% HTML.escape(row.departmentname) %]">[% HTML.escape(row.departmentname) %]</td>
66 68
     <td><input type="hidden" name="language_id_[% loop.count %]" size="6" value="[% HTML.escape(row.language_id) %]">[% HTML.escape(row.language) %]</td>
67 69
     <td>
68 70
      <input type="hidden" name="invnumber_[% loop.count %]" size="6" value="[% HTML.escape(row.invnumber) %]">

Auch abrufbar als: Unified diff