Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision ed0754c2

Von Jan Büren vor mehr als 4 Jahren hinzugefügt

  • ID ed0754c2f82cab2e24100107b534692d5455b02d
  • Vorgänger 16583fc6
  • Nachfolger cbbe00cc

Mahnungskonfiguration Ausdruck der Originalrechnung konfigurierbar

Unterschiede anzeigen:

SL/DN.pm
111 111
                 $form->{"template_$i"}, $form->{"fee_$i"}, $form->{"interest_rate_$i"},
112 112
                 $form->{"active_$i"} ? 't' : 'f', $form->{"auto_$i"} ? 't' : 'f', $form->{"email_$i"} ? 't' : 'f',
113 113
                 $form->{"email_attachment_$i"} ? 't' : 'f', conv_i($form->{"payment_terms_$i"}), conv_i($form->{"terms_$i"}),
114
                 $form->{"create_invoices_for_fees_$i"} ? 't' : 'f');
114
                 $form->{"create_invoices_for_fees_$i"} ? 't' : 'f',
115
                 $form->{"print_original_invoice_$i"} ? 't' : 'f');
115 116
      if ($form->{"id_$i"}) {
116 117
        $query =
117 118
          qq|UPDATE dunning_config SET
......
120 121
               template = ?, fee = ?, interest_rate = ?,
121 122
               active = ?, auto = ?, email = ?,
122 123
               email_attachment = ?, payment_terms = ?, terms = ?,
123
               create_invoices_for_fees = ?
124
               create_invoices_for_fees = ?,
125
               print_original_invoice = ?
124 126
             WHERE id = ?|;
125 127
        push(@values, conv_i($form->{"id_$i"}));
126 128
      } else {
......
128 130
          qq|INSERT INTO dunning_config
129 131
               (dunning_level, dunning_description, email_subject, email_body,
130 132
                template, fee, interest_rate, active, auto, email,
131
                email_attachment, payment_terms, terms, create_invoices_for_fees)
132
             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
133
                email_attachment, payment_terms, terms, create_invoices_for_fees,
134
                print_original_invoice)
135
             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
133 136
      }
134 137
      do_query($form, $dbh, $query, @values);
135 138
    }
......
597 600

  
598 601
         nextcfg.dunning_description AS next_dunning_description,
599 602
         nextcfg.id AS next_dunning_config_id,
600
         nextcfg.terms, nextcfg.active, nextcfg.email
603
         nextcfg.terms, nextcfg.active, nextcfg.email, nextcfg.print_original_invoice
601 604

  
602 605
       FROM ar a
603 606

  
bin/mozilla/dn.pl
249 249
                      "customer_id"            => $form->{"customer_id_$i"},
250 250
                      "language_id"            => $form->{"language_id_$i"},
251 251
                      "next_dunning_config_id" => $form->{"next_dunning_config_id_$i"},
252
                      "print_invoice"          => $form->{"include_invoice_$i"},
252 253
                      "email"                  => $form->{"email_$i"}, } ];
253 254
      if (!$form->{force_lang}) {
254 255
        $form->{language_id} = @{$level}[0]->{language_id};
templates/webpages/dunning/edit_config.html
16 16
    <th class="listheading">[% 'eMail Send?' | $T8 %]</th>
17 17
<!--     <th class="listheading">[% 'Auto Send?' | $T8 %]</th>  -->
18 18
    <th class="listheading">[% 'Create invoice?' | $T8 %]</th>
19
    <th class="listheading">[% 'Include original Invoices?' | $T8 %]</th>
19 20
    <th class="listheading">[% 'Fristsetzung' | $T8 %]</th>
20 21
    <th class="listheading">[% 'Duedate +Days' | $T8 %]</th>
21 22
    <th class="listheading">[% 'Fee' | $T8 %]</th>
......
45 46

  
46 47
<!--      <td><input type="checkbox" name="auto_[% DUNNING_it.count %]" value="1" [% IF row.auto %]checked[% END %]></td> -->
47 48
     <td><input type="checkbox" name="create_invoices_for_fees_[% DUNNING_it.count %]" value="1" [% IF row.create_invoices_for_fees %]checked[% END %]></td>
49
     <td><input type="checkbox" name="print_original_invoice_[% DUNNING_it.count %]" value="1" [% IF row.print_original_invoice %]checked[% END %]></td>
48 50
     <td><input name="payment_terms_[% DUNNING_it.count %]" size="3" value="[% HTML.escape(row.payment_terms) %]"></td>
49 51
     <td><input name="terms_[% DUNNING_it.count %]" size="3" value="[% HTML.escape(row.terms) %]"></td>
50 52
     <td><input name="fee_[% DUNNING_it.count %]" size="5" value="[% HTML.escape(row.fee) %]"></td>
......
76 78

  
77 79
<!--     <td><input type="checkbox" name="auto_[% rowcount %]" value="1" checked></td> -->
78 80
    <td><input type="checkbox" name="create_invoices_for_fees_[% rowcount %]" value="1" checked></td>
81
    <td><input type="checkbox" name="print_original_invoice_[% DUNNING_it.count %]" value="1" [% IF row.print_original_invoice %]checked[% END %]></td>
79 82
    <td><input name="payment_terms_[% rowcount %]" size="3"></td>
80 83
    <td><input name="terms_[% rowcount %]" size="3"></td>
81 84
    <td><input name="fee_[% rowcount %]" size="5"></td>
templates/webpages/dunning/show_invoices.html
5 5

  
6 6
[% SET all_active = 1 %][% FOREACH row = DUNNINGS %][% IF !row.active %][% SET all_active = 0 %][% LAST %][% END %][% END %]
7 7
[% SET all_email = 1 %][% FOREACH row = DUNNINGS %][% IF !row.email %][% SET all_email = 0 %][% LAST %][% END %][% END %]
8
[% SET all_include_invoices = 1 %][% FOREACH row = DUNNINGS %][% IF !row.print_original_invoice %][% SET all_include_invoices = 0 %][% LAST %][% END %][% END %]
8 9
 <form name="Form" method="post" action="dn.pl" id="form">
9 10

  
10 11
  <h2>[% LxERP.t8("Print options") %]</h2>
......
67 68

  
68 69
     <td><input type="checkbox" name="active_[% loop.count %]" value="1" [% IF row.active %]checked[% END %]></td>
69 70
     <td><input type="checkbox" name="email_[% loop.count %]" value="1" [% IF row.email %]checked[% END %]></td>
70
     <td><input type="checkbox" name="include_invoice_[% loop.count %]" value="1" [% IF row.include_invoices %]checked[% END %]></td>
71
     <td><input type="checkbox" name="include_invoice_[% loop.count %]" value="1" [% IF row.print_original_invoice %]checked[% END %]></td>
71 72
     <td><input type="hidden" name="customername_[% loop.count %]" size="6" value="[% HTML.escape(row.customername) %]">[% HTML.escape(row.customername) %]</td>
72 73
     <td><input type="hidden" name="department_[% loop.count %]" size="6" value="[% HTML.escape(row.departmentname) %]">[% HTML.escape(row.departmentname) %]</td>
73 74
     <td><input type="hidden" name="language_id_[% loop.count %]" size="6" value="[% HTML.escape(row.language_id) %]">[% HTML.escape(row.language) %]</td>

Auch abrufbar als: Unified diff