DeliveryOrder: calculate_stock_in_out liefert auch die Einheit mit

[mfinanz.git] / SL / Controller / DeliveryOrder.pm

diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm
index 1f53fc54039cf81b38e398388b08c69965ff53be..c96bc42ac5b88e2e18655b295444596a9ff180d9 100644 (file)
--- a/SL/Controller/DeliveryOrder.pm
+++ b/SL/Controller/DeliveryOrder.pm
@@ -4,8 +4,9 @@ use strict;
 use parent qw(SL::Controller::Base);
 
 use SL::Helper::Flash qw(flash_later);
 use parent qw(SL::Controller::Base);
 
 use SL::Helper::Flash qw(flash_later);

-use SL::Helper::Number qw(_format_number_units _parse_number);
+use SL::Helper::Number qw(_format_number _parse_number);

 use SL::Presenter::Tag qw(select_tag hidden_tag div_tag);
 use SL::Presenter::Tag qw(select_tag hidden_tag div_tag);

+use SL::Presenter::DeliveryOrder qw(delivery_order_status_line);

 use SL::Locale::String qw(t8);
 use SL::SessionFile::Random;
 use SL::PriceSource;
 use SL::Locale::String qw(t8);
 use SL::SessionFile::Random;
 use SL::PriceSource;


@@ -55,7 +56,7 @@ use Rose::Object::MakeMethods::Generic
 
 # safety
 __PACKAGE__->run_before('check_auth',
 
 # safety
 __PACKAGE__->run_before('check_auth',

-                        except => [ qw(pack_stock_information) ]);
+                        except => [ qw(update_stock_information) ]);

 
 __PACKAGE__->run_before('get_unalterable_data',
                         only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_ap_transaction
 
 __PACKAGE__->run_before('get_unalterable_data',
                         only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_ap_transaction


@@ -405,7 +406,7 @@ sub action_save_and_show_email_dialog {
   $email_form->{subject}             = $form->generate_email_subject();
   $email_form->{attachment_filename} = $form->generate_attachment_filename();
   $email_form->{message}             = $form->generate_email_body();
   $email_form->{subject}             = $form->generate_email_subject();
   $email_form->{attachment_filename} = $form->generate_attachment_filename();
   $email_form->{message}             = $form->generate_email_body();

-  $email_form->{js_send_function}    = 'kivi.Order.send_email()';
+  $email_form->{js_send_function}    = 'kivi.DeliveryOrder.send_email()';

 
   my %files = $self->get_files_for_email_dialog();
   $self->{all_employees} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
 
   my %files = $self->get_files_for_email_dialog();
   $self->{all_employees} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);


@@ -418,7 +419,7 @@ sub action_save_and_show_email_dialog {
   );
 
   $self->js
   );
 
   $self->js

-      ->run('kivi.Order.show_email_dialog', $dialog_html)
+      ->run('kivi.DeliveryOrder.show_email_dialog', $dialog_html)

       ->reinit_widgets
       ->render($self);
 }
       ->reinit_widgets
       ->render($self);
 }


