X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FController%2FDeliveryOrder.pm;h=6d10bd1ed286dbd610b9d8f6b4ed6a6320e26cba;hb=dc154326907a16cc4b8ba6c45d3a486bec76b86a;hp=fc25fc0198bcbc85ddecd954604d7403972a9f63;hpb=5b3d7427b3d3df79c2342850d859bd6535dfd15e;p=kivitendo-erp.git

diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm
index fc25fc019..6d10bd1ed 100644
--- a/SL/Controller/DeliveryOrder.pm
+++ b/SL/Controller/DeliveryOrder.pm
@@ -4,7 +4,7 @@ use strict;
 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::DeliveryOrder qw(delivery_order_status_line);
 use SL::Locale::String qw(t8);
@@ -406,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->{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 ]);
@@ -419,7 +419,7 @@ sub action_save_and_show_email_dialog {
   );
 
   $self->js
-      ->run('kivi.Order.show_email_dialog', $dialog_html)
+      ->run('kivi.DeliveryOrder.show_email_dialog', $dialog_html)
       ->reinit_widgets
       ->render($self);
 }
@@ -433,7 +433,7 @@ sub action_send_email {
   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();
   }
@@ -595,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')
-    ->run('kivi.Order.update_exchangerate');
+    ->run('kivi.DeliveryOrder.update_exchangerate');
 
   $self->js_redisplay_cvpartnumbers;
   $self->js->render();
@@ -646,7 +646,7 @@ sub action_unit_changed {
   $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();
 }
@@ -716,11 +716,11 @@ sub action_add_item {
 
   $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');
 
-  $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();
 }
@@ -774,11 +774,11 @@ sub action_add_multi_items {
 
   $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');
 
-  $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();
 }
@@ -825,7 +825,7 @@ sub action_reorder_items {
     }
   }
   $self->js
-    ->run('kivi.Order.redisplay_items', \@to_sort)
+    ->run('kivi.DeliveryOrder.redisplay_items', \@to_sort)
     ->render;
 }
 
@@ -897,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 $unit    = SL::DB::Unit->load_cached($::form->{unit}) or die "need unit";
   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});
@@ -908,13 +908,13 @@ 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);
 
-  $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,
-    do_unit    => $unit,
+    do_unit    => $unit->unit,
     delivered  => $self->order->delivered,
     row        => $row,
     item_id    => $item_id,
@@ -933,17 +933,17 @@ sub action_update_stock_information {
     stock_info => $yaml,
     stock_qty => $stock_qty,
   };
-
   $self->render(\ SL::JSON::to_json($response), { layout => 0, type => 'json', process => 0 });
 }
 
 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) {
-      $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} ||
@@ -980,7 +980,7 @@ sub action_load_second_rows {
     $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();
 }
@@ -1017,7 +1017,7 @@ sub action_update_row_from_master_data {
     $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);
