X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Frequirement_spec_order%2F_assignment_form.html;h=9ec6d13d25bd614908a4b093bd273a3e6762a735;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=28cc667ab99c5967e212e6e5e87ba4a76e059fca;hpb=2c92b5acfbbc7486730ec7feec509abbdcbc7ebc;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 28cc667ab..9ec6d13d2 100644 --- a/templates/webpages/requirement_spec_order/_assignment_form.html +++ b/templates/webpages/requirement_spec_order/_assignment_form.html @@ -17,8 +17,8 @@ [% LxERP.t8("Assign the following article to all sections") %]: - - [% 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) %] + + [% 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')) %] @@ -31,6 +31,8 @@ [% LxERP.t8("Title") %] [% LxERP.t8("Description") %] [% LxERP.t8("Article") %] + [% LxERP.t8("Unit") %] + [% LxERP.t8("Position type in quotation/order") %] @@ -40,8 +42,16 @@ [% L.hidden_tag("sections[+].id", section.id, no_id=1) %] [% HTML.escape(section.fb_number) %] [% HTML.escape(section.title) %] - [% HTML.escape(P.truncate(section.description)) %] - [% 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) %] + [% HTML.escape(P.truncate(section.description_as_stripped_html)) %] + [% P.part.picker('sections[].order_part_id', section.order_part_id, id='quotations_and_orders_sections_order_pard_id_' _ loop.count, style=style) %] + [% HTML.escape(section.order_part.unit) %] + + [% 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 %] + [% END %]