projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
309d139
)
ZUGFeRD: Steuerwerte pro Steuer, nicht pro Steuerkonto ausweisen
author
Bernd Bleßmann
<bernd@kivitendo-premium.de>
Wed, 24 Jun 2020 14:52:20 +0000
(16:52 +0200)
committer
Bernd Bleßmann
<bernd@kivitendo-premium.de>
Wed, 24 Jun 2020 14:52:20 +0000
(16:52 +0200)
SL/DB/Helper/ZUGFeRD.pm
patch
|
blob
|
history
diff --git
a/SL/DB/Helper/ZUGFeRD.pm
b/SL/DB/Helper/ZUGFeRD.pm
index
99e0825
..
7ab425d
100644
(file)
--- a/
SL/DB/Helper/ZUGFeRD.pm
+++ b/
SL/DB/Helper/ZUGFeRD.pm
@@
-214,7
+214,6
@@
sub _taxes {
$info->{taxkey} //= SL::DB::TaxKey->load_cached($item->{taxkey_id});
$info->{tax} //= SL::DB::Tax->load_cached($info->{taxkey}->tax_id);
$info->{linetotal} += $item->{linetotal};
$info->{taxkey} //= SL::DB::TaxKey->load_cached($item->{taxkey_id});
$info->{tax} //= SL::DB::Tax->load_cached($info->{taxkey}->tax_id);
$info->{linetotal} += $item->{linetotal};
- $info->{tax_amount} += $item->{tax_amount};
}
foreach my $taxkey_id (sort keys %taxkey_info) {
}
foreach my $taxkey_id (sort keys %taxkey_info) {
@@
-223,7
+222,7
@@
sub _taxes {
# <ram:ApplicableTradeTax>
$params{xml}->startTag("ram:ApplicableTradeTax");
# <ram:ApplicableTradeTax>
$params{xml}->startTag("ram:ApplicableTradeTax");
- $params{xml}->dataElement("ram:CalculatedAmount", _r2($params{ptc_data}->{taxes
}->{$info->{tax}->{chart_id}
}));
+ $params{xml}->dataElement("ram:CalculatedAmount", _r2($params{ptc_data}->{taxes
_by_tax_id}->{$info->{taxkey}->tax_id
}));
$params{xml}->dataElement("ram:TypeCode", "VAT");
$params{xml}->dataElement("ram:BasisAmount", _r2($info->{linetotal}));
$params{xml}->dataElement("ram:CategoryCode", $tax_info{code});
$params{xml}->dataElement("ram:TypeCode", "VAT");
$params{xml}->dataElement("ram:BasisAmount", _r2($info->{linetotal}));
$params{xml}->dataElement("ram:CategoryCode", $tax_info{code});