GetModels-Filtered: Unterstützung für benutzerdefinierte Variablen

[kivitendo-erp.git] / SL / Controller / RequirementSpecOrder.pm

diff --git a/SL/Controller/RequirementSpecOrder.pm b/SL/Controller/RequirementSpecOrder.pm
index b02c985..c031a89 100644 (file)
--- a/SL/Controller/RequirementSpecOrder.pm
+++ b/SL/Controller/RequirementSpecOrder.pm
@@ -23,7 +23,7 @@ use constant FORMS_SELECTOR => '#quotations_and_orders_article_assignment,#quota
 use Rose::Object::MakeMethods::Generic
 (
   scalar                  => [ qw(parts) ],
-  'scalar --get_set_init' => [ qw(requirement_spec rs_order js h_unit_name all_customers all_parts_time_unit) ],
+  'scalar --get_set_init' => [ qw(requirement_spec rs_order js h_unit_name all_customers all_parts_time_unit section_order_part) ],
 );
 
 __PACKAGE__->run_before('setup');
@@ -156,6 +156,7 @@ sub action_edit_assignment {
   my $html   = $self->render('requirement_spec_order/edit_assignment', { output => 0 }, make_part_title => sub { $_[0]->partnumber . ' ' . $_[0]->description });
   $self->js->hide(LIST_SELECTOR())
            ->after(LIST_SELECTOR(), $html)
+           ->reinit_widgets
            ->render($self);
 }
 
@@ -192,7 +193,7 @@ sub setup {
   my ($self) = @_;
 
   $::auth->assert('requirement_spec_edit');
-  $::request->{layout}->use_stylesheet("${_}.css") for qw(jquery.contextMenu requirement_spec autocomplete_part);
+  $::request->{layout}->use_stylesheet("${_}.css") for qw(jquery.contextMenu requirement_spec);
   $::request->{layout}->use_javascript("${_}.js")  for qw(jquery.jstree jquery/jquery.contextMenu client_js requirement_spec);
 
   return 1;
@@ -209,15 +210,16 @@ sub init_js {
 }
 
 sub init_all_customers { SL::DB::Manager::Customer->get_all_sorted }
-sub init_h_unit_name   { first { SL::DB::Manager::Unit->find_by(name => $_) } qw(Std h Stunde) };
+sub init_h_unit_name   { SL::DB::Manager::Unit->find_h_unit->name };
 sub init_rs_order      { SL::DB::RequirementSpecOrder->new(id => $::form->{rs_order_id})->load };
+sub init_section_order_part { my $id = $::instance_conf->get_requirement_spec_section_order_part_id; return $id ? SL::DB::Part->new(id => $id)->load : undef }
 
 sub init_all_parts_time_unit {
   my ($self) = @_;
 
   return [] unless $self->h_unit_name;
 
-  my @convertible_unit_names = map { $_->name } @{ SL::DB::Manager::Unit->find_by(name => $self->h_unit_name)->convertible_units };
+  my @convertible_unit_names = map { $_->name } @{ SL::DB::Manager::Unit->time_based_units };
 
   return SL::DB::Manager::Part->get_all_sorted(where => [ unit => \@convertible_unit_names ]);
 }
@@ -226,6 +228,17 @@ sub init_all_parts_time_unit {
 # helpers
 #
 
+sub cache_parts {
+  my ($self, @ids) = @_;
+
+  my $parts = !@ids ? [] : SL::DB::Manager::Part->get_all(
+    where        => [ id => \@ids ],
+    with_objects => [ qw(unit_obj) ],
+  );
+
+  $self->parts({ map { ($_->id => $_) } @{ $parts } });
+}
+
 sub do_update_sections {
   my ($self)           = @_;
 
@@ -233,9 +246,10 @@ sub do_update_sections {
   my $sections         = $self->requirement_spec->sections_sorted;
   my %orderitems_by_id = map { ($_->id => $_) } @{ $order->orderitems };
   my %sections_by_id   = map { ($_->id => $_) } @{ $sections };
-  $self->{parts}       = { map { ($_->id => $_) } @{ SL::DB::Manager::Part->get_all(where => [ id => [ uniq map { $_->order_part_id } @{ $sections } ] ]) } };
   my $language_id      = $self->requirement_spec->customer->language_id;
 
+  $self->cache_parts(uniq map { $_->order_part_id } @{ $sections });
+
   my %sections_seen;
 
   foreach my $attributes (@{ $::form->{orderitems} || [] }) {
@@ -260,9 +274,10 @@ sub do_update_additional_parts {
   my $order         = $self->rs_order->order;
   my $add_parts     = $self->requirement_spec->parts_sorted;
   my %orderitems_by = map { (($_->parts_id . '-' . $_->description) => $_) } @{ $order->items };
-  $self->{parts}    = { map { ($_->id => $_) } @{ SL::DB::Manager::Part->get_all(where => [ id => [ uniq map { $_->part_id } @{ $add_parts } ] ]) } };
   my $language_id   = $self->requirement_spec->customer->language_id;
 
+  $self->cache_parts(uniq map { $_->part_id } @{ $add_parts });
+
   my %add_part_seen;
   my @new_orderitems;
 
@@ -287,6 +302,7 @@ sub create_order_item {
   my $section         = $params{section};
   my $item            = $params{item} || SL::DB::OrderItem->new;
   my $part            = $self->parts->{ $section->order_part_id };
+  my $is_time_based   = $part->unit_obj->is_time_based;
   my $translation     = $params{language_id} ? first { $params{language_id} == $_->language_id } @{ $part->translations } : {};
   my $description     = $section->{keep_description} ? $item->description : ($translation->{translation} || $part->description);
   my $longdescription = $translation->{longdescription} || $part->notes;
@@ -306,9 +322,9 @@ sub create_order_item {
     parts_id        => $part->id,
     description     => $description,
     longdescription => $longdescription,
-    qty             => $section->time_estimation * 1,
-    unit            => $self->h_unit_name,
-    sellprice       => $::form->round_amount($self->requirement_spec->hourly_rate, 2),
+    qty             => $is_time_based ? $section->time_estimation * 1 : 1,
+    unit            => $is_time_based ? $self->h_unit_name            : $part->unit,
+    sellprice       => $::form->round_amount($self->requirement_spec->hourly_rate * ($is_time_based ? 1 : $section->time_estimation), 2),
     lastcost        => $part->lastcost,
     discount        => 0,
     project_id      => $self->requirement_spec->project_id,