X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Frequirement_spec_order%2F_assignment_form.html;h=9ec6d13d25bd614908a4b093bd273a3e6762a735;hb=2ac999504a5039c972da30c0f6177b34f6e2177b;hp=9990c55eafec329d87c00cdfd566f858e6033f29;hpb=3fbb0b9bbc37dbbe10407a858c58148e2d835c2c;p=kivitendo-erp.git

diff --git a/templates/webpages/requirement_spec_order/_assignment_form.html b/templates/webpages/requirement_spec_order/_assignment_form.html
index 9990c55ea..9ec6d13d2 100644
--- a/templates/webpages/requirement_spec_order/_assignment_form.html
+++ b/templates/webpages/requirement_spec_order/_assignment_form.html
@@ -17,8 +17,8 @@
 
   <tr>
    <td>[% LxERP.t8("Assign the following article to all sections") %]:</td>
-   <td>
-    [% P.part_picker('quotations_and_orders_dummy', INSTANCE_CONF.get_requirement_spec_section_order_part_id, convertible_unit=SELF.h_unit_name, id='quotations_and_orders_order_id', style=style) %]
+   <td data-unit="[% HTML.escape(SELF.section_order_part.unit) %]">
+    [% P.part.picker('quotations_and_orders_dummy', SELF.section_order_part.id, id='quotations_and_orders_order_id', style=style) %]
     [% L.button_tag('kivi.requirement_spec.assign_order_part_id_to_all()', LxERP.t8('Assign article')) %]
    </td>
   </tr>
@@ -31,6 +31,8 @@
     <th>[% LxERP.t8("Title") %]</th>
     <th>[% LxERP.t8("Description") %]</th>
     <th>[% LxERP.t8("Article") %]</th>
+    <th>[% LxERP.t8("Unit") %]</th>
+    <th>[% LxERP.t8("Position type in quotation/order") %]</th>
    </tr>
   </thead>
 
@@ -41,7 +43,15 @@
     <td>[% HTML.escape(section.fb_number) %]</td>
     <td>[% HTML.escape(section.title) %]</td>
     <td>[% HTML.escape(P.truncate(section.description_as_stripped_html)) %]</td>
-    <td>[% P.part_picker('sections[].order_part_id', section.order_part_id, convertible_unit=SELF.h_unit_name, id='quotations_and_orders_sections_order_pard_id_' _ loop.count, style=style) %]</td>
+    <td>[% P.part.picker('sections[].order_part_id', section.order_part_id, id='quotations_and_orders_sections_order_pard_id_' _ loop.count, style=style) %]</td>
+    <td data-unit-column=1>[% HTML.escape(section.order_part.unit) %]</td>
+    <td data-position-type-column=1>
+     [% IF section.order_part_id && section.order_part.unit_obj.is_time_based %]
+      [% LxERP.t8("time and effort based position") %]
+     [% ELSIF section.order_part_id %]
+      [% LxERP.t8("flat-rate position") %]
+     [% END %]
+    </td>
    </tr>
    [% END %]
   </tbody>