X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Frequirement_spec%2F_show_time_and_cost_estimate.html;h=2cff5d9f25b69487587c555ee4a36c424ba185e2;hb=8237252928d60c67870d07e18f78347926374ccd;hp=1c51e052fb1df59589a295dbb7cf3a9da246ddb8;hpb=c19b1e03fb03f195d86a5b78f8ce2338f745f599;p=kivitendo-erp.git

diff --git a/templates/webpages/requirement_spec/_show_time_and_cost_estimate.html b/templates/webpages/requirement_spec/_show_time_and_cost_estimate.html
index 1c51e052f..2cff5d9f2 100644
--- a/templates/webpages/requirement_spec/_show_time_and_cost_estimate.html
+++ b/templates/webpages/requirement_spec/_show_time_and_cost_estimate.html
@@ -1,7 +1,8 @@
 [%- USE LxERP -%][%- USE L -%][%- USE HTML -%][%- USE P -%]
 [%- DEFAULT id_prefix = 'time_and_cost_estimate_form' %]
+[%- SET total_cost = 0 %]
 
-<div id="time_cost_estimate">
+<div id="time_cost_estimate"[% IF initially_hidden %] style="display: none;"[% END %]>
  [%- IF !SELF.requirement_spec.sections.size %]
   <p>[%- LxERP.t8("Neither sections nor function blocks have been created yet.") %]</p>
 
@@ -11,13 +12,15 @@
 
   <table class="time-cost-estimate time-cost-estimate-context-menu">
    <tbody>
-    [%- FOREACH section = SELF.requirement_spec.sections %]
+    [%- FOREACH section = SELF.requirement_spec.sections_sorted %]
      <tr class="listheading">
       <th>[%- LxERP.t8("Function block") %]</th>
       <th>[%- LxERP.t8("Complexity") %]</th>
       <th>[%- LxERP.t8("Risk") %]</th>
       <th align="right">[%- LxERP.t8("Time estimate") %]</th>
-      <th align="right">[%- LxERP.t8("Cost") %]</th>
+      [%- UNLESS SELF.requirement_spec.is_template %]
+       <th align="right">[%- LxERP.t8("Price") %]</th>
+      [%- END %]
      </tr>
 
      <tr class="listrow section">
@@ -26,16 +29,21 @@
 
      [%- IF section.children.size %]
       [%- SET at_least_one_function_block = 1 %]
-      [%- FOREACH child = section.children %]
+      [%- FOREACH child = section.children_sorted %]
        [%- INCLUDE 'requirement_spec/_show_time_and_cost_estimate_item.html'
-                   item  = child
-                   level = 1 %]
+                   section = section
+                   item    = child
+                   level   = 1 %]
       [%- END %]
 
       <tr class="listrow subtotal">
        <td style="padding-left: 50px" colspan="3" class="sum">[%- LxERP.t8("Sum for section") -%]:</td>
        <td align="right" nowrap>[%- P.format_man_days(section.time_estimation, 'skip_zero'=1) -%]</td>
-       <td align="right" nowrap>[%- LxERP.format_amount(section.time_estimation * SELF.requirement_spec.hourly_rate, 2) -%] EUR</td>
+       [%- UNLESS SELF.requirement_spec.is_template %]
+        [%- SET section_cost = section.time_estimation * SELF.requirement_spec.hourly_rate * section.sellprice_factor;
+                total_cost   = total_cost + section_cost %]
+        <td align="right" nowrap>[%- LxERP.format_amount(section_cost, 2) -%] EUR</td>
+       [%- END %]
       </tr>
      [%- END -%]
     [%- END -%]
@@ -45,7 +53,9 @@
     <tr>
      <td colspan="3">[%- LxERP.t8("Sum for #1", SELF.requirement_spec.type.description) -%]:</td>
      <td align="right" nowrap>[%- P.format_man_days(SELF.requirement_spec.time_estimation) -%]</td>
-     <td align="right" nowrap>[%- LxERP.format_amount(SELF.requirement_spec.time_estimation * SELF.requirement_spec.hourly_rate, 2) -%] EUR</td>
+     [%- UNLESS SELF.requirement_spec.is_template %]
+      <td align="right" nowrap>[%- LxERP.format_amount(total_cost, 2) -%] EUR</td>
+     [%- END %]
     </tr>
    </tfoot>
   </table>