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:
598383b
)
Auftrags-Controller: Wechselkurs: Preis beim Hinzufügen eines Artikels umrechnen
author
Bernd Bleßmann
<bernd@kivitendo-premium.de>
Fri, 24 Jul 2020 12:03:34 +0000
(14:03 +0200)
committer
Bernd Bleßmann
<bernd@kivitendo-premium.de>
Mon, 27 Jul 2020 13:31:52 +0000
(15:31 +0200)
SL/Controller/Order.pm
patch
|
blob
|
history
diff --git
a/SL/Controller/Order.pm
b/SL/Controller/Order.pm
index
5d30492
..
18ce1eb
100644
(file)
--- a/
SL/Controller/Order.pm
+++ b/
SL/Controller/Order.pm
@@
-1044,9
+1044,11
@@
sub action_update_row_from_master_data {
$price_src = $price_source->best_price
? $price_source->best_price
: $price_source->price_from_source("");
$price_src = $price_source->best_price
? $price_source->best_price
: $price_source->price_from_source("");
+ $price_src->price($::form->round_amount($price_src->price / $self->order->exchangerate, 5)) if $self->order->exchangerate;
$price_src->price(0) if !$price_source->best_price;
}
$price_src->price(0) if !$price_source->best_price;
}
+
$item->sellprice($price_src->price);
$item->active_price_source($price_src);
$item->sellprice($price_src->price);
$item->active_price_source($price_src);
@@
-1463,8
+1465,9
@@
sub new_item {
$price_src->price($item->sellprice);
} else {
$price_src = $price_source->best_price
$price_src->price($item->sellprice);
} else {
$price_src = $price_source->best_price
- ? $price_source->best_price
- : $price_source->price_from_source("");
+ ? $price_source->best_price
+ : $price_source->price_from_source("");
+ $price_src->price($::form->round_amount($price_src->price / $record->exchangerate, 5)) if $record->exchangerate;
$price_src->price(0) if !$price_source->best_price;
}
$price_src->price(0) if !$price_source->best_price;
}