@@ -432,7 +433,7 @@ sub action_send_email {
   my $errors = $self->save();
 
   if (scalar @{ $errors }) {
   my $errors = $self->save();
 
   if (scalar @{ $errors }) {

-    $self->js->run('kivi.Order.close_email_dialog');
+    $self->js->run('kivi.DeliveryOrder.close_email_dialog');

     $self->js->flash('error', $_) foreach @{ $errors };
     return $self->js->render();
   }
     $self->js->flash('error', $_) foreach @{ $errors };
     return $self->js->render();
   }


@@ -594,7 +595,7 @@ sub action_customer_vendor_changed {
     ->val(        '#order_intnotes',         $self->order->intnotes)
     ->val(        '#order_language_id',      $self->order->$cv_method->language_id)
     ->focus(      '#order_' . $self->cv . '_id')
     ->val(        '#order_intnotes',         $self->order->intnotes)
     ->val(        '#order_language_id',      $self->order->$cv_method->language_id)
     ->focus(      '#order_' . $self->cv . '_id')

-    ->run('kivi.Order.update_exchangerate');
+    ->run('kivi.DeliveryOrder.update_exchangerate');

 
   $self->js_redisplay_cvpartnumbers;
   $self->js->render();
 
   $self->js_redisplay_cvpartnumbers;
   $self->js->render();


@@ -645,7 +646,7 @@ sub action_unit_changed {
   $item->sellprice($item->unit_obj->convert_to($item->sellprice, $old_unit_obj));
 
   $self->js
   $item->sellprice($item->unit_obj->convert_to($item->sellprice, $old_unit_obj));
 
   $self->js

-    ->run('kivi.Order.update_sellprice', $::form->{item_id}, $item->sellprice_as_number);
+    ->run('kivi.DeliveryOrder.update_sellprice', $::form->{item_id}, $item->sellprice_as_number);

   $self->js_redisplay_line_values;
   $self->js->render();
 }
   $self->js_redisplay_line_values;
   $self->js->render();
 }


@@ -715,11 +716,11 @@ sub action_add_item {
 
   $self->js
     ->val('.add_item_input', '')
 
   $self->js
     ->val('.add_item_input', '')

-    ->run('kivi.Order.init_row_handlers')
-    ->run('kivi.Order.renumber_positions')
+    ->run('kivi.DeliveryOrder.init_row_handlers')
+    ->run('kivi.DeliveryOrder.renumber_positions')

     ->focus('#add_item_parts_id_name');
 
     ->focus('#add_item_parts_id_name');
 

-  $self->js->run('kivi.Order.row_table_scroll_down') if !$::form->{insert_before_item_id};
+  $self->js->run('kivi.DeliveryOrder.row_table_scroll_down') if !$::form->{insert_before_item_id};

 
   $self->js->render();
 }
 
   $self->js->render();
 }


@@ -773,11 +774,11 @@ sub action_add_multi_items {
 
   $self->js
     ->run('kivi.Part.close_picker_dialogs')
 
   $self->js
     ->run('kivi.Part.close_picker_dialogs')

-    ->run('kivi.Order.init_row_handlers')
-    ->run('kivi.Order.renumber_positions')
+    ->run('kivi.DeliveryOrder.init_row_handlers')
+    ->run('kivi.DeliveryOrder.renumber_positions')

     ->focus('#add_item_parts_id_name');
 
     ->focus('#add_item_parts_id_name');
 

-  $self->js->run('kivi.Order.row_table_scroll_down') if !$::form->{insert_before_item_id};
+  $self->js->run('kivi.DeliveryOrder.row_table_scroll_down') if !$::form->{insert_before_item_id};

 
   $self->js->render();
 }
 
   $self->js->render();
 }


@@ -824,7 +825,7 @@ sub action_reorder_items {
     }
   }
   $self->js
     }
   }
   $self->js

-    ->run('kivi.Order.redisplay_items', \@to_sort)
+    ->run('kivi.DeliveryOrder.redisplay_items', \@to_sort)

     ->render;
 }
 
     ->render;
 }
 


