Revision 5d44361c
Von Moritz Bunkus vor mehr als 15 Jahren hinzugefügt
| bin/mozilla/gl.pl | ||
|---|---|---|
| 701 | 701 |
$form->{"taxchart_$i"} = "0--0.00";
|
| 702 | 702 |
$form->{"tax_$i"} = 0;
|
| 703 | 703 |
} |
| 704 |
if (!$form->{"korrektur_$i"}) {
|
|
| 705 |
($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
|
|
| 706 |
if ($taxkey > 1) {
|
|
| 707 |
if ($debitcredit) {
|
|
| 708 |
$debittax = 1; |
|
| 709 |
} else {
|
|
| 710 |
$credittax = 1; |
|
| 711 |
} |
|
| 712 |
if ($form->{taxincluded}) {
|
|
| 713 |
$form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
|
|
| 714 |
} else {
|
|
| 715 |
$form->{"tax_$i"} = $amount * $rate;
|
|
| 716 |
} |
|
| 704 |
($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
|
|
| 705 |
if ($taxkey > 1) {
|
|
| 706 |
if ($debitcredit) {
|
|
| 707 |
$debittax = 1; |
|
| 708 |
} else {
|
|
| 709 |
$credittax = 1; |
|
| 710 |
} |
|
| 711 |
if ($form->{taxincluded}) {
|
|
| 712 |
$form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
|
|
| 717 | 713 |
} else {
|
| 718 |
$form->{"tax_$i"} = 0;
|
|
| 714 |
$form->{"tax_$i"} = $amount * $rate;
|
|
| 719 | 715 |
} |
| 716 |
} else {
|
|
| 717 |
$form->{"tax_$i"} = 0;
|
|
| 720 | 718 |
} |
| 721 | 719 |
|
| 722 | 720 |
for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
|
| ... | ... | |
| 862 | 860 |
. qq|</td>|; |
| 863 | 861 |
|
| 864 | 862 |
if ($init) {
|
| 865 |
$korrektur = |
|
| 866 |
qq|<td><input type="checkbox" name="korrektur_$i" value="1"></td>|; |
|
| 867 | 863 |
if ($form->{transfer}) {
|
| 868 | 864 |
$fx_transaction = qq| |
| 869 | 865 |
<td><input name="fx_transaction_$i" class=checkbox type=checkbox value=1></td> |
| ... | ... | |
| 898 | 894 |
<td><input type=hidden name="fx_transaction_$i" value="$checked">$x</td> |
| 899 | 895 |
|; |
| 900 | 896 |
} |
| 901 |
$checked = ($form->{"korrektur_$i"}) ? "checked" : "";
|
|
| 902 |
$korrektur = |
|
| 903 |
qq|<td><input type="checkbox" name="korrektur_$i" value="1" $checked></td>|; |
|
| 904 | 897 |
$form->hide_form("accno_$i");
|
| 905 | 898 |
|
| 906 | 899 |
} else {
|
| 907 |
$korrektur = |
|
| 908 |
qq|<td><input type="checkbox" name="korrektur_$i" value="1"></td>|; |
|
| 909 | 900 |
if ($form->{transfer}) {
|
| 910 | 901 |
$fx_transaction = qq| |
| 911 | 902 |
<td><input name="fx_transaction_$i" class=checkbox type=checkbox value=1></td> |
| ... | ... | |
| 936 | 927 |
$fx_transaction |
| 937 | 928 |
<td><input name="debit_$i" size="8" value="$form->{"debit_$i"}" accesskey=$i $copy2credit $debitreadonly></td>
|
| 938 | 929 |
<td><input name="credit_$i" size=8 value="$form->{"credit_$i"}" $creditreadonly></td>
|
| 939 |
<td><input name="tax_$i" size=6 value="$form->{"tax_$i"}"></td>
|
|
| 940 |
$korrektur |
|
| 930 |
<td><input type="hidden" name="tax_$i" value="$form->{"tax_$i"}">$form->{"tax_$i"}</td>
|
|
| 941 | 931 |
$tax|; |
| 942 | 932 |
|
| 943 | 933 |
if ($form->{show_details}) {
|
| ... | ... | |
| 1197 | 1187 |
<th class=listheading style="width:10%">| |
| 1198 | 1188 |
. $locale->text('Tax') . qq|</th>
|
| 1199 | 1189 |
<th class=listheading style="width:5%">| |
| 1200 |
. $locale->text('Korrektur') . qq|</th>
|
|
| 1201 |
<th class=listheading style="width:10%">| |
|
| 1202 | 1190 |
. $locale->text('Taxkey') . qq|</th>|;
|
| 1203 | 1191 |
|
| 1204 | 1192 |
if ($form->{show_details}) {
|
| ... | ... | |
| 1421 | 1409 |
$form->{"taxchart_$i"} = "0--0.00";
|
| 1422 | 1410 |
$form->{"tax_$i"} = 0;
|
| 1423 | 1411 |
} |
| 1424 |
if (!$form->{"korrektur_$i"}) {
|
|
| 1425 |
($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
|
|
| 1426 |
if ($taxkey > 1) {
|
|
| 1412 |
($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
|
|
| 1413 |
if ($taxkey > 1) {
|
|
| 1414 |
if ($debitcredit) {
|
|
| 1415 |
$debittax = 1; |
|
| 1416 |
} else {
|
|
| 1417 |
$credittax = 1; |
|
| 1418 |
} |
|
| 1419 |
if ($form->{taxincluded}) {
|
|
| 1420 |
$form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
|
|
| 1427 | 1421 |
if ($debitcredit) {
|
| 1428 |
$debittax = 1;
|
|
| 1422 |
$form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};
|
|
| 1429 | 1423 |
} else {
|
| 1430 |
$credittax = 1; |
|
| 1431 |
} |
|
| 1432 |
if ($form->{taxincluded}) {
|
|
| 1433 |
$form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
|
|
| 1434 |
if ($debitcredit) {
|
|
| 1435 |
$form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};
|
|
| 1436 |
} else {
|
|
| 1437 |
$form->{"credit_$i"} = $form->{"credit_$i"} - $form->{"tax_$i"};
|
|
| 1438 |
} |
|
| 1439 |
} else {
|
|
| 1440 |
$form->{"tax_$i"} = $amount * $rate;
|
|
| 1424 |
$form->{"credit_$i"} = $form->{"credit_$i"} - $form->{"tax_$i"};
|
|
| 1441 | 1425 |
} |
| 1442 | 1426 |
} else {
|
| 1443 |
$form->{"tax_$i"} = 0;
|
|
| 1444 |
} |
|
| 1445 |
} elsif ($form->{taxincluded}) {
|
|
| 1446 |
if ($debitcredit) {
|
|
| 1447 |
$form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};
|
|
| 1448 |
} else {
|
|
| 1449 |
$form->{"credit_$i"} = $form->{"credit_$i"} - $form->{"tax_$i"};
|
|
| 1427 |
$form->{"tax_$i"} = $amount * $rate;
|
|
| 1450 | 1428 |
} |
| 1429 |
} else {
|
|
| 1430 |
$form->{"tax_$i"} = 0;
|
|
| 1451 | 1431 |
} |
| 1452 | 1432 |
|
| 1453 | 1433 |
for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
|
Auch abrufbar als: Unified diff
Kreditoren-, Debitoren- und Dialogbuchenmasken:
1. Die Checkboxen "Korrektur" entfernt.
2. Die Eingabezeilen für den Steuerbetrag in einfache Anzeigen des von Lx-Office ausgerechneten Steuerbetrages umgewandelt.
Grund ist, dass Steuern, die mit "Korrektur" eingegeben wurden und nicht exakt dem Steuersatz entsprachen, die zum ausgewählten Steuerschlüssel gehörten, dafür gesorgt haben, dass diese Transaktion nicht über die DATEV-Schnittstelle exportiert werden kann.