Revision 5e59cc54
Von Udo Spallek vor fast 18 Jahren hinzugefügt
| SL/IS.pm | ||
|---|---|---|
| 365 | 365 |
$tax += $taxamount = $form->round_amount($taxaccounts{$item}, 2);
|
| 366 | 366 |
|
| 367 | 367 |
push(@{ $form->{tax} }, $form->format_amount($myconfig, $taxamount, 2));
|
| 368 |
push(@{ $form->{taxdescription} }, $form->{"${item}_description"});
|
|
| 368 |
push(@{ $form->{taxdescription} }, $form->{"${item}_description"} . q{ } . 100 * $form->{"${item}_rate"} . q{%});
|
|
| 369 | 369 |
push(@{ $form->{taxrate} },
|
| 370 | 370 |
$form->format_amount($myconfig, $form->{"${item}_rate"} * 100));
|
| 371 | 371 |
push(@{ $form->{taxnumber} }, $form->{"${item}_taxnumber"});
|
| SL/OE.pm | ||
|---|---|---|
| 1167 | 1167 |
$tax += $taxamount = $form->round_amount($taxaccounts{$item}, 2);
|
| 1168 | 1168 |
|
| 1169 | 1169 |
push(@{ $form->{tax} }, $form->format_amount($myconfig, $taxamount, 2));
|
| 1170 |
push(@{ $form->{taxdescription} }, $form->{"${item}_description"});
|
|
| 1170 |
push(@{ $form->{taxdescription} }, $form->{"${item}_description"} . q{ } . 100 * $form->{"${item}_rate"} . q{%});
|
|
| 1171 | 1171 |
push(@{ $form->{taxrate} },
|
| 1172 | 1172 |
$form->format_amount($myconfig, $form->{"${item}_rate"} * 100));
|
| 1173 | 1173 |
push(@{ $form->{taxnumber} }, $form->{"${item}_taxnumber"});
|
| bin/mozilla/ir.pl | ||
|---|---|---|
| 558 | 558 |
|
| 559 | 559 |
$tax .= qq| |
| 560 | 560 |
<tr> |
| 561 |
<th align=right>$form->{"${item}_description"}</th>
|
|
| 561 |
<th align=right>$form->{"${item}_description"} |
|
|
| 562 |
. $form->{"${item}_rate"} * 100 .qq|%</th>
|
|
| 562 | 563 |
<td align=right>$form->{"${item}_total"}</td>
|
| 563 | 564 |
</tr> |
| 564 | 565 |
|; |
| ... | ... | |
| 599 | 600 |
|
| 600 | 601 |
$tax .= qq| |
| 601 | 602 |
<tr> |
| 602 |
<th align=right>Enthaltene $form->{"${item}_description"}</th>
|
|
| 603 |
<th align=right>Enthaltene $form->{"${item}_description"} |
|
|
| 604 |
. $form->{"${item}_rate"} * 100 .qq|%</th>
|
|
| 603 | 605 |
<td align=right>$form->{"${item}_total"}</td>
|
| 604 | 606 |
</tr> |
| 605 | 607 |
<tr> |
| bin/mozilla/is.pl | ||
|---|---|---|
| 856 | 856 |
|
| 857 | 857 |
$tax .= qq| |
| 858 | 858 |
<tr> |
| 859 |
<th align=right>$form->{"${item}_description"}</th>
|
|
| 859 |
<th align=right>$form->{"${item}_description"} |
|
|
| 860 |
. $form->{"${item}_rate"} * 100 .qq|%</th>
|
|
| 860 | 861 |
<td align=right>$form->{"${item}_total"}</td>
|
| 861 | 862 |
</tr> |
| 862 | 863 |
|; |
| ... | ... | |
| 895 | 896 |
|
| 896 | 897 |
$tax .= qq| |
| 897 | 898 |
<tr> |
| 898 |
<th align=right>Enthaltene $form->{"${item}_description"}</th>
|
|
| 899 |
<th align=right>Enthaltene $form->{"${item}_description"} |
|
|
| 900 |
. $form->{"${item}_rate"} * 100 .qq|%</th>
|
|
| 899 | 901 |
<td align=right>$form->{"${item}_total"}</td>
|
| 900 | 902 |
</tr> |
| 901 | 903 |
<tr> |
| bin/mozilla/oe.pl | ||
|---|---|---|
| 891 | 891 |
|
| 892 | 892 |
$tax .= qq| |
| 893 | 893 |
<tr> |
| 894 |
<th align=right>$form->{"${item}_description"}</th>
|
|
| 894 |
<th align=right>$form->{"${item}_description"} |
|
|
| 895 |
. $form->{"${item}_rate"} * 100 .qq|%</th>
|
|
| 895 | 896 |
<td align=right>$form->{"${item}_total"}</td>
|
| 896 | 897 |
</tr> |
| 897 | 898 |
|; |
| ... | ... | |
| 930 | 931 |
|
| 931 | 932 |
$tax .= qq| |
| 932 | 933 |
<tr> |
| 933 |
<th align=right>Enthaltene $form->{"${item}_description"}</th>
|
|
| 934 |
<th align=right>Enthaltene $form->{"${item}_description"} |
|
|
| 935 |
. $form->{"${item}_rate"} * 100 .qq|%</th>
|
|
| 934 | 936 |
<td align=right>$form->{"${item}_total"}</td>
|
| 935 | 937 |
</tr> |
| 936 | 938 |
<tr> |
| sql/Pg-upgrade2/tax_description_without_percentage.sql | ||
|---|---|---|
| 1 |
-- @tag: tax_description_without_percentage |
|
| 2 |
-- @description: SKR03: Die Prozentangaben aus der tax.taxdescription entfernen. (Unter Ber?cksichtigung der Druckausgabe.) |
|
| 3 |
-- @depends: fix_taxdescription |
|
| 4 |
|
|
| 5 |
|
|
| 6 |
|
|
| 7 |
--############################################################# |
|
| 8 |
--# |
|
| 9 |
--# Taxdescription setzen |
|
| 10 |
--# |
|
| 11 |
--############################################################# |
|
| 12 |
|
|
| 13 |
UPDATE tax SET |
|
| 14 |
taxdescription = 'USt-frei' |
|
| 15 |
WHERE taxkey = '1' |
|
| 16 |
AND |
|
| 17 |
EXISTS ( -- update only for SKR03 |
|
| 18 |
SELECT coa FROM defaults |
|
| 19 |
WHERE defaults.coa='Germany-DATEV-SKR03EU' |
|
| 20 |
) |
|
| 21 |
; |
|
| 22 |
|
|
| 23 |
UPDATE tax SET |
|
| 24 |
taxdescription = 'Umsatzsteuer' |
|
| 25 |
WHERE taxkey = '2' |
|
| 26 |
AND |
|
| 27 |
EXISTS ( -- update only for SKR03 |
|
| 28 |
SELECT coa FROM defaults |
|
| 29 |
WHERE defaults.coa='Germany-DATEV-SKR03EU' |
|
| 30 |
) |
|
| 31 |
; |
|
| 32 |
|
|
| 33 |
UPDATE tax SET |
|
| 34 |
taxdescription = 'Umsatzsteuer' |
|
| 35 |
WHERE taxkey = '3' |
|
| 36 |
AND |
|
| 37 |
EXISTS ( -- update only for SKR03 |
|
| 38 |
SELECT coa FROM defaults |
|
| 39 |
WHERE defaults.coa='Germany-DATEV-SKR03EU' |
|
| 40 |
) |
|
| 41 |
; |
|
| 42 |
|
|
| 43 |
|
|
| 44 |
UPDATE tax SET |
|
| 45 |
taxdescription = 'Vorsteuer' |
|
| 46 |
WHERE taxkey = '8' |
|
| 47 |
AND |
|
| 48 |
EXISTS ( -- update only for SKR03 |
|
| 49 |
SELECT coa FROM defaults |
|
| 50 |
WHERE defaults.coa='Germany-DATEV-SKR03EU' |
|
| 51 |
) |
|
| 52 |
; |
|
| 53 |
|
|
| 54 |
UPDATE tax SET |
|
| 55 |
taxdescription = 'Vorsteuer' |
|
| 56 |
WHERE taxkey = '9' |
|
| 57 |
AND |
|
| 58 |
EXISTS ( -- update only for SKR03 |
|
| 59 |
SELECT coa FROM defaults |
|
| 60 |
WHERE defaults.coa='Germany-DATEV-SKR03EU' |
|
| 61 |
) |
|
| 62 |
; |
|
| 63 |
|
|
| 64 |
UPDATE tax SET |
|
| 65 |
taxdescription = 'Im anderen EU-Staat steuerpflichtige Lieferung' |
|
| 66 |
WHERE taxkey = '10' |
|
| 67 |
AND |
|
| 68 |
EXISTS ( -- update only for SKR03 |
|
| 69 |
SELECT coa FROM defaults |
|
| 70 |
WHERE defaults.coa='Germany-DATEV-SKR03EU' |
|
| 71 |
) |
|
| 72 |
; |
|
| 73 |
|
|
| 74 |
UPDATE tax SET |
|
| 75 |
taxdescription = 'Steuerfreie innergem. Lieferung an Abnehmer mit Id.-Nr.' |
|
| 76 |
WHERE taxkey = '11' |
|
| 77 |
AND |
|
| 78 |
EXISTS ( -- update only for SKR03 |
|
| 79 |
SELECT coa FROM defaults |
|
| 80 |
WHERE defaults.coa='Germany-DATEV-SKR03EU' |
|
| 81 |
) |
|
| 82 |
; |
|
| 83 |
|
|
| 84 |
UPDATE tax SET |
|
| 85 |
taxdescription = 'Steuerpflichtige EG-Lieferung zum erm??igten Steuersatz' |
|
| 86 |
WHERE taxkey = '12' |
|
| 87 |
AND |
|
| 88 |
EXISTS ( -- update only for SKR03 |
|
| 89 |
SELECT coa FROM defaults |
|
| 90 |
WHERE defaults.coa='Germany-DATEV-SKR03EU' |
|
| 91 |
) |
|
| 92 |
; |
|
| 93 |
|
|
| 94 |
|
|
| 95 |
UPDATE tax SET |
|
| 96 |
taxdescription = 'Steuerpflichtige EG-Lieferung zum vollen Steuersatz' |
|
| 97 |
WHERE taxkey = '13' |
|
| 98 |
AND |
|
| 99 |
EXISTS ( -- update only for SKR03 |
|
| 100 |
SELECT coa FROM defaults |
|
| 101 |
WHERE defaults.coa='Germany-DATEV-SKR03EU' |
|
| 102 |
) |
|
| 103 |
; |
|
| 104 |
|
|
| 105 |
|
|
| 106 |
UPDATE tax SET |
|
| 107 |
taxdescription = 'Steuerpflichtiger innergem. Erwerb zum erm??igten Steuersatz' |
|
| 108 |
WHERE taxkey = '18' |
|
| 109 |
AND |
|
| 110 |
EXISTS ( -- update only for SKR03 |
|
| 111 |
SELECT coa FROM defaults |
|
| 112 |
WHERE defaults.coa='Germany-DATEV-SKR03EU' |
|
| 113 |
) |
|
| 114 |
; |
|
| 115 |
|
|
| 116 |
UPDATE tax SET |
|
| 117 |
taxdescription = 'Steuerpflichtiger innergem. Erwerb zum vollen Steuersatz' |
|
| 118 |
WHERE taxkey = '19' |
|
| 119 |
AND |
|
| 120 |
EXISTS ( -- update only for SKR03 |
|
| 121 |
SELECT coa FROM defaults |
|
| 122 |
WHERE defaults.coa='Germany-DATEV-SKR03EU' |
|
| 123 |
) |
|
| 124 |
; |
|
Auch abrufbar als: Unified diff
Fix für r1967 (und r2002) : Steueranzeige unterhalb von Rechnungen, Angeboten, etc. an die neuen Taxkeys angepasst.
Der Steuersatz wird nicht mehr in der 'description' redundant gefuehrt, sondern aus der
'rate' generiert. Getestet bei den Eingabemasken
Verkauf: Rechnung, Gutschrift, Auftrag, Angebot
Einkauf: Einkaufsrechnung, Lieferantenauftrag, Preisanfrage
Fibu: Dialogbuchen, Debitorenbuchung, Kreditorenbuchung
und getestet bei allen LATEX- und sofern vorhanden HTML-Ausgaben der jeweiligen Masken.