From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Wed, 7 Dec 2016 15:31:41 +0000 (+0100)
Subject: Auftrags-Controller: Einkaufspreis in zweiter Zeile
X-Git-Tag: release-3.5.4~1823
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f2461e14168f6ac5433915b6a0309ddb4884499f;p=kivitendo-erp.git

Auftrags-Controller: Einkaufspreis in zweiter Zeile
---

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 8346821fd..766cd6ea4 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -610,6 +610,8 @@ 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->render();
 }
 
@@ -884,8 +886,7 @@ sub _make_item {
   $item->assign_attributes(%$attr);
   $item->longdescription($item->part->notes)   if $is_new && !defined $attr->{longdescription};
   $item->project_id($record->globalproject_id) if $is_new && !defined $attr->{project_id};
-  # item fields that currently can't be set in row but are needed:
-  $item->lastcost($item->part->lastcost) if $is_new;
+  $item->lastcost($item->part->lastcost)       if $is_new && !defined $attr->{lastcost_as_number};
 
   return $item;
 }
@@ -941,6 +942,7 @@ sub _new_item {
   $new_attr{active_discount_source} = $discount_src;
   $new_attr{longdescription}        = $part->notes           if ! defined $attr->{longdescription};
   $new_attr{project_id}             = $record->globalproject_id;
+  $new_attr{lastcost}               = $part->lastcost;
 
   # add_custom_variables adds cvars to an orderitem with no cvars for saving, but
   # they cannot be retrieved via custom_variables until the order/orderitem is
diff --git a/templates/webpages/order/tabs/_second_row.html b/templates/webpages/order/tabs/_second_row.html
index a29b5eb11..cdda34765 100644
--- a/templates/webpages/order/tabs/_second_row.html
+++ b/templates/webpages/order/tabs/_second_row.html
@@ -25,6 +25,13 @@
       </td>
       <th>[%- 'LP' | $T8 %]</th>
       <td>[%- LxERP.format_amount(ITEM.part.listprice, 2, 0) %]</td>
+      <th>[%- 'EK' | $T8 %]</th>
+      <td>
+        [%- L.input_tag("order.orderitems[].lastcost_as_number",
+                        ITEM.lastcost_as_number,
+                        size = 5,
+                        class="recalc reformat_number numeric") %]
+      </td>
     [%- END %]
     <th>[%- 'On Hand' | $T8 %]</th>
     <td>