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

[kivitendo-erp.git] / templates / webpages / requirement_spec / _show_time_and_cost_estimate_item.html

diff --git a/templates/webpages/requirement_spec/_show_time_and_cost_estimate_item.html b/templates/webpages/requirement_spec/_show_time_and_cost_estimate_item.html
index c3d21e3..d051972 100644 (file)
--- a/templates/webpages/requirement_spec/_show_time_and_cost_estimate_item.html
+++ b/templates/webpages/requirement_spec/_show_time_and_cost_estimate_item.html
@@ -8,7 +8,7 @@
  [%- IF !item.children.size -%]
   <td align="right" nowrap>[%- P.format_man_days(item.time_estimation, skip_zero=1) -%]</td>
   [%- UNLESS SELF.requirement_spec.is_template %]
-   <td align="right" nowrap>[%- LxERP.format_amount(item.time_estimation * SELF.requirement_spec.hourly_rate, 2) -%] EUR</td>
+   <td align="right" nowrap>[%- LxERP.format_amount(item.time_estimation * SELF.requirement_spec.hourly_rate * section.sellprice_factor, 2) -%] EUR</td>
   [%- END %]
  [%- ELSE -%]
   <td>&nbsp;</td>
@@ -19,15 +19,16 @@
 [%- IF item.children.size -%]
  [%- FOREACH child = item.children_sorted -%]
   [%- INCLUDE 'requirement_spec/_show_time_and_cost_estimate_item.html'
-              item  = child
-              level = level + 1 -%]
+              section = section
+              item    = child
+              level   = level + 1 -%]
  [%- END -%]
 
  <tr class="listrow subtotal">
   <td style="padding-left: [%- (level + 1) * 50 -%]px" colspan="3">[%- LxERP.t8("Sum for #1", item.fb_number) -%]:</td>
   <td align="right" nowrap>[%- P.format_man_days(item.time_estimation, skip_zero=1) -%]</td>
   [%- UNLESS SELF.requirement_spec.is_template %]
-   <td align="right" nowrap>[%- LxERP.format_amount(item.time_estimation * SELF.requirement_spec.hourly_rate, 2) -%] EUR</td>
+   <td align="right" nowrap>[%- LxERP.format_amount(item.time_estimation * SELF.requirement_spec.hourly_rate * section.sellprice_factor, 2) -%] EUR</td>
   [%- END %]
  </tr>
 [%- END -%]