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:
b4d500d
)
Wechselkurs pro Angebot/Auftrag: In Angebots-/Auftragsbericht berücksichtigen
author
Bernd Bleßmann
<bernd@kivitendo-premium.de>
Mon, 27 Jul 2020 12:27:06 +0000
(14:27 +0200)
committer
Bernd Bleßmann
<bernd@kivitendo-premium.de>
Mon, 27 Jul 2020 13:31:52 +0000
(15:31 +0200)
SL/OE.pm
patch
|
blob
|
history
diff --git
a/SL/OE.pm
b/SL/OE.pm
index
144cb1c
..
418015e
100644
(file)
--- a/
SL/OE.pm
+++ b/
SL/OE.pm
@@
-121,9
+121,10
@@
sub transactions {
qq| o.closed, o.delivered, o.quonumber, o.cusordnumber, o.shippingpoint, o.shipvia, | .
qq| o.transaction_description, | .
qq| o.marge_total, o.marge_percent, | .
qq| o.closed, o.delivered, o.quonumber, o.cusordnumber, o.shippingpoint, o.shipvia, | .
qq| o.transaction_description, | .
qq| o.marge_total, o.marge_percent, | .
+ qq| o.exchangerate, | .
qq| o.itime::DATE AS insertdate, | .
qq| department.description as department, | .
qq| o.itime::DATE AS insertdate, | .
qq| department.description as department, | .
- qq| ex.$rate AS exchangerate, | .
+ qq| ex.$rate AS
daily_
exchangerate, | .
qq| pt.description AS payment_terms, | .
qq| pr.projectnumber AS globalprojectnumber, | .
qq| e.name AS employee, s.name AS salesman, | .
qq| pt.description AS payment_terms, | .
qq| pr.projectnumber AS globalprojectnumber, | .
qq| e.name AS employee, s.name AS salesman, | .
@@
-384,7
+385,8
@@
SQL
$ref->{remaining_amount} = $ref->{amount} - $ref->{billed_amount};
$ref->{remaining_netamount} = $ref->{netamount} - $ref->{billed_netamount};
}
$ref->{remaining_amount} = $ref->{amount} - $ref->{billed_amount};
$ref->{remaining_netamount} = $ref->{netamount} - $ref->{billed_netamount};
}
- $ref->{exchangerate} = 1 unless $ref->{exchangerate};
+ $ref->{exchangerate} ||= $ref->{daily_exchangerate};
+ $ref->{exchangerate} ||= 1;
push @{ $form->{OE} }, $ref if $ref->{id} != $id{ $ref->{id} };
$id{ $ref->{id} } = $ref->{id};
}
push @{ $form->{OE} }, $ref if $ref->{id} != $id{ $ref->{id} };
$id{ $ref->{id} } = $ref->{id};
}