Merge branch 'test' of ../kivitendo-erp_20220811

[kivitendo-erp.git] / SL / DB / Inventory.pm

diff --git a/SL/DB/Inventory.pm b/SL/DB/Inventory.pm
index df78623..8557719 100644 (file)
--- a/SL/DB/Inventory.pm
+++ b/SL/DB/Inventory.pm
@@ -33,15 +33,14 @@ sub new_from {
 }
 
 sub new_from_delivery_order_stock {
-  my ($stock) = @_;
+  my ($class, $stock) = @_;
 
   my $project = $stock->delivery_order_item->effective_project;
 
-  return __PACKAGE__->new(
+  return $class->new(
     delivery_order_items_stock_id => $stock->id,
     parts_id                      => $stock->delivery_order_item->parts_id,
-    qty                           => $stock->unit->convert_to($stock->qty => $stock->delivery_order_item->part->unit_obj),
-    unit                          => $stock->delivery_order_item->part->unit_obj,
+    qty                           => $stock->unit_obj->convert_to($stock->qty => $stock->delivery_order_item->part->unit_obj),
     warehouse_id                  => $stock->warehouse_id,
     bin_id                        => $stock->bin_id,
     chargenumber                  => $stock->chargenumber,
@@ -76,7 +75,7 @@ sub _before_save_set_shippingdate {
 sub _before_save_set_employee {
   my ($self, %params) = @_;
 
-  return 1 if $self->emplyee_id;
+  return 1 if $self->employee_id;
 
   $self->employee(SL::DB::Manager::Employee->current);