projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge von 765,768 aus unstable: Bugfix 242 Punkt 3/4
[kivitendo-erp.git]
/
SL
/
RP.pm
diff --git
a/SL/RP.pm
b/SL/RP.pm
index
6c32832
..
c01a442
100644
(file)
--- a/
SL/RP.pm
+++ b/
SL/RP.pm
@@
-2088,7
+2088,7
@@
sub tax_report {
my $ml = ($form->{db} eq 'ar') ? 1 : -1;
my $sortorder = join ', ', $form->sort_columns(qw(transdate invnumber name));
my $ml = ($form->{db} eq 'ar') ? 1 : -1;
my $sortorder = join ', ', $form->sort_columns(qw(transdate invnumber name));
- $sortorder = $form->{sort}
unless $sortorder
;
+ $sortorder = $form->{sort}
if $form->{sort}
;
$query = qq|SELECT a.id, '0' AS invoice, $transdate AS transdate,
a.invnumber, n.name, a.netamount,
$query = qq|SELECT a.id, '0' AS invoice, $transdate AS transdate,
a.invnumber, n.name, a.netamount,
@@
-2247,7
+2247,8
@@
sub payments {
my $sortorder = join ', ',
$form->sort_columns(qw(name invnumber ordnumber transdate source));
my $sortorder = join ', ',
$form->sort_columns(qw(name invnumber ordnumber transdate source));
-
+ $sortorder = $form->{sort} if $form->{sort};
+
# cycle through each id
foreach my $accno (split(/ /, $form->{paymentaccounts})) {
# cycle through each id
foreach my $accno (split(/ /, $form->{paymentaccounts})) {
@@
-2343,11
+2344,7
@@
sub bwa {
foreach $key (@periods) {
$form->{ "$key" . "gesamtleistung" } = 0;
$form->{ "$key" . "gesamtkosten" } = 0;
foreach $key (@periods) {
$form->{ "$key" . "gesamtleistung" } = 0;
$form->{ "$key" . "gesamtkosten" } = 0;
- foreach $kosten (@gesamtkosten) {
- $form->{$kosten}{$key} *= -1;
- }
-
- $form->{4}{$key} *= -1;
+
foreach $category (@categories) {
foreach $category (@categories) {
@@
-2362,7
+2359,6
@@
sub bwa {
$form->{ "$key" . "gesamtleistung" } += $form->{$item}{$key};
}
foreach $item (@gesamtkosten) {
$form->{ "$key" . "gesamtleistung" } += $form->{$item}{$key};
}
foreach $item (@gesamtkosten) {
- $form->{$item}{$key} *= -1;
$form->{ "$key" . "gesamtkosten" } += $form->{$item}{$key};
}
$form->{ "$key" . "rohertrag" } =
$form->{ "$key" . "gesamtkosten" } += $form->{$item}{$key};
}
$form->{ "$key" . "rohertrag" } =
@@
-2378,8
+2374,8
@@
sub bwa {
$form->{32}{$key} + $form->{33}{$key} + $form->{34}{$key};
$form->{ "$key" . "ergebnisvorsteuern" } =
$form->{ "$key" . "betriebsergebnis" } -
$form->{32}{$key} + $form->{33}{$key} + $form->{34}{$key};
$form->{ "$key" . "ergebnisvorsteuern" } =
$form->{ "$key" . "betriebsergebnis" } -
-
(
$form->{ "$key" . "neutraleraufwand" } +
- $form->{ "$key" . "neutralertrag" }
)
;
+ $form->{ "$key" . "neutraleraufwand" } +
+ $form->{ "$key" . "neutralertrag" };
$form->{ "$key" . "ergebnis" } =
$form->{ "$key" . "ergebnisvorsteuern" } + $form->{35}{$key};
$form->{ "$key" . "ergebnis" } =
$form->{ "$key" . "ergebnisvorsteuern" } + $form->{35}{$key};