Auftrags-Controller: Projektnummer in zweiter Zeile

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index a24d1d3b56c749e4e34219338199b67a6da2aea0..df18eb857bd6ca3e7696f8b7ec745fe6ed78f700 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -864,6 +864,7 @@ sub _make_item {
 
   $item->assign_attributes(%$attr);
   $item->longdescription($item->part->notes) if $is_new && !defined $attr->{longdescription};
 
   $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 in row but are needed:
   $item->lastcost($item->part->lastcost) if $is_new;
 
   # item fields that currently can't be set in in row but are needed:
   $item->lastcost($item->part->lastcost) if $is_new;
 


@@ -921,6 +922,7 @@ sub _new_item {
   $new_attr{active_discount_source} = $discount_src;
 
   $new_attr{longdescription}        = $part->notes if ! defined $attr->{longdescription};
   $new_attr{active_discount_source} = $discount_src;
 
   $new_attr{longdescription}        = $part->notes if ! defined $attr->{longdescription};

+  $new_attr{project_id}             = $record->globalproject_id;

 
   # 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 cc2646ecd97b1ecab63ba444fe44c0d4d5d925ee..8b9939ad2e3b0d0cb13655f180de59561e4bcf7d 100644 (file)
--- a/templates/webpages/order/tabs/_second_row.html
+++ b/templates/webpages/order/tabs/_second_row.html
@@ -7,6 +7,8 @@
   <tr>
     <th>[%- 'Serial No.' | $T8 %]</th>
     <td>[%- L.input_tag("order.orderitems[].serialnumber", ITEM.serialnumber, size = 15) %]</td>
   <tr>
     <th>[%- 'Serial No.' | $T8 %]</th>
     <td>[%- L.input_tag("order.orderitems[].serialnumber", ITEM.serialnumber, size = 15) %]</td>

+    <th>[%- 'Project' | $T8 %]</th>
+    <td>[% L.project_picker("order.orderitems[].project_id", ITEM.project_id, size = 15) %]</td>

     <th>[%- 'Reqdate' | $T8 %]</th>
     <td>[% L.date_tag("order.orderitems[].reqdate", ITEM.reqdate) %]</td>
     <th>[%- 'Subtotal' | $T8 %]</th>
     <th>[%- 'Reqdate' | $T8 %]</th>
     <td>[% L.date_tag("order.orderitems[].reqdate", ITEM.reqdate) %]</td>
     <th>[%- 'Subtotal' | $T8 %]</th>