projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auftrags-Controller: Preis und Rabatt immer rechtsbündig.
[kivitendo-erp.git]
/
SL
/
PriceSource
/
MasterData.pm
diff --git
a/SL/PriceSource/MasterData.pm
b/SL/PriceSource/MasterData.pm
index
e7ca2a3
..
1305f4b
100644
(file)
--- a/
SL/PriceSource/MasterData.pm
+++ b/
SL/PriceSource/MasterData.pm
@@
-31,6
+31,8
@@
sub price_from_source {
: do { die "unknown spec '$spec'" };
}
: do { die "unknown spec '$spec'" };
}
+sub discount_from_source { }
+
sub best_price {
$_[0]->record->is_sales
? $_[0]->make_sellprice
sub best_price {
$_[0]->record->is_sales
? $_[0]->make_sellprice
@@
-39,11
+41,15
@@
sub best_price {
sub best_discount { }
sub best_discount { }
+sub unit_mul {
+ $_[0]->record_item ? $_[0]->record_item->unit_multiplier : 1
+}
+
sub make_sellprice {
my ($self) = @_;
return SL::PriceSource::Price->new(
sub make_sellprice {
my ($self) = @_;
return SL::PriceSource::Price->new(
- price => $self->part->sellprice,
+ price => $self->part->sellprice
* $self->unit_mul
,
spec => 'sellprice',
description => t8('Sellprice'),
price_source => $self,
spec => 'sellprice',
description => t8('Sellprice'),
price_source => $self,
@@
-54,7
+60,7
@@
sub make_listprice {
my ($self) = @_;
return SL::PriceSource::Price->new(
my ($self) = @_;
return SL::PriceSource::Price->new(
- price => $self->part->listprice,
+ price => $self->part->listprice
* $self->unit_mul
,
spec => 'listprice',
description => t8('List Price'),
price_source => $self,
spec => 'listprice',
description => t8('List Price'),
price_source => $self,
@@
-65,7
+71,7
@@
sub make_lastcost {
my ($self) = @_;
return SL::PriceSource::Price->new(
my ($self) = @_;
return SL::PriceSource::Price->new(
- price => $self->part->lastcost,
+ price => $self->part->lastcost
* $self->unit_mul
,
spec => 'lastcost',
description => t8('Lastcost'),
price_source => $self,
spec => 'lastcost',
description => t8('Lastcost'),
price_source => $self,