X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=t%2Fwh%2Finventory.t;h=a10b9cf16bc7956daedc5a79fbeb75fd713764a6;hb=be076f02fed09b50c15c8ee8d0585542bd55347d;hp=1a6306d2c2599288e5e5ba4f5b0b56dd059eb19b;hpb=9687d2ce94190d858260e10dea0a882b77d3a9b6;p=kivitendo-erp.git

diff --git a/t/wh/inventory.t b/t/wh/inventory.t
index 1a6306d2c..a10b9cf16 100644
--- a/t/wh/inventory.t
+++ b/t/wh/inventory.t
@@ -1,12 +1,12 @@
 use strict;
 use Test::More;
+use Test::Exception;
 
 use lib 't';
 
 use SL::Dev::Part qw(new_part new_assembly);
 use SL::Dev::Inventory qw(create_warehouse_and_bins set_stock);
 use SL::Dev::Record qw(create_sales_order);
-use SL::DB::Helper::Reservation qw(make_reservation);
 
 use_ok 'Support::TestSetup';
 use_ok 'SL::DB::Bin';
@@ -18,7 +18,7 @@ use_ok 'SL::Helper::Inventory';
 
 Support::TestSetup::login();
 
-my ($wh, $bin1, $bin2, $assembly1);
+my ($wh, $bin1, $bin2, $assembly1, $part1, $part2);
 
 reset_db();
 create_standard_stock();
@@ -26,18 +26,18 @@ create_standard_stock();
 
 # simple stock in, get_stock, get_onhand
 set_stock(
-  part => $assembly1,
+  part => $part1,
   qty => 25,
   bin => $bin1,
 );
 