@@ -896,8 +897,8 @@ sub action_stock_in_out_dialog {
   my ($self) = @_;
 
   my $part    = SL::DB::Part->load_cached($::form->{parts_id}) or die "need parts_id";
   my ($self) = @_;
 
   my $part    = SL::DB::Part->load_cached($::form->{parts_id}) or die "need parts_id";

+  my $unit    = SL::DB::Unit->load_cached($::form->{unit}) or die "need unit";

   my $stock   = $::form->{stock};
   my $stock   = $::form->{stock};

-  my $unit    = $::form->{unit};

   my $row     = $::form->{row};
   my $item_id = $::form->{item_id};
   my $qty     = _parse_number($::form->{qty_as_number});
   my $row     = $::form->{row};
   my $item_id = $::form->{item_id};
   my $qty     = _parse_number($::form->{qty_as_number});


@@ -907,38 +908,42 @@ sub action_stock_in_out_dialog {
   my @contents   = DO->get_item_availability(parts_id => $part->id);
   my $stock_info = DO->unpack_stock_information(packed => $stock);
 
   my @contents   = DO->get_item_availability(parts_id => $part->id);
   my $stock_info = DO->unpack_stock_information(packed => $stock);
 

-  $self->merge_stock_data($stock_info, \@contents, $part);
+  $self->merge_stock_data($stock_info, \@contents, $part, $unit);

 
   $self->render("delivery_order/stock_dialog", { layout => 0 },
     WHCONTENTS => $self->order->delivered ? $stock_info : \@contents,
     part       => $part,
     do_qty     => $qty,
 
   $self->render("delivery_order/stock_dialog", { layout => 0 },
     WHCONTENTS => $self->order->delivered ? $stock_info : \@contents,
     part       => $part,
     do_qty     => $qty,

-    do_unit    => $unit,
+    do_unit    => $unit->unit,

     delivered  => $self->order->delivered,
     row        => $row,
     item_id    => $item_id,
   );
 }
 
     delivered  => $self->order->delivered,
     row        => $row,
     item_id    => $item_id,
   );
 }
 

