Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[kivitendo-erp.git] / templates / webpages / requirement_spec_order / _assignment_form.html

diff --git a/templates/webpages/requirement_spec_order/_assignment_form.html b/templates/webpages/requirement_spec_order/_assignment_form.html
index 161b238..9ec6d13 100644 (file)
--- 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>
-    [% L.select_tag('quotations_and_orders_dummy', SELF.all_parts_time_unit, default=INSTANCE_CONF.get_requirement_spec_section_order_part_id, title_sub=\make_part_title, id='quoations_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>
 
@@ -40,10 +42,22 @@
     [% L.hidden_tag("sections[+].id", section.id, no_id=1) %]
     <td>[% HTML.escape(section.fb_number) %]</td>
     <td>[% HTML.escape(section.title) %]</td>
-    <td>[% HTML.escape(P.truncate(section.description)) %]</td>
-    <td>[% L.select_tag('sections[].order_part_id', SELF.all_parts_time_unit, default=section.order_part_id, with_empty=!for_new, title_sub=\make_part_title, style=style, no_id=1) %]</td>
+    <td>[% HTML.escape(P.truncate(section.description_as_stripped_html)) %]</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>
  </table>
+
+ <p>
+  [% L.button_tag("kivi.requirement_spec.standard_quotation_order_ajax_call('" _ (for_new ? 'create' : 'save_assignment') _ "')", for_new ? LxERP.t8('Create') : LxERP.t8('Save')) %]
+ </p>
 </form>