X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Frequirement_spec%2F_show_time_and_cost_estimate.html;h=2cff5d9f25b69487587c555ee4a36c424ba185e2;hb=2bc33284e526869f0de7aa0ddd5cdb141432f4e3;hp=e8e4c3d5215a2618432578af58f89f4a0f271e3e;hpb=b8a9076330788981d439d15791d83711057855de;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 e8e4c3d52..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,5 +1,6 @@
[%- USE LxERP -%][%- USE L -%][%- USE HTML -%][%- USE P -%]
[%- DEFAULT id_prefix = 'time_and_cost_estimate_form' %]
+[%- SET total_cost = 0 %]
[%- IF !SELF.requirement_spec.sections.size %]
@@ -18,7 +19,7 @@
[%- LxERP.t8("Risk") %] |
[%- LxERP.t8("Time estimate") %] |
[%- UNLESS SELF.requirement_spec.is_template %]
- [%- LxERP.t8("Cost") %] |
+ [%- LxERP.t8("Price") %] |
[%- END %]
@@ -30,15 +31,18 @@
[%- SET at_least_one_function_block = 1 %]
[%- 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 %]
[%- LxERP.t8("Sum for section") -%]: |
[%- P.format_man_days(section.time_estimation, 'skip_zero'=1) -%] |
[%- UNLESS SELF.requirement_spec.is_template %]
- [%- LxERP.format_amount(section.time_estimation * SELF.requirement_spec.hourly_rate, 2) -%] EUR |
+ [%- SET section_cost = section.time_estimation * SELF.requirement_spec.hourly_rate * section.sellprice_factor;
+ total_cost = total_cost + section_cost %]
+ [%- LxERP.format_amount(section_cost, 2) -%] EUR |
[%- END %]
[%- END -%]
@@ -50,7 +54,7 @@
[%- LxERP.t8("Sum for #1", SELF.requirement_spec.type.description) -%]: |
[%- P.format_man_days(SELF.requirement_spec.time_estimation) -%] |
[%- UNLESS SELF.requirement_spec.is_template %]
- [%- LxERP.format_amount(SELF.requirement_spec.time_estimation * SELF.requirement_spec.hourly_rate, 2) -%] EUR |
+ [%- LxERP.format_amount(total_cost, 2) -%] EUR |
[%- END %]