Revision 52ee8da6
Von Moritz Bunkus vor etwa 17 Jahren hinzugefügt
| SL/Form.pm | ||
|---|---|---|
| 1370 | 1370 |
($self->{netto_date}, $self->{skonto_date}) =
|
| 1371 | 1371 |
selectrow_query($self, $dbh, $query, $transdate, $self->{terms_netto}, $transdate, $self->{terms_skonto});
|
| 1372 | 1372 |
|
| 1373 |
my $total = ($self->{invtotal}) ? $self->{invtotal} : $self->{ordtotal};
|
|
| 1374 |
my $skonto_amount = $self->parse_amount($myconfig, $total) * |
|
| 1375 |
$self->{percent_skonto};
|
|
| 1373 |
my ($invtotal, $total); |
|
| 1374 |
my (%amounts, %formatted_amounts); |
|
| 1376 | 1375 |
|
| 1377 |
$self->{skonto_amount} =
|
|
| 1378 |
$self->format_amount($myconfig, $skonto_amount, 2); |
|
| 1376 |
if ($self->{type} =~ /_order$/) {
|
|
| 1377 |
$amounts{invtotal} = $self->{ordtotal};
|
|
| 1378 |
$amounts{total} = $self->{ordtotal};
|
|
| 1379 |
|
|
| 1380 |
} elsif ($self->{type} =~ /_quotation$/) {
|
|
| 1381 |
$amounts{invtotal} = $self->{quototal};
|
|
| 1382 |
$amounts{total} = $self->{quototal};
|
|
| 1383 |
|
|
| 1384 |
} else {
|
|
| 1385 |
$amounts{invtotal} = $self->{invtotal};
|
|
| 1386 |
$amounts{total} = $self->{total};
|
|
| 1387 |
} |
|
| 1388 |
|
|
| 1389 |
map { $amounts{$_} = $self->parse_amount($myconfig, $amounts{$_}) } keys %amounts;
|
|
| 1390 |
|
|
| 1391 |
$amounts{skonto_amount} = $amounts{invtotal} * $self->{percent_skonto};
|
|
| 1392 |
$amounts{invtotal_wo_skonto} = $amounts{invtotal} * (1 - $self->{percent_skonto});
|
|
| 1393 |
$amounts{total_wo_skonto} = $amounts{total} * (1 - $self->{percent_skonto});
|
|
| 1394 |
|
|
| 1395 |
map { $formatted_amounts{$_} = $self->format_amount($myconfig, $amounts{$_}, 2) } keys %amounts;
|
|
| 1379 | 1396 |
|
| 1380 | 1397 |
if ($self->{"language_id"}) {
|
| 1381 | 1398 |
$query = |
| ... | ... | |
| 1403 | 1420 |
($output_numberformat ne $myconfig->{"numberformat"})) {
|
| 1404 | 1421 |
my $saved_numberformat = $myconfig->{"numberformat"};
|
| 1405 | 1422 |
$myconfig->{"numberformat"} = $output_numberformat;
|
| 1406 |
$self->{skonto_amount} =
|
|
| 1407 |
$self->format_amount($myconfig, $skonto_amount, 2); |
|
| 1423 |
map { $formatted_amounts{$_} = $self->format_amount($myconfig, $amounts{$_}) } keys %amounts;
|
|
| 1408 | 1424 |
$myconfig->{"numberformat"} = $saved_numberformat;
|
| 1409 | 1425 |
} |
| 1410 | 1426 |
} |
| 1411 | 1427 |
|
| 1412 | 1428 |
$self->{payment_terms} =~ s/<%netto_date%>/$self->{netto_date}/g;
|
| 1413 | 1429 |
$self->{payment_terms} =~ s/<%skonto_date%>/$self->{skonto_date}/g;
|
| 1414 |
$self->{payment_terms} =~ s/<%skonto_amount%>/$self->{skonto_amount}/g;
|
|
| 1415 |
$self->{payment_terms} =~ s/<%total%>/$self->{total}/g;
|
|
| 1416 |
$self->{payment_terms} =~ s/<%invtotal%>/$self->{invtotal}/g;
|
|
| 1417 | 1430 |
$self->{payment_terms} =~ s/<%currency%>/$self->{currency}/g;
|
| 1418 | 1431 |
$self->{payment_terms} =~ s/<%terms_netto%>/$self->{terms_netto}/g;
|
| 1419 | 1432 |
$self->{payment_terms} =~ s/<%account_number%>/$self->{account_number}/g;
|
| 1420 | 1433 |
$self->{payment_terms} =~ s/<%bank%>/$self->{bank}/g;
|
| 1421 | 1434 |
$self->{payment_terms} =~ s/<%bank_code%>/$self->{bank_code}/g;
|
| 1422 | 1435 |
|
| 1436 |
map { $self->{payment_terms} =~ s/<%${_}%>/$formatted_amounts{$_}/g; } keys %formatted_amounts;
|
|
| 1437 |
|
|
| 1423 | 1438 |
$main::lxdebug->leave_sub(); |
| 1424 | 1439 |
|
| 1425 | 1440 |
} |
Auch abrufbar als: Unified diff
Zahlungskonditionen:
1. Neue Variablen <%invtotal_wo_skonto%> und <%total_wo_skonto%> hinzugefügt, die die Belegsumme bzw. die noch offene Summe abzüglich des Skontobetrags beinhalten.
2. Die Variablen <%total%> und <%invtotal%> waren nur bei Rechnungen gefüllt, nicht aber bei Angeboten und Aufträgen.