DeliveryOrder: Übergabe in/out verbessert

diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm
index 547e3e2a082349f5d859798fa93e0c9f401de3b2..505f9de2ab6097a02d360c41ba9673fdf402e589 100644 (file)
--- a/SL/Controller/DeliveryOrder.pm
+++ b/SL/Controller/DeliveryOrder.pm
@@ -407,7 +407,7 @@ sub action_save_and_show_email_dialog {
                                   email_form  => $email_form,
                                   show_bcc    => $::auth->assert('email_bcc', 'may fail'),
                                   FILES       => \%files,
                                   email_form  => $email_form,
                                   show_bcc    => $::auth->assert('email_bcc', 'may fail'),
                                   FILES       => \%files,

-                                  is_customer => $self->cv eq 'customer',
+                                  is_customer => $self->type_data->is_customer,

                                   ALL_EMPLOYEES => $self->{all_employees},
   );
 
                                   ALL_EMPLOYEES => $self->{all_employees},
   );
 


@@ -1637,7 +1637,7 @@ sub pre_render {
                                                 } } @all_objects;
   }
 
                                                 } } @all_objects;
   }
 

-  $self->{template_args}{inout} = $self->type_data->properties('transfer');
+  $self->{template_args}{in_out} = $self->type_data->transfer;

 
   $self->get_item_cvpartnumber($_) for @{$self->order->items_sorted};
 
 
   $self->get_item_cvpartnumber($_) for @{$self->order->items_sorted};
 


@@ -2007,7 +2007,7 @@ sub calculate_stock_in_out {
 
   return "" if !$item->part || !$item->part->unit || !$item->unit;
 
 
   return "" if !$item->part || !$item->part->unit || !$item->unit;
 

-  my $in_out   = $self->type_data->properties("transfer");
+  my $in_out   = $self->type_data->transfer;

 
   my $do_qty   = $item->qty;
   my $sum      = sum0 map {
 
   my $do_qty   = $item->qty;
   my $sum      = sum0 map {

diff --git a/SL/Controller/DeliveryOrder/TypeData.pm b/SL/Controller/DeliveryOrder/TypeData.pm
index 5b7cfe949efc17aa255407f369796c9bc8f0e229..8db84c4414aa2aa2f6f91f4802905f42be33585e 100644 (file)
--- a/SL/Controller/DeliveryOrder/TypeData.pm
+++ b/SL/Controller/DeliveryOrder/TypeData.pm
@@ -65,6 +65,10 @@ sub nr_key {
   get3($_[0]->c->type, "properties", "nr_key");
 }
 
   get3($_[0]->c->type, "properties", "nr_key");
 }
 

+sub transfer {
+  get3($_[0]->c->type, "properties", "transfer");
+}
+

 sub part_classification_query {
   my ($self, $string) = @_;
   get($self->c->type, "part_classification_query");
 sub part_classification_query {
   my ($self, $string) = @_;
   get($self->c->type, "part_classification_query");

diff --git a/templates/webpages/delivery_order/tabs/basic_data.html b/templates/webpages/delivery_order/tabs/basic_data.html
index d3ff155184ba8c3b70ddce4880dd0e7a66e39e15..2848532b3ee9225ad209d506f85f75fcb02b6b68 100644 (file)
--- a/templates/webpages/delivery_order/tabs/basic_data.html
+++ b/templates/webpages/delivery_order/tabs/basic_data.html
@@ -222,10 +222,10 @@
                 [%- END -%]
                 <th id="qty_header_id"          class="listheading" nowrap width="5" ><a href='#' onClick='javascript:kivi.DeliveryOrder.reorder_items("qty")'>        [%- 'Qty'         | $T8 %]</a></th>
                 <th class="listheading" nowrap width="5" >[%- 'Unit'         | $T8 %] </th>
                 [%- END -%]
                 <th id="qty_header_id"          class="listheading" nowrap width="5" ><a href='#' onClick='javascript:kivi.DeliveryOrder.reorder_items("qty")'>        [%- 'Qty'         | $T8 %]</a></th>
                 <th class="listheading" nowrap width="5" >[%- 'Unit'         | $T8 %] </th>

-                [% IF inout == 'in' %]
+                [% IF in_out == 'in' %]

                 <th class="listheading" nowrap width="5" >[%- 'Transfer To Stock' | $T8 %] </th>
                 [% END %]
                 <th class="listheading" nowrap width="5" >[%- 'Transfer To Stock' | $T8 %] </th>
                 [% END %]

-                [% IF inout == 'out' %]
+                [% IF in_out == 'out' %]

                 <th class="listheading" nowrap width="5" >[%- 'Release From Stock' | $T8 %] </th>
                 [% END %]
               </tr>
                 <th class="listheading" nowrap width="5" >[%- 'Release From Stock' | $T8 %] </th>
                 [% END %]
               </tr>