Revision 5d44361c
Von Moritz Bunkus vor mehr als 15 Jahren hinzugefügt
| bin/mozilla/ap.pl | ||
|---|---|---|
| 498 | 498 |
. $locale->text('Amount') . qq|</th>
|
| 499 | 499 |
<th class=listheading style="width:10%">| |
| 500 | 500 |
. $locale->text('Tax') . qq|</th>
|
| 501 |
<th class=listheading style="width:5%">| |
|
| 502 |
. $locale->text('Korrektur') . qq|</th>
|
|
| 503 | 501 |
<th class=listheading style="width:10%">| |
| 504 | 502 |
. $locale->text('Taxkey') . qq|</th>
|
| 505 | 503 |
<th class=listheading style="width:10%">| |
| ... | ... | |
| 555 | 553 |
'-default' => $selected_taxchart)) |
| 556 | 554 |
. qq|</td>|; |
| 557 | 555 |
|
| 558 |
my $korrektur = $form->{"korrektur_$i"} ? 'checked' : '';
|
|
| 559 |
|
|
| 560 | 556 |
my $projectnumber = |
| 561 | 557 |
NTI($cgi->popup_menu('-name' => "project_id_$i",
|
| 562 | 558 |
'-values' => \@project_values, |
| ... | ... | |
| 567 | 563 |
<tr> |
| 568 | 564 |
<td>$selectAP_amount</td> |
| 569 | 565 |
<td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
|
| 570 |
<td><input name="tax_$i" size=10 value=$form->{"tax_$i"}></td>
|
|
| 571 |
<td><input type="checkbox" name="korrektur_$i" value="1" "$korrektur"></td> |
|
| 566 |
<td><input type="hidden" name="tax_$i" value="$form->{"tax_$i"}">$form->{"tax_$i"}</td>
|
|
| 572 | 567 |
$tax |
| 573 | 568 |
<td>$projectnumber</td> |
| 574 | 569 |
</tr> |
| ... | ... | |
| 869 | 864 |
if ($form->{"amount_$i"}) {
|
| 870 | 865 |
push @a, {};
|
| 871 | 866 |
$j = $#a; |
| 872 |
if (!$form->{"korrektur_$i"}) {
|
|
| 873 |
($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
|
|
| 874 |
if ($taxkey > 1) {
|
|
| 875 |
if ($form->{taxincluded}) {
|
|
| 876 |
$form->{"tax_$i"} = $form->{"amount_$i"} / ($rate + 1) * $rate;
|
|
| 877 |
} else {
|
|
| 878 |
$form->{"tax_$i"} = $form->{"amount_$i"} * $rate;
|
|
| 879 |
} |
|
| 867 |
($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
|
|
| 868 |
if ($taxkey > 1) {
|
|
| 869 |
if ($form->{taxincluded}) {
|
|
| 870 |
$form->{"tax_$i"} = $form->{"amount_$i"} / ($rate + 1) * $rate;
|
|
| 880 | 871 |
} else {
|
| 881 |
$form->{"tax_$i"} = 0;
|
|
| 872 |
$form->{"tax_$i"} = $form->{"amount_$i"} * $rate;
|
|
| 882 | 873 |
} |
| 874 |
} else {
|
|
| 875 |
$form->{"tax_$i"} = 0;
|
|
| 883 | 876 |
} |
| 884 | 877 |
$form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"}, 2);
|
| 885 | 878 |
|
| bin/mozilla/ar.pl | ||
|---|---|---|
| 214 | 214 |
my ($title, $readonly, $exchangerate, $rows); |
| 215 | 215 |
my ($taxincluded, $notes, $department, $customer, $employee, $amount, $project); |
| 216 | 216 |
my ($jsscript, $button1, $button2, $onload); |
| 217 |
my ($selectAR_amount, $selectAR_paid, $korrektur_checked, $ARselected, $tax);
|
|
| 217 |
my ($selectAR_amount, $selectAR_paid, $ARselected, $tax); |
|
| 218 | 218 |
my (@column_index, %column_data); |
| 219 | 219 |
|
| 220 | 220 |
|
| ... | ... | |
| 544 | 544 |
<th class=listheading style="width:10%">| |
| 545 | 545 |
. $locale->text('Tax') . qq|</th>
|
| 546 | 546 |
<th class=listheading style="width:5%">| |
| 547 |
. $locale->text('Korrektur') . qq|</th>
|
|
| 548 |
<th class=listheading style="width:10%">| |
|
| 549 | 547 |
. $locale->text('Taxkey') . qq|</th>
|
| 550 | 548 |
<th class=listheading style="width:10%">| |
| 551 | 549 |
. $locale->text('Project') . qq|</th>
|
| ... | ... | |
| 600 | 598 |
'-default' => $selected_taxchart)) |
| 601 | 599 |
. qq|</td>|; |
| 602 | 600 |
|
| 603 |
$korrektur_checked = ($form->{"korrektur_$i"} ? 'checked' : '');
|
|
| 604 |
|
|
| 605 | 601 |
my $projectnumber = |
| 606 | 602 |
NTI($cgi->popup_menu('-name' => "project_id_$i",
|
| 607 | 603 |
'-values' => \@project_values, |
| ... | ... | |
| 612 | 608 |
<tr> |
| 613 | 609 |
<td>$selectAR_amount</td> |
| 614 | 610 |
<td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
|
| 615 |
<td><input name="tax_$i" size=10 value=$form->{"tax_$i"}></td>
|
|
| 616 |
<td><input type="checkbox" name="korrektur_$i" value="1" $korrektur_checked></td> |
|
| 611 |
<td><input type="hidden" name="tax_$i" value="$form->{"tax_$i"}">$form->{"tax_$i"}</td>
|
|
| 617 | 612 |
$tax |
| 618 | 613 |
<td>$projectnumber</td> |
| 619 | 614 |
</tr> |
| ... | ... | |
| 932 | 927 |
if ($form->{"amount_$i"}) {
|
| 933 | 928 |
push @a, {};
|
| 934 | 929 |
my $j = $#a; |
| 935 |
if (!$form->{"korrektur_$i"}) {
|
|
| 936 |
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
|
|
| 937 |
if ($taxkey > 1) {
|
|
| 938 |
if ($form->{taxincluded}) {
|
|
| 939 |
$form->{"tax_$i"} = $form->{"amount_$i"} / ($rate + 1) * $rate;
|
|
| 940 |
} else {
|
|
| 941 |
$form->{"tax_$i"} = $form->{"amount_$i"} * $rate;
|
|
| 942 |
} |
|
| 930 |
my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
|
|
| 931 |
if ($taxkey > 1) {
|
|
| 932 |
if ($form->{taxincluded}) {
|
|
| 933 |
$form->{"tax_$i"} = $form->{"amount_$i"} / ($rate + 1) * $rate;
|
|
| 943 | 934 |
} else {
|
| 944 |
$form->{"tax_$i"} = 0;
|
|
| 935 |
$form->{"tax_$i"} = $form->{"amount_$i"} * $rate;
|
|
| 945 | 936 |
} |
| 937 |
} else {
|
|
| 938 |
$form->{"tax_$i"} = 0;
|
|
| 946 | 939 |
} |
| 947 | 940 |
$form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"}, 2);
|
| 948 | 941 |
|
| 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"} }
|
| locale/de/all | ||
|---|---|---|
| 785 | 785 |
'Keine Suchergebnisse gefunden!' => 'Keine Suchergebnisse gefunden!', |
| 786 | 786 |
'Konten' => 'Konten', |
| 787 | 787 |
'Kontonummernerweiterung (KNE)' => 'Kontonummernerweiterung (KNE)', |
| 788 |
'Korrektur' => 'Korrektur', |
|
| 789 | 788 |
'L' => 'L', |
| 790 | 789 |
'LP' => 'LP', |
| 791 | 790 |
'LaTeX Templates' => 'LaTeX-Vorlagen', |
| locale/de/ap | ||
|---|---|---|
| 115 | 115 |
'July' => 'Juli', |
| 116 | 116 |
'Jun' => 'Jun', |
| 117 | 117 |
'June' => 'Juni', |
| 118 |
'Korrektur' => 'Korrektur', |
|
| 119 | 118 |
'MAILED' => 'Gesendet', |
| 120 | 119 |
'Manage license keys' => 'Lizenzschlüssel verwalten', |
| 121 | 120 |
'Mar' => 'M?rz', |
| locale/de/ar | ||
|---|---|---|
| 119 | 119 |
'July' => 'Juli', |
| 120 | 120 |
'Jun' => 'Jun', |
| 121 | 121 |
'June' => 'Juni', |
| 122 |
'Korrektur' => 'Korrektur', |
|
| 123 | 122 |
'MAILED' => 'Gesendet', |
| 124 | 123 |
'Manage license keys' => 'Lizenzschlüssel verwalten', |
| 125 | 124 |
'Mar' => 'M?rz', |
| locale/de/gl | ||
|---|---|---|
| 111 | 111 |
'July' => 'Juli', |
| 112 | 112 |
'Jun' => 'Jun', |
| 113 | 113 |
'June' => 'Juni', |
| 114 |
'Korrektur' => 'Korrektur', |
|
| 115 | 114 |
'Liability' => 'Passiva/Mittelherkunft', |
| 116 | 115 |
'MAILED' => 'Gesendet', |
| 117 | 116 |
'Manage license keys' => 'Lizenzschlüssel verwalten', |
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.