DeliveryOrder: transfer_inventory fixes

diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm
index 1806c245fe4045f7ced95497c587d35873f5bf21..d7a0c90b3a137b6c92c2e18675655bd7f3ba5217 100644 (file)
--- a/SL/Controller/DeliveryOrder.pm
+++ b/SL/Controller/DeliveryOrder.pm
@@ -1059,9 +1059,9 @@ sub action_transfer_stock {
     $self->js->flash("error", t8("No stock to transfer"))->render;
   }
 
     $self->js->flash("error", t8("No stock to transfer"))->render;
   }
 

-  SL::DB->with_transaction(sub {
+  SL::DB->client->with_transaction(sub {

     $_->save for @transfer_requests;
     $_->save for @transfer_requests;

-    $self->order->update_attributes(deliverd => 1);
+    $self->order->update_attributes(delivered => 1);

   });
 
   $self->js->flash("info", t8("Stock transfered"))->render;
   });
 
   $self->js->flash("info", t8("Stock transfered"))->render;

diff --git a/SL/DB/DeliveryOrderItem.pm b/SL/DB/DeliveryOrderItem.pm
index a42dad5101114198c3488617f3d0d5a9371f9012..7850a6445576a8355885cb56631b29109a408f01 100644 (file)
--- a/SL/DB/DeliveryOrderItem.pm
+++ b/SL/DB/DeliveryOrderItem.pm
@@ -51,7 +51,7 @@ sub displayable_delivery_order_info {
 sub effective_project {
   my ($self) = @_;
 
 sub effective_project {
   my ($self) = @_;
 

-  $self->project // $self->delivery_order->project;
+  $self->project // $self->delivery_order->globalproject;

 }
 
 __END__
 }
 
 __END__

diff --git a/SL/DB/Inventory.pm b/SL/DB/Inventory.pm
index 3dccdd5f2a0c2888e4bdfa45dbfe1e925f6fda5d..8557719d54b5afa647d3a88ef3ed486a8e1212d0 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 {
 }
 
 sub new_from_delivery_order_stock {

-  my ($stock) = @_;
+  my ($class, $stock) = @_;

 
   my $project = $stock->delivery_order_item->effective_project;
 
 
   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,
     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,
     warehouse_id                  => $stock->warehouse_id,
     bin_id                        => $stock->bin_id,
     chargenumber                  => $stock->chargenumber,