X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FOrderItem.pm;h=5fcb8be2ac1295f8099d2ba385382df608017070;hb=deb4d2dbb676d7d6f69dfe7815d6e0cb09bd4a44;hp=6ab16ac2a92c72cf74ed9c2c519be2b1e075fc5a;hpb=4247547d2a925ddad7006cae89e5f9f1fda7d469;p=kivitendo-erp.git diff --git a/SL/DB/OrderItem.pm b/SL/DB/OrderItem.pm index 6ab16ac2a..5fcb8be2a 100644 --- a/SL/DB/OrderItem.pm +++ b/SL/DB/OrderItem.pm @@ -9,6 +9,7 @@ use SL::DB::Manager::OrderItem; use SL::DB::DeliveryOrderItemsStock; use SL::DB::Helper::ActsAsList; use SL::DB::Helper::LinkedRecords; +use SL::DB::Helper::RecordItem; use SL::DB::Helper::CustomVariables ( sub_module => 'orderitems', cvars_alias => 1, @@ -39,58 +40,51 @@ sub shipped_qty { return sum(map { AM->convert_unit($_->unit => $self->unit) * $_->qty } @doi); } -sub delivered_qty { - my ($self) = @_; +sub record { goto &order } - return $self->_delivered_qty; -} +1; -sub _delivered_qty { - my ($self) = @_; +__END__ - return $self->{delivered_qty} if $self->{delivered_qty}; +=pod - my $d_orders = $self->order->linked_records(direction => 'to', to => 'SL::DB::DeliveryOrder'); +=head1 NAME - my @d_orders_delivered = grep { $_->delivered } @$d_orders; +SL::DB::OrderItems: Rose model for orderitems - my @doi_delivered = grep { $_->parts_id == $self->parts_id } map { $_->orderitems } @d_orders_delivered; +=head1 FUNCTIONS - require SL::AM; - $self->{delivered_qty} = sum(map { AM->convert_unit($_->unit => $self->unit) * $_->qty } @doi_delivered); +=over 4 - return $self->{delivered_qty}; -} +=item C -sub value_of_goods { - my ($self) = @_; +returns the number of orderitems which are already linked to Delivery Orders. +The linked key is parts_id and not orderitems (id) -> delivery_order_items (id). +Therefore this function is not safe for identical parts_id. +Sample call: +C<$::form-Eformat_amount(\%::myconfig, $_[0]-Eshipped_qty);> - my $price_factor = $self->price_factor || 1; +=back - $self->_delivered_qty; - return ($self->_delivered_qty * $self->sellprice * (1 - $self->discount ) / $price_factor); -} +=head1 TODO -sub stocked_qty { - my ($self) = @_; +Older versions of OrderItem.pm had more functions which where used for calculating the +qty for the different states of the Delivery Order. +For example to get the qty in already marked as delivered Delivery Orders: - my $d_orders = $self->order->linked_records(direction => 'to', to => 'SL::DB::DeliveryOrder'); - my @doi = grep { $_->parts_id == $self->parts_id } map { $_->orderitems } @$d_orders; +C - return 0 if !@doi; +return $self-E_delivered_qty; - my $doi_stocks = SL::DB::Manager::DeliveryOrderItemsStock->get_all(query => [delivery_order_item_id => [ map {$_->id} @doi ]]); + sub _delivered_qty { + (..) + my @d_orders_delivered = grep { $_-Edelivered } @$d_orders; + my @doi_delivered = grep { $_-Eparts_id == $self-Eparts_id } map { $_-Eorderitems } @d_orders_delivered; + } - require SL::AM; - return sum(map { AM->convert_unit($_->unit => $self->unit) * $_->qty } @{ $doi_stocks }); -} +In general the function C and all (project) related functions should be marked deprecate, + because of the better linked item to item data in the record_links table. -sub taxincluded { - my ($self) = @_; - return SL::DB::Manager::Order->find_by(id => $self->trans_id)->taxincluded ? $::locale->text('WARN: Tax included value!') : ''; -} -sub record { goto &order } -1;