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

[IMP] {hr,sale}_timesheet: use the container for project settings

Browse Source 
Before this commit, we create a container to add the new options in the
project settings.

This commit removes the container to put these options in the default
container.

task-2387984

closes #66740
This commit is contained in:
Xavier BOL (xbo)
2021-03-12 14:15:36 +01:00
parent 63777d3c3f
commit 9fed5964a6
2 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet/views/project_views.xml
+9 -11
View File
@@ -51,17 +51,15 @@
</div>
</button>
</div>
<xpath expr="//div[@id='rating_settings']/.." position="before">
<div class="row mt16 o_settings_container">
<div class="col-lg-6 o_setting_box" id="timesheet_settings">
<div class="o_setting_left_pane">
<field name="allow_timesheets"/>
</div>
<div class="o_setting_right_pane">
<label for="allow_timesheets" string="Timesheets"/>
<div class="text-muted">
Log time on tasks
</div>
<xpath expr="//div[@id='rating_settings']" position="before">
<div class="col-lg-6 o_setting_box" id="timesheet_settings">
<div class="o_setting_left_pane">
<field name="allow_timesheets"/>
</div>
<div class="o_setting_right_pane">
<label for="allow_timesheets" string="Timesheets"/>
<div class="text-muted">
Log time on tasks
</div>
</div>
</div>
addons/sale_timesheet/views/project_task_views.xml
+9 -11
View File
@@ -40,17 +40,15 @@
</field>
</page>
</xpath>
<xpath expr="//div[@id='timesheet_settings']/.." position="after">
<div class="row mt16 o_settings_container">
<div class="col-lg-6 o_setting_box" id="allow_billable_container">
<div class="o_setting_left_pane">
<field name="allow_billable"/>
</div>
<div class="o_setting_right_pane">
<label for="allow_billable"/>
<div class="text-muted" id="allow_billable_setting">
Invoice your time and material to customers
</div>
<xpath expr="//div[@id='timesheet_settings']" position="after">
<div class="col-lg-6 o_setting_box" id="allow_billable_container">
<div class="o_setting_left_pane">
<field name="allow_billable"/>
</div>
<div class="o_setting_right_pane">
<label for="allow_billable"/>
<div class="text-muted" id="allow_billable_setting">
Invoice your time and material to customers
</div>
</div>
</div>