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

[FIX] project: fix project update default

Browse Source 
Prior to this commit, the case where the update status was not set is
not handled in the STATUS COLOR mapping.

This commit associate a lighten dark color to the unset update status.

See PR : #68899
See task-2393768

PR : #70527

task-2458135
This commit is contained in:
Thibault Libioulle
2021-09-06 10:41:14 +02:00
committed by Laurent Stukkens (LTU)
parent 22cd824772
commit 741663f9de
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/models/project_update.py
+1
View File
@@ -13,6 +13,7 @@ STATUS_COLOR = {
'at_risk': 2, # orange
'off_track': 23, # red / danger
'on_hold': 4, # light blue
False: 0, # default grey -- for studio
}
class ProjectUpdate(models.Model):
addons/sale_timesheet/static/src/xml/sale_project_templates.xml
+1 -5
View File
@@ -62,11 +62,7 @@
</t>
<t t-name="sale_timesheet.ProfitabilitySection" owl="1">
<<<<<<< HEAD
<t t-if="state.data.user.is_project_user &amp;&amp; state.data.profitability_items.data.length > 0">
=======
<t t-if="state.data.user.is_project_manager &amp;&amp; state.data.analytic_account_id &amp;&amp; state.data.profitability_items.data.length > 0">
>>>>>>> [IMP] sale_timesheet: remove overview and improve updates
<t t-if="state.data.user.is_project_user &amp;&amp; state.data.profitability_items.data.length > 0 &amp;&amp; state.data.analytic_account_id">
<t t-set="profitability_items" t-value="state.data.profitability_items"/>
<div name="profitability" class="o_rightpanel_section">
<div class="o_rightpanel_header">