X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Frequirement_spec_order%2Flist.html;h=d1c227891117b7ab8e29916159c4968d440e0711;hb=7e61972690cfa1f688ebd9770fcf9d100b9dfdd0;hp=4e0c15d2e3c7d915c7fd6f4412e79b92b9604240;hpb=938703cc7be5fb1c07d9fbb88445570bdf5fdf2d;p=kivitendo-erp.git
diff --git a/templates/webpages/requirement_spec_order/list.html b/templates/webpages/requirement_spec_order/list.html
index 4e0c15d2e..d1c227891 100644
--- a/templates/webpages/requirement_spec_order/list.html
+++ b/templates/webpages/requirement_spec_order/list.html
@@ -15,6 +15,8 @@
[% LxERP.t8("Title") %] |
[% LxERP.t8("Description") %] |
[% LxERP.t8("Article") %] |
+ [% LxERP.t8("Unit") %] |
+ [% LxERP.t8("Position type in quotation/order") %] |
@@ -23,7 +25,7 @@
[% HTML.escape(section.fb_number) %] |
[% HTML.escape(section.title) %] |
- [% HTML.escape(P.truncate(section.description)) %] |
+ [% HTML.escape(P.truncate(section.description_as_stripped_html)) %] |
[% IF section.order_part %]
[% HTML.escape(section.order_part.partnumber) %] [% HTML.escape(section.order_part.description) %]
@@ -31,6 +33,14 @@
[% LxERP.t8("no article assigned yet") %]
[% END %]
|
+ [% 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 %]
@@ -68,7 +78,15 @@
[% LxERP.t8("working copy") %]
[% END %]
- [% HTML.escape(rs_order.order.quotation ? rs_order.order.quonumber : rs_order.order.ordnumber) %] |
+
+ [%- IF INSTANCE_CONF.get_feature_experimental_order -%]
+
+ [%- ELSE -%]
+
+ [%- END -%]
+ [% HTML.escape(rs_order.order.quotation ? rs_order.order.quonumber : rs_order.order.ordnumber) %]
+
+ |
[% HTML.escape(rs_order.order.transaction_description) %] |
[% rs_order.order.transdate.to_kivitendo(precision='day') %] |
[% rs_order.itime.to_kivitendo(precision='day') %] |