Auftrags-Controller: Einkaufspreis in zweiter Zeile

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 8346821fdd4f08f5bb74360fd3d16d7fb2072985..766cd6ea4879db173dd16be809b0f9a493d36b26 100644 (file)
--- 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_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();
 }
 
   $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->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;
 }
 
   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{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
 
   # 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 a29b5eb11bf38f72de7accb81419ab9e4fed0e71..cdda34765e784e0a9e477a131f08f8e5d8ae6f0e 100644 (file)
--- 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>
       </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>
     [%- END %]
     <th>[%- 'On Hand' | $T8 %]</th>
     <td>