pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] {sale_timesheet}: improve the margin displayed on project update

Browse Source 
The Gross Margin stat button does not display the same value as the margin shown
AAL linked to the AA of the project, which might be confusing. This has been
improved by changing some labels, and adding some explanatory tooltips.

task-2671576

closes odoo/odoo#78739

Signed-off-by: Laurent Stukkens (ltu) <ltu@odoo.com>
This commit is contained in:
Cedric Prieels (cpr)
2021-11-12 20:53:17 +00:00
parent 2857980a6c
commit d3e7bd1904
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale_timesheet/static/src/xml/sale_project_templates.xml
+9 -4
View File
@@ -44,11 +44,11 @@
<span class="o_rightpanel_right_col font-weight-bold float-right"><t t-esc="formatFloat(sold_items.total_sold)"/> <t t-esc="sold_items.company_unit_name"/></span>
</div>
<div class="o_rightpanel_data">
<div class="o_rightpanel_data_row">
<div class="o_rightpanel_data_row" data-toggle="tooltip" title="Time spent on this project and its tasks, based on timesheet entries.">
<span class="o_rightpanel_left_col o_rightpanel_left_text">Effective</span>
<span class="o_rightpanel_right_col"><t t-esc="formatFloat(sold_items.effective_sold)"/> <t t-esc="sold_items.company_unit_name"/></span>
</div>
<div class="o_rightpanel_data_row" t-if="sold_items.planned_sold > 0 and sold_items.allow_forecast">
<div class="o_rightpanel_data_row" data-toggle="tooltip" title="Planned hours for this project and its tasks based on recorded shifts." t-if="sold_items.planned_sold > 0 and sold_items.allow_forecast">
<span class="o_rightpanel_left_col o_rightpanel_left_text">Planned</span>
<span class="o_rightpanel_right_col"><t t-esc="formatFloat(sold_items.planned_sold)"/> <t t-esc="sold_items.company_unit_name"/></span>
</div>
@@ -67,13 +67,18 @@
<div name="profitability" class="o_rightpanel_section">
<div class="o_rightpanel_header">
<div class="o_rightpanel_title">
Profitability
Profitability Forecast
</div>
</div>
<div class="o_rightpanel_data">
<div t-foreach="profitability_items.data" t-as="profitability" t-key="profitability.name" class="o_rightpanel_data_row">
<span class="o_rightpanel_left_col o_rightpanel_left_text"><t t-esc="profitability.name"/></span>
<span class="o_rightpanel_left_col o_rightpanel_left_text" data-toggle="tooltip" title="In the margin forecast, costs and revenues related to the analytical account are taken into account, along with future income based on hours that have been sold but not invoiced yet." t-if="profitability.name == 'Margin'">
<t t-esc="profitability.name"/>
</span>
<span class="o_rightpanel_left_col o_rightpanel_left_text" t-else="">
<t t-esc="profitability.name"/>
</span>
<t t-if="profitability.color">
<span t-attf-class="o_rightpanel_right_col o_color_{{profitability.color}}"><b><t t-esc="profitability.value"/></b></span>
</t>