Part Controller - Helper Funktionen für linetotals

diff --git a/SL/DB/Assembly.pm b/SL/DB/Assembly.pm
index a77e34b54e75dee6c0f16b00843e79cf18b2ace6..2519c1a459f128ffdb60c591f6577354c1ce2f69 100644 (file)
--- a/SL/DB/Assembly.pm
+++ b/SL/DB/Assembly.pm
@@ -12,7 +12,7 @@ __PACKAGE__->meta->make_manager_class;
 
 __PACKAGE__->meta->initialize;
 
 
 __PACKAGE__->meta->initialize;
 

-sub linetotal {
+sub linetotal_sellprice {

   my ($self) = @_;
 
   return 0 unless $self->qty > 0 and $self->part->sellprice > 0;
   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 1f53f969f041587bca1ad4e4ce1e5a6508cc25b4..4aca0c1b4541824a38a6af0a468d1e2deed21e8e 100644 (file)
--- a/SL/DB/AssortmentItem.pm
+++ b/SL/DB/AssortmentItem.pm
@@ -11,7 +11,7 @@ use Rose::DB::Object::Helpers qw(clone);
 
 __PACKAGE__->meta->initialize;
 
 
 __PACKAGE__->meta->initialize;
 

-sub linetotal {
+sub linetotal_sellprice {

   my ($self) = @_;
 
   return 0 unless $self->qty > 0 and $self->part->sellprice > 0;
   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 32571276b9acc4d924dd8ab3354153f67561a0ec..be6851eece7ce277b010d4b01ce300cbc695081a 100644 (file)
--- 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;
   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;
 };
 
 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;
 };
 
 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;
 };
 
 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;
 };
 
 1;