Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision da6ff55e

Von Jan Büren vor fast 7 Jahren hinzugefügt

  • ID da6ff55e68bf46e8aef1047f39e59784b090a650
  • Vorgänger 8642920a
  • Nachfolger ce5a051e

behebt #243

Kontoauszug verbuchen: Buchung erstellen ist jetzt ein Schritt
Falls die Zahlung für die Buchung entsprechend passend ist, wird
diese automatisch im zweiten Schritt als Vorschlag angezeigt.
Entsprechende Info an den Benutzer.

Unterschiede anzeigen:

SL/Controller/BankTransaction.pm
890 890
  my ($self, $template) = @_;
891 891

  
892 892
  return $self->url_for(
893
    controller                 => 'ap.pl',
894
    action                     => 'load_record_template',
895
    id                         => $template->id,
896
    'form_defaults.amount_1'   => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
897
    'form_defaults.transdate'  => $self->transaction->transdate_as_date,
898
    'form_defaults.duedate'    => $self->transaction->transdate_as_date,
899
    'form_defaults.datepaid_1' => $self->transaction->transdate_as_date,
900
    'form_defaults.paid_1'     => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
901
    'form_defaults.currency'   => $self->transaction->currency->name,
902
    'form_defaults.AP_paid_1'  => $self->transaction->local_bank_account->chart->accno,
903
    'form_defaults.callback'   => $self->callback,
893
    controller                           => 'ap.pl',
894
    action                               => 'load_record_template',
895
    id                                   => $template->id,
896
    'form_defaults.amount_1'             => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
897
    'form_defaults.transdate'            => $self->transaction->transdate_as_date,
898
    'form_defaults.duedate'              => $self->transaction->transdate_as_date,
899
    'form_defaults.no_payment_bookings'  => 1,
900
    'form_defaults.paid_1_suggestion'    => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
901
    'form_defaults.AP_paid_1_suggestion' => $self->transaction->local_bank_account->chart->accno,
902
    'form_defaults.callback'             => $self->callback,
904 903
  );
905 904
}
906 905

  
bin/mozilla/ap.pl
154 154
  $::form->{$_} = $form_defaults->{$_} for keys %{ $form_defaults // {} };
155 155

  
156 156
  flash('info', $::locale->text("The record template '#1' has been loaded.", $template->template_name));
157
  flash('info', $::locale->text("Payment bookings disallowed. After the booking this record may be
158
                                 suggested with the amount of '#1' or otherwise has to be choosen manually.
159
                                 No automatic payment booking will be done to chart '#2'.",
160
                                  $form_defaults->{paid_1_suggestion},
161
                                  $form_defaults->{AP_paid_1_suggestion},
162
                                )) if $::form->{no_payment_bookings};
157 163

  
158 164
  update(
159 165
    keep_rows_without_amount => 1,
templates/webpages/ap/form_header.html
244 244
  </tr>
245 245
  <tr>
246 246
    <td>
247
      [% UNLESS no_payment_bookings %]
247 248
      <table width="100%">
248 249
        <tr class="listheading">
249 250
          <th class="listheading" colspan="7">[% 'Payments' | $T8 %]</th>
......
365 366
          <td align="center">[% LxERP.format_amount(paid_missing, 2) | html %]</td>
366 367
        </tr>
367 368
      </table>
369
      [% END %]
368 370
    </td>
369 371
  </tr>
370 372
</table>

Auch abrufbar als: Unified diff