From: G. Richardson <information@kivitendo-premium.de>
Date: Sun, 13 Nov 2016 10:28:28 +0000 (+0100)
Subject: Part Controller - Helper Funktionen für linetotals
X-Git-Tag: release-3.5.4~1883
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=d91dbc1f9799e5ebfb2a5746a99ba5cc842d6617;p=kivitendo-erp.git

Part Controller - Helper Funktionen für linetotals
---

diff --git a/SL/DB/Assembly.pm b/SL/DB/Assembly.pm
index a77e34b54..2519c1a45 100644
--- a/SL/DB/Assembly.pm
+++ b/SL/DB/Assembly.pm
@@ -12,7 +12,7 @@ __PACKAGE__->meta->make_manager_class;
 
 __PACKAGE__->meta->initialize;
 
-sub linetotal {
+sub linetotal_sellprice {
   my ($self) = @_;
 
   return 0 unless $self->qty > 0 and $self->part->sellprice > 0;
diff --git a/SL/DB/AssortmentItem.pm b/SL/DB/AssortmentItem.pm
index 1f53f969f..4aca0c1b4 100644
--- a/SL/DB/AssortmentItem.pm
+++ b/SL/DB/AssortmentItem.pm
@@ -11,7 +11,7 @@ use Rose::DB::Object::Helpers qw(clone);
 
 __PACKAGE__->meta->initialize;
 
-sub linetotal {
+sub linetotal_sellprice {
   my ($self) = @_;
 
   return 0 unless $self->qty > 0 and $self->part->sellprice > 0;
diff --git a/SL/DB/Part.pm b/SL/DB/Part.pm
index 32571276b..be6851eec 100644
--- a/SL/DB/Part.pm
+++ b/SL/DB/Part.pm
@@ -296,28 +296,28 @@ sub assembly_sellprice_sum {
   my ($self) = @_;
 
   return unless $self->is_assembly;
-  sum map { $_->linetotal } @{$self->part->assemblies};
+  sum map { $_->linetotal_sellprice } @{$self->assemblies};
 };
 
 sub assembly_lastcost_sum {
   my ($self) = @_;
 
   return unless $self->is_assembly;
-  sum map { $_->linetotal } @{$self->part->assemblies};
+  sum map { $_->linetotal_lastcost } @{$self->assemblies};
 };
 
 sub assortment_sellprice_sum {
   my ($self) = @_;
 
   return unless $self->is_assortment;
-  sum map { $_->linetotal } @{$self->part->assortment_items};
+  sum map { $_->linetotal_sellprice } @{$self->assortment_items};
 };
 
 sub assortment_lastcost_sum {
   my ($self) = @_;
 
   return unless $self->is_assortment;
-  sum map { $_->linetotal } @{$self->part->assortment_items};
+  sum map { $_->linetotal_lastcost } @{$self->assortment_items};
 };
 
 1;