-# we're using the old YAML based stock packing, but don't want to do this in
-# the frontend so we're doing a tiny roundtrip to the backend, back the info in
-# perl, serve it back to the frontend and store it in the DOM there
-sub action_pack_stock_information {
+sub action_update_stock_information {

   my ($self) = @_;
 
   my $stock_info = $::form->{stock_info};
   my ($self) = @_;
 
   my $stock_info = $::form->{stock_info};

+  my $unit = $::form->{unit};

   my $yaml = SL::YAML::Dump($stock_info);
   my $yaml = SL::YAML::Dump($stock_info);

+  my $stock_qty = $self->calculate_stock_in_out_from_stock_info($unit, $stock_info);

 
 

-  $self->render(\$yaml, { layout => 0, process => 0 });
+  my $response = {
+    stock_info => $yaml,
+    stock_qty => $stock_qty,
+  };
+  $self->render(\ SL::JSON::to_json($response), { layout => 0, type => 'json', process => 0 });

 }
 
 sub merge_stock_data {
 }
 
 sub merge_stock_data {

-  my ($self, $stock_info, $contents, $part) = @_;
+  my ($self, $stock_info, $contents, $part, $unit) = @_;

   # TODO rewrite to mapping
 
   if (!$self->order->delivered) {
     for my $row (@$contents) {
   # TODO rewrite to mapping
 
   if (!$self->order->delivered) {
     for my $row (@$contents) {

-      $row->{available_qty} = _format_number_units($row->{qty}, $row->{unit}, $part->unit);
+      # row here is in parts units. stock is in item units
+      $row->{available_qty} = _format_number($part->unit_obj->convert_to($row->{qty}, $unit));

 
       for my $sinfo (@{ $stock_info }) {
         next if $row->{bin_id}       != $sinfo->{bin_id} ||
 
       for my $sinfo (@{ $stock_info }) {
         next if $row->{bin_id}       != $sinfo->{bin_id} ||


@@ -954,8 +959,8 @@ sub merge_stock_data {
   } else {
     for my $sinfo (@{ $stock_info }) {
       my $bin = SL::DB::Bin->load_cached($sinfo->{bin_id});
   } else {
     for my $sinfo (@{ $stock_info }) {
       my $bin = SL::DB::Bin->load_cached($sinfo->{bin_id});

-      $sinfo->{warehouse_description} = $bin->warehouse->description;
-      $sinfo->{bin_description}       = $bin->description;
+      $sinfo->{warehousedescription} = $bin->warehouse->description;
+      $sinfo->{bindescription}       = $bin->description;

       map { $sinfo->{"stock_$_"}      = $sinfo->{$_} } qw(qty unit);
     }
   }
       map { $sinfo->{"stock_$_"}      = $sinfo->{$_} } qw(qty unit);
     }
   }


@@ -975,7 +980,7 @@ sub action_load_second_rows {
     $self->js_load_second_row($item, $item_id, 0);
   }
 
     $self->js_load_second_row($item, $item_id, 0);
   }
 

-  $self->js->run('kivi.Order.init_row_handlers') if $self->order->is_sales; # for lastcosts change-callback
+  $self->js->run('kivi.DeliveryOrder.init_row_handlers') if $self->order->is_sales; # for lastcosts change-callback

 
   $self->js->render();
 }
 
   $self->js->render();
 }


@@ -1012,7 +1017,7 @@ sub action_update_row_from_master_data {
     $item->active_price_source($price_src);
 
     $self->js
     $item->active_price_source($price_src);
 
     $self->js

-      ->run('kivi.Order.update_sellprice', $item_id, $item->sellprice_as_number)
+      ->run('kivi.DeliveryOrder.update_sellprice', $item_id, $item->sellprice_as_number)

       ->html('.row_entry:has(#item_' . $item_id . ') [name = "partnumber"] a', $item->part->partnumber)
       ->val ('.row_entry:has(#item_' . $item_id . ') [name = "order.orderitems[].description"]', $item->description)
       ->val ('.row_entry:has(#item_' . $item_id . ') [name = "order.orderitems[].longdescription"]', $item->longdescription);
       ->html('.row_entry:has(#item_' . $item_id . ') [name = "partnumber"] a', $item->part->partnumber)
       ->val ('.row_entry:has(#item_' . $item_id . ') [name = "order.orderitems[].description"]', $item->description)
       ->val ('.row_entry:has(#item_' . $item_id . ') [name = "order.orderitems[].longdescription"]', $item->longdescription);


@@ -1035,6 +1040,8 @@ sub action_transfer_stock {
     return $self->js->flash("error", t8('The parts for this order have already been transferred'))->render;
   }
 
     return $self->js->flash("error", t8('The parts for this order have already been transferred'))->render;
   }
 

+  my $inout = $self->type_data->properties('transfer');
+

   my $errors = $self->save;
 
   if (@$errors) {
   my $errors = $self->save;
 
   if (@$errors) {


@@ -1045,7 +1052,7 @@ sub action_transfer_stock {
   my $order = $self->order;
 
   # TODO move to type data
   my $order = $self->order;
 
   # TODO move to type data

-  my $trans_type = $self->type_data->properties('transfer') eq 'in'
+  my $trans_type = $inout eq 'in'

     ? SL::DB::Manager::TransferType->find_by(direction => "id", description => "stock")
     : SL::DB::Manager::TransferType->find_by(direction => "out", description => "shipped");
 
     ? SL::DB::Manager::TransferType->find_by(direction => "id", description => "stock")
     : SL::DB::Manager::TransferType->find_by(direction => "out", description => "shipped");
 


@@ -1055,13 +1062,14 @@ sub action_transfer_stock {
     for my $stock (@{ $item->delivery_order_stock_entries }) {
       my $transfer = SL::DB::Inventory->new_from($stock);
       $transfer->trans_type($trans_type);
     for my $stock (@{ $item->delivery_order_stock_entries }) {
       my $transfer = SL::DB::Inventory->new_from($stock);
       $transfer->trans_type($trans_type);

+      $transfer->qty($transfer->qty * -1) if $inout eq 'out';

 
 

-      push @transfer_requests, $transfer;
+      push @transfer_requests, $transfer if defined $transfer->qty && $transfer->qty != 0;

     };
   }
 
   if (!@transfer_requests) {
     };
   }
 
   if (!@transfer_requests) {

-    $self->js->flash("error", t8("No stock to transfer"))->render;
+    return $self->js->flash("error", t8("No stock to transfer"))->render;

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


@@ -1069,7 +1077,14 @@ sub action_transfer_stock {
     $self->order->update_attributes(delivered => 1);
   });
 
     $self->order->update_attributes(delivered => 1);
   });
 

-  $self->js->flash("info", t8("Stock transfered"))->render;
+  $self->js
+    ->flash("info", t8("Stock transfered"))
+    ->run('kivi.ActionBar.setDisabled', '#transfer_out_action', t8('The parts for this order have already been transferred'))
+    ->run('kivi.ActionBar.setDisabled', '#transfer_in_action', t8('The parts for this order have already been transferred'))
+    ->run('kivi.ActionBar.setDisabled', '#delete_action', t8('The parts for this order have already been transferred'))
+    ->replaceWith('#data-status-line', delivery_order_status_line($self->order))
+    ->render;
+

 }
 
 sub js_load_second_row {
 }
 
 sub js_load_second_row {


@@ -1114,7 +1129,7 @@ sub js_redisplay_line_values {
   }
 
   $self->js
   }
 
   $self->js

-    ->run('kivi.Order.redisplay_line_values', $is_sales, \@data);
+    ->run('kivi.DeliveryOrder.redisplay_line_values', $is_sales, \@data);

 }
 
 sub js_redisplay_cvpartnumbers {
 }
 
 sub js_redisplay_cvpartnumbers {


@@ -1125,7 +1140,7 @@ sub js_redisplay_cvpartnumbers {
   my @data = map {[$_->{cvpartnumber}]} @{ $self->order->items_sorted };
 
   $self->js
   my @data = map {[$_->{cvpartnumber}]} @{ $self->order->items_sorted };
 
   $self->js

-    ->run('kivi.Order.redisplay_cvpartnumbers', \@data);
+    ->run('kivi.DeliveryOrder.redisplay_cvpartnumbers', \@data);

 }
 
 sub js_reset_order_and_item_ids_after_save {
 }
 
 sub js_reset_order_and_item_ids_after_save {


@@ -1367,7 +1382,7 @@ sub make_item {
       $obj->$_($line->{$_}) for qw(bin_id warehouse_id chargenumber qty unit);
       $obj->bestbefore_as_date($line->{bestfbefore})
         if $line->{bestbefore} && $::instance_conf->get_show_bestbefore;
       $obj->$_($line->{$_}) for qw(bin_id warehouse_id chargenumber qty unit);
       $obj->bestbefore_as_date($line->{bestfbefore})
         if $line->{bestbefore} && $::instance_conf->get_show_bestbefore;

-      push @save, $obj;
+      push @save, $obj if $obj->qty;

     }
 
     $item->delivery_order_stock_entries(@save);
     }
 
     $item->delivery_order_stock_entries(@save);


@@ -1780,7 +1795,9 @@ sub setup_edit_action_bar {
         action => [
           t8('Save as new'),
           call      => [ 'kivi.DeliveryOrder.save', 'save_as_new', $::instance_conf->get_order_warn_duplicate_parts ],
         action => [
           t8('Save as new'),
           call      => [ 'kivi.DeliveryOrder.save', 'save_as_new', $::instance_conf->get_order_warn_duplicate_parts ],

-          disabled  => !$self->order->id ? t8('This object has not been saved yet.') : undef,
+          disabled  =>   $self->type eq 'supplier_delivery_order' ? t8('Need a workflow for Supplier Delivery Order')
+                       : !$self->order->id                        ? t8('This object has not been saved yet.')
+                       : undef,

         ],
       ], # end of combobox "Save"
 
         ],
       ], # end of combobox "Save"
 


@@ -1862,24 +1879,30 @@ sub setup_edit_action_bar {
 
       action => [
         t8('Delete'),
 
       action => [
         t8('Delete'),

+        id       => 'delete_action',

         call     => [ 'kivi.DeliveryOrder.delete_order' ],
         confirm  => $::locale->text('Do you really want to delete this object?'),
         call     => [ 'kivi.DeliveryOrder.delete_order' ],
         confirm  => $::locale->text('Do you really want to delete this object?'),

-        disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
+        disabled => !$self->order->id       ? t8('This object has not been saved yet.') :
+                    $self->order->delivered ? t8('The parts for this order have already been transferred') : undef,

         only_if  => $self->type_data->show_menu("delete"),
       ],
 
       combobox => [
         action => [
           t8('Transfer out'),
         only_if  => $self->type_data->show_menu("delete"),
       ],
 
       combobox => [
         action => [
           t8('Transfer out'),

+          id   => 'transfer_out_action',

           call   => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ],
           call   => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ],

-          disabled => $self->order->delivered ? t8('The parts for this order have already been transferred') : undef,
+          disabled => !$self->order->id ? t8('This object has not been saved yet.') :
+                      $self->order->delivered ? t8('The parts for this order have already been transferred') : undef,

           only_if => $self->type_data->properties('transfer') eq 'out',
           confirm  => t8('Do you really want to transfer the stock and set this order to delivered?'),
         ],
         action => [
           t8('Transfer in'),
           only_if => $self->type_data->properties('transfer') eq 'out',
           confirm  => t8('Do you really want to transfer the stock and set this order to delivered?'),
         ],
         action => [
           t8('Transfer in'),

+          id   => 'transfer_in_action',

           call   => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ],
           call   => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ],

-          disabled => $self->order->delivered ? t8('The parts for this order have already been transferred') : undef,
+          disabled => !$self->order->id ? t8('This object has not been saved yet.') :
+                      $self->order->delivered ? t8('The parts for this order have already been transferred') : undef,

           only_if => $self->type_data->properties('transfer') eq 'in',
           confirm  => t8('Do you really want to transfer the stock and set this order to delivered?'),
         ],
           only_if => $self->type_data->properties('transfer') eq 'in',
           confirm  => t8('Do you really want to transfer the stock and set this order to delivered?'),
         ],


@@ -2119,20 +2142,32 @@ sub store_pdf_to_webdav_and_filemanagement {
   return @errors;
 }
 
   return @errors;
 }
 

+sub calculate_stock_in_out_from_stock_info {
+  my ($self, $unit, $stock_info) = @_;
+
+  return "" if !$unit;
+
+  my %units_by_name = map { $_->name => $_ } @{ SL::DB::Manager::Unit->get_all };
+
+  my $sum      = sum0 map {
+    $units_by_name{$_->{unit}}->convert_to($_->{qty}, $units_by_name{$unit})
+  } @$stock_info;
+
+  my $content  = _format_number($sum, 2) . ' ' . $unit;
+
+  return $content;
+}
+

 sub calculate_stock_in_out {
 sub calculate_stock_in_out {

-  my ($self, $item) = @_;
+  my ($self, $item, $stock_info) = @_;

 
   return "" if !$item->part || !$item->part->unit || !$item->unit;
 
 
   return "" if !$item->part || !$item->part->unit || !$item->unit;
 

-  my $in_out   = $self->type_data->transfer;
-
-  my $do_qty   = $item->qty;

   my $sum      = sum0 map {
     $_->unit_obj->convert_to($_->qty, $item->unit_obj)
   } $item->delivery_order_stock_entries;
 
   my $sum      = sum0 map {
     $_->unit_obj->convert_to($_->qty, $item->unit_obj)
   } $item->delivery_order_stock_entries;
 

-  my $matches  = $do_qty == $sum;
-  my $content  = _format_number_units($sum, 2, $item->unit_obj, $item->part->unit_obj);
+  my $content  = _format_number($sum, 2);

 
   return $content;
 }
 
   return $content;
 }