-is(SL::Helper::Inventory::get_stock(part => $assembly1), "25.00000", 'simple get_stock works');
-is(SL::Helper::Inventory::get_onhand(part => $assembly1), "25.00000", 'simple get_onhand works');
+is(SL::Helper::Inventory::get_stock(part => $part1), "25.00000", 'simple get_stock works');
+is(SL::Helper::Inventory::get_onhand(part => $part1), "25.00000", 'simple get_onhand works');
 
 # stock on some more, get_stock, get_onhand
 
 WH->transfer({
-  parts_id          => $assembly1->id,
+  parts_id          => $part1->id,
   qty               => 15,
   transfer_type     => 'stock',
   dst_warehouse_id  => $bin1->warehouse_id,
@@ -46,7 +46,7 @@ WH->transfer({
 });
 
 WH->transfer({
-  parts_id          => $assembly1->id,
+  parts_id          => $part1->id,
   qty               => 20,
   transfer_type     => 'stock',
   chargenumber      => '298345',
@@ -55,27 +55,13 @@ WH->transfer({
   comment           => 'more',
 });
 
-is(SL::Helper::Inventory::get_stock(part => $assembly1), "60.00000", 'normal get_stock works');
-is(SL::Helper::Inventory::get_onhand(part => $assembly1), "60.00000", 'normal get_onhand works');
-
-# reserve some of it, get_stock, get_onhand
-
-my $order = create_sales_order(save => 1);
-
-make_reservation(
-  part        => $assembly1,
-  bin         => $bin1,
-  reserve_for => $order,
-  qty         => 25,
-);
-
-is(WH->get_stock_(part => $assembly1), "60.00000", 'normal get_stock works');
-is(WH->get_onhand_(part => $assembly1), "35.00000", 'normal get_onhand works');
+is(SL::Helper::Inventory::get_stock(part => $part1), "60.00000", 'normal get_stock works');
+is(SL::Helper::Inventory::get_onhand(part => $part1), "60.00000", 'normal get_onhand works');
 
 # allocate some stuff
 
 my @allocations = SL::Helper::Inventory::allocate(
-  part => $assembly1,
+  part => $part1,
   qty  => 12,
 );
 
@@ -83,23 +69,195 @@ is_deeply(\%{ $allocations[0] }, {
    bestbefore        => undef,
    bin_id            => $bin1->id,
    chargenumber      => '',
-   parts_id          => $assembly1->id,
+   parts_id          => $part1->id,
    qty               => 12,
-   reserve_for_id    => undef,
-   reserve_for_table => undef,
    warehouse_id      => $wh->id,
- }, 'allocatiion works');
+   comment           => undef, # comment is not a partition so is not set by allocate
+   for_object_id     => undef,
+ }, 'allocation works');
 
-# simple
+# allocate something where more than one result will match
 
-# with reservation
+@allocations = SL::Helper::Inventory::allocate(
+  part => $part1,
+  qty  => 55,
+);
 
-# more than exists
+is_deeply(\@allocations, [
+  {
+    bestbefore        => undef,
+    bin_id            => $bin1->id,
+    chargenumber      => '',
+    parts_id          => $part1->id,
+    qty               => '40.00000',
+    warehouse_id      => $wh->id,
+    comment           => undef,
+    for_object_id     => undef,
+  },
+  {
+    bestbefore        => undef,
+    bin_id            => $bin1->id,
+    chargenumber      => '298345',
+    parts_id          => $part1->id,
+    qty               => '15',
+    warehouse_id      => $wh->id,
+    comment           => undef,
+    for_object_id     => undef,
+  }
+], 'complex allocation works');
+
+# try to allocate too much
+
+dies_ok(sub {
+  SL::Helper::Inventory::allocate(part => $part1, qty => 100)
+},
+"allocate too much dies");
 
 # produce something
 
+reset_db();
+create_standard_stock();
+
+set_stock(
+  part => $part1,
+  qty => 5,
+  bin => $bin1,
+);
+set_stock(
+  part => $part2,
+  qty => 10,
+  bin => $bin1,
+);
+
+
+my @alloc1 = SL::Helper::Inventory::allocate(part => $part1, qty => 3);
+my @alloc2 = SL::Helper::Inventory::allocate(part => $part2, qty => 3);
+
+SL::Helper::Inventory::produce_assembly(
+  part          => $assembly1,
+  qty           => 3,
+  allocations => [ @alloc1, @alloc2 ],
+
+  # where to put it
+  bin          => $bin1,
+  chargenumber => "537",
+);
+
+is(SL::Helper::Inventory::get_stock(part => $assembly1), "3.00000", 'produce works');
+is(SL::Helper::Inventory::get_stock(part => $part1), "2.00000", 'and consumes...');
+is(SL::Helper::Inventory::get_stock(part => $part2), "7.00000", '..the materials');
+
 # produce the same using auto_allocation
 
+reset_db();
+create_standard_stock();
+
+set_stock(
+  part => $part1,
+  qty => 5,
+  bin => $bin1,
+);
+set_stock(
+  part => $part2,
+  qty => 10,
+  bin => $bin1,
+);
+
+SL::Helper::Inventory::produce_assembly(
+  part          => $assembly1,
+  qty           => 3,
+  auto_allocate => 1,
+
+  # where to put it
+  bin          => $bin1,
+  chargenumber => "537",
+);
+
+is(SL::Helper::Inventory::get_stock(part => $assembly1), "3.00000", 'produce with auto allocation works');
+is(SL::Helper::Inventory::get_stock(part => $part1), "2.00000", 'and consumes...');
+is(SL::Helper::Inventory::get_stock(part => $part2), "7.00000", '..the materials');
+
+# try to produce without allocations dies
+
+dies_ok(sub {
+SL::Helper::Inventory::produce_assembly(
+  part          => $assembly1,
+  qty           => 3,
+
+  # where to put it
+  bin          => $bin1,
+  chargenumber => "537",
+);
+}, "producing without allocations dies");
+
+# try to produce with insufficient allocations dies
+
+@alloc1 = SL::Helper::Inventory::allocate(part => $part1, qty => 1);
+@alloc2 = SL::Helper::Inventory::allocate(part => $part2, qty => 1);
+
+dies_ok(sub {
+SL::Helper::Inventory::produce_assembly(
+  part          => $assembly1,
+  qty           => 3,
+  allocations => [ @alloc1, @alloc2 ],
+
+  # where to put it
+  bin          => $bin1,
+  chargenumber => "537",
+);
+}, "producing with insufficient allocations dies");
+
+
+
+# bestbefore tests
+
+reset_db();
+create_standard_stock();
+
+set_stock(
+  part => $part1,
+  qty => 5,
+  bin => $bin1,
+);
+set_stock(
+  part => $part2,
+  qty => 10,
+  bin => $bin1,
+);
+
+
+
+SL::Helper::Inventory::produce_assembly(
+  part          => $assembly1,
+  qty           => 3,
+  auto_allocate => 1,
+
+  bin               => $bin1,
+  chargenumber      => "537",
+  bestbefore        => DateTime->today->clone->add(days => -14), # expired 2 weeks ago
+  shippingdate      => DateTime->today->clone->add(days => 1),
+);
+
+is(SL::Helper::Inventory::get_stock(part => $assembly1), "3.00000", 'produce with bestbefore works');
+is(SL::Helper::Inventory::get_onhand(part => $assembly1), "3.00000", 'produce with bestbefore works');
+is(SL::Helper::Inventory::get_stock(
+  part       => $assembly1,
+  bestbefore => DateTime->today,
+), undef, 'get_stock with bestbefore date skips expired');
+{
+  local $::instance_conf->data->{show_bestbefore} = 1;
+  is(SL::Helper::Inventory::get_onhand(
+    part       => $assembly1,
+  ), undef, 'get_onhand with bestbefore skips expired as of today');
+}
+
+{
+  local $::instance_conf->data->{show_bestbefore} = 0;
+  is(SL::Helper::Inventory::get_onhand(
+    part       => $assembly1,
+  ), "3.00000", 'get_onhand without bestbefore finds all');
+}
+
 
 sub reset_db {
   SL::DB::Manager::Order->delete_all(all => 1);
@@ -115,11 +273,12 @@ sub create_standard_stock {
   $bin2 = SL::DB::Bin->new(description => "Bin 2", warehouse => $wh)->save;
   $wh->load;
 
-  $assembly1  =  new_assembly()->save;
+  $assembly1  =  new_assembly(number_of_parts => 2)->save;
+  ($part1, $part2) = map { $_->part } $assembly1->assemblies;
 }
 
 
-reset();
+reset_db();
 
 done_testing();