@@ -1081,6 +1081,7 @@ sub action_transfer_stock {
     ->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;
 
@@ -1128,7 +1129,7 @@ sub js_redisplay_line_values {
   }
 
   $self->js
-    ->run('kivi.Order.redisplay_line_values', $is_sales, \@data);
+    ->run('kivi.DeliveryOrder.redisplay_line_values', $is_sales, \@data);
 }
 
 sub js_redisplay_cvpartnumbers {
@@ -1139,7 +1140,7 @@ sub js_redisplay_cvpartnumbers {
   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 {
@@ -1787,14 +1788,16 @@ sub setup_edit_action_bar {
       combobox => [
         action => [
           t8('Save'),
-          call      => [ 'kivi.DeliveryOrder.save', 'save', $::instance_conf->get_order_warn_duplicate_parts,
-                                                    $::instance_conf->get_order_warn_no_deliverydate,
-                                                                                                      ],
+          call     => [ 'kivi.DeliveryOrder.save', 'save', $::instance_conf->get_order_warn_duplicate_parts,
+                                                           $::instance_conf->get_order_warn_no_deliverydate,
+          ],
         ],
         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,
+          call     => [ 'kivi.DeliveryOrder.save', 'save_as_new', $::instance_conf->get_order_warn_duplicate_parts ],
+          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"
 
@@ -1819,24 +1822,24 @@ sub setup_edit_action_bar {
         ],
         action => [
           t8('Save and Purchase Order'),
-          call      => [ 'kivi.DeliveryOrder.purchase_order_check_for_direct_delivery' ],
+          call     => [ 'kivi.DeliveryOrder.purchase_order_check_for_direct_delivery' ],
           only_if  => $self->type_data->show_menu("save_and_purchase_order"),
         ],
         action => [
           t8('Save and Delivery Order'),
-          call      => [ 'kivi.DeliveryOrder.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts,
-                                                                       $::instance_conf->get_order_warn_no_deliverydate,
-                                                                                                                        ],
+          call     => [ 'kivi.DeliveryOrder.save', 'save_and_delivery_order', $::instance_conf->get_order_warn_duplicate_parts,
+                                                                              $::instance_conf->get_order_warn_no_deliverydate,
+          ],
           only_if  => $self->type_data->show_menu("save_and_delivery_order"),
         ],
         action => [
           t8('Save and Invoice'),
-          call      => [ 'kivi.DeliveryOrder.save', 'save_and_invoice', $::instance_conf->get_order_warn_duplicate_parts ],
+          call     => [ 'kivi.DeliveryOrder.save', 'save_and_invoice', $::instance_conf->get_order_warn_duplicate_parts ],
           only_if  => $self->type_data->show_menu("save_and_invoice"),
         ],
         action => [
           t8('Save and AP Transaction'),
-          call      => [ 'kivi.DeliveryOrder.save', 'save_and_ap_transaction', $::instance_conf->get_order_warn_duplicate_parts ],
+          call     => [ 'kivi.DeliveryOrder.save', 'save_and_ap_transaction', $::instance_conf->get_order_warn_duplicate_parts ],
           only_if  => $self->type_data->show_menu("save_and_ap_transaction"),
         ],
 
@@ -1848,22 +1851,22 @@ sub setup_edit_action_bar {
         ],
         action => [
           t8('Save and preview PDF'),
-           call => [ 'kivi.DeliveryOrder.save', 'preview_pdf', $::instance_conf->get_order_warn_duplicate_parts,
-                                                       $::instance_conf->get_order_warn_no_deliverydate,
-                                                                                                         ],
+           call    => [ 'kivi.DeliveryOrder.save', 'preview_pdf', $::instance_conf->get_order_warn_duplicate_parts,
+                                                                  $::instance_conf->get_order_warn_no_deliverydate,
+          ],
         ],
         action => [
           t8('Save and print'),
-          call => [ 'kivi.DeliveryOrder.show_print_options', $::instance_conf->get_order_warn_duplicate_parts,
-                                                     $::instance_conf->get_order_warn_no_deliverydate,
-                                                                                                      ],
+          call     => [ 'kivi.DeliveryOrder.show_print_options', $::instance_conf->get_order_warn_duplicate_parts,
+                                                                 $::instance_conf->get_order_warn_no_deliverydate,
+          ],
         ],
         action => [
           t8('Save and E-mail'),
-          id   => 'save_and_email_action',
-          call => [ 'kivi.DeliveryOrder.save', 'save_and_show_email_dialog', $::instance_conf->get_order_warn_duplicate_parts,
-                                                                     $::instance_conf->get_order_warn_no_deliverydate,
-                  ],
+          id       => 'save_and_email_action',
+          call     => [ 'kivi.DeliveryOrder.save', 'save_and_show_email_dialog', $::instance_conf->get_order_warn_duplicate_parts,
+                                                                                 $::instance_conf->get_order_warn_no_deliverydate,
+          ],
           disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
         ],
         action => [
@@ -1876,30 +1879,34 @@ sub setup_edit_action_bar {
 
       action => [
         t8('Delete'),
+        id       => 'delete_action',
         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.') :
-                    $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->show_menu("delete"),
       ],
 
       combobox => [
         action => [
           t8('Transfer out'),
-          id   => 'transfer_out_action',
-          call   => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ],
-          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',
+          id       => 'transfer_out_action',
+          call     => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ],
+          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'),
-          id   => 'transfer_in_action',
-          call   => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ],
-          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',
+          id       => 'transfer_in_action',
+          call     => [ 'kivi.DeliveryOrder.save', 'transfer_stock' ],
+          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?'),
         ],
       ],
@@ -2149,7 +2156,7 @@ sub calculate_stock_in_out_from_stock_info {
     $units_by_name{$_->{unit}}->convert_to($_->{qty}, $units_by_name{$unit})
   } @$stock_info;
 
-  my $content  = _format_number_units($sum, 2, $units_by_name{$unit}, $units_by_name{$unit});
+  my $content  = _format_number($sum, 2) . ' ' . $unit;
 
   return $content;
 }
@@ -2163,7 +2170,7 @@ sub calculate_stock_in_out {
     $_->unit_obj->convert_to($_->qty, $item->unit_obj)
   } $item->delivery_order_stock_entries;
 
-  my $content  = _format_number_units($sum, 2, $item->unit_obj, $item->part->unit_obj);
+  my $content  = _format_number($sum, 2);
 
   return $content;
 }