X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Frequirement_spec_order%2F_assignment_form.html;h=634cb2446eaf0601a240776c607634f58a05684e;hb=15b67fd51a4e9d274205f59a9f50c4ce86b5e176;hp=f32e71524db2f7a509e49794b80c69906e9ee7fd;hpb=c1f5a8f3f28952c290edb35ee3c0a37f5621ef69;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 f32e71524..634cb2446 100644
--- a/templates/webpages/requirement_spec_order/_assignment_form.html
+++ b/templates/webpages/requirement_spec_order/_assignment_form.html
@@ -1,29 +1,29 @@
 [%- USE HTML -%][%- USE LxERP -%][%- USE L -%][%- USE P -%]
 [% SET style="width: 400px" %]
 
-<table>
-[% IF for_new %]
- <tr>
-  <td>[% LxERP.t8("Record type to create") %]:</td>
-  <td>[% L.select_tag('quotation', [ [ 1, LxERP.t8('Sales quotation') ], [ 0, LxERP.t8('Sales Order') ] ], style=style, no_id=1) %]</td>
- </tr>
+<form id="quotations_and_orders_form">
+ <table>
+  [% IF for_new %]
+  <tr>
+   <td>[% LxERP.t8("Record type to create") %]:</td>
+   <td>[% L.select_tag('quotation', [ [ 1, LxERP.t8('Sales quotation') ], [ 0, LxERP.t8('Sales Order') ] ], style=style, no_id=1) %]</td>
+  </tr>
 
- <tr>
-  <td>[% LxERP.t8("Customer") %]:</td>
-  <td>[% L.select_tag('customer_id', SELF.all_customers, default=SELF.requirement_spec.customer_id, title_key='name', style=style, no_id=1) %]</td>
- </tr>
-[% END %]
+  <tr>
+   <td>[% LxERP.t8("Customer") %]:</td>
+   <td>[% L.select_tag('customer_id', SELF.all_customers, default=SELF.requirement_spec.customer_id, title_key='name', style=style, no_id=1) %]</td>
+  </tr>
+  [% END %]
 
- <tr>
-  <td>[% LxERP.t8("Assign the following article to all sections") %]:</td>
-  <td>
-   [% L.select_tag('quotations_and_orders_dummy', SELF.all_parts, default=INSTANCE_CONF.get_requirement_spec_section_order_part_id, title_sub=\make_part_title, id='quoations_and_orders_order_id', style=style) %]
-   [% L.button_tag('kivi.requirement_spec.assign_order_part_id_to_all()', LxERP.t8('Assign article')) %]
-  </td>
- </tr>
-</table>
+  <tr>
+   <td>[% LxERP.t8("Assign the following article to all sections") %]:</td>
+   <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>
+ </table>
 
-<form id="quotations_and_orders_article_assignment_form">
  <table style="width: 100%">
   <thead>
    <tr class="listheading">
@@ -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, 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>