projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfix bei Artikelstammdaten: Beim erneuten Aufrufen des Sprachenfensters wurden...
[kivitendo-erp.git]
/
SL
/
RP.pm
diff --git
a/SL/RP.pm
b/SL/RP.pm
index
21b199e
..
19af9d8
100644
(file)
--- a/
SL/RP.pm
+++ b/
SL/RP.pm
@@
-800,7
+800,7
@@
sub trial_balance {
# but we use the same function to collect information
if ($form->{project_id}) {
# but we use the same function to collect information
if ($form->{project_id}) {
- $project = qq| AND ac.project_id = | . conv_i($form->{project_id}, 'NULL') . qq|) |;
+ $project = qq| AND
(
ac.project_id = | . conv_i($form->{project_id}, 'NULL') . qq|) |;
}
# get beginning balances
}
# get beginning balances
@@
-980,6
+980,7
@@
sub trial_balance {
$project
AND ac.amount > 0
AND c.accno = ?) AS credit |;
$project
AND ac.amount > 0
AND c.accno = ?) AS credit |;
+
$drcr = prepare_query($form, $dbh, $q_drcr);
if ($form->{project_id}) {
$drcr = prepare_query($form, $dbh, $q_drcr);
if ($form->{project_id}) {
@@
-1641,7
+1642,7
@@
sub bwa {
$form->{ "$key" . "neutraleraufwand" } +
$form->{ "$key" . "neutralertrag" };
$form->{ "$key" . "ergebnis" } =
$form->{ "$key" . "neutraleraufwand" } +
$form->{ "$key" . "neutralertrag" };
$form->{ "$key" . "ergebnis" } =
- $form->{ "$key" . "ergebnisvorsteuern" }
+
$form->{35}{$key};
+ $form->{ "$key" . "ergebnisvorsteuern" }
-
$form->{35}{$key};
if ($form->{ "$key" . "gesamtleistung" } > 0) {
foreach $category (@categories) {
if ($form->{ "$key" . "gesamtleistung" } > 0) {
foreach $category (@categories) {