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

[IMP] sale_timesheet, hr_timesheet: usability

Browse Source 
Improve labelling and design in timesheet settings view.

Task-1967574
This commit is contained in:
Geoffroy Larue
2019-05-06 07:35:56 +00:00
parent c9fad69c17
commit e9dcf8a38c
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet/models/project.py
+1 -1
View File
@@ -144,7 +144,7 @@ class Task(models.Model):
def write(self, values):
# a timesheet must have an analytic account (and a project)
if 'project_id' in values and self and not values.get('project_id'):
raise UserError(_('This task must be part of a project because they some timesheets are linked to it.'))
raise UserError(_('This task must be part of a project because there are some timesheets linked to it.'))
return super(Task, self).write(values)
@api.model
addons/hr_timesheet/views/res_config_settings_views.xml
+6 -6
View File
@@ -30,12 +30,12 @@
<span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
<div class="row">
<div class="text-muted col-md-12">
Set time unit used to record your timesheets
Set the time unit used to record your timesheets
</div>
</div>
<div class="content-group">
<div class="mt16">
<field name="timesheet_encode_uom_id" options="{'no_create': True}" required="1"/>
<field name="timesheet_encode_uom_id" options="{'no_create': True}" required="1" class="col-lg-5"/>
</div>
</div>
</div>
@@ -47,23 +47,23 @@
<div class="o_setting_right_pane">
<label for="module_project_timesheet_synchro"/>
<div class="text-muted">
Synchronize time spent with web/mobile app
Synchronize time spent with our web/mobile apps
</div>
<div class="content-group">
<div class="row mt16 oe_center">
<div class="col-lg-4">
<a href="http://www.odoo.com/page/timesheet?platform=chrome">
<img alt="Google Chrome Store" class="img img-fluid" src="project/static/src/img/chrome_store.png"/>
<img alt="Google Chrome Store" class="img img-fluid h-100" src="project/static/src/img/chrome_store.png"/>
</a>
</div>
<div class="col-lg-4">
<a href="http://www.odoo.com/page/timesheet?platform=ios">
<img alt="Apple App Store" class="img img-fluid" src="project/static/src/img/app_store.png"/>
<img alt="Apple App Store" class="img img-fluid h-100" src="project/static/src/img/app_store.png"/>
</a>
</div>
<div class="col-lg-4">
<a href="http://www.odoo.com/page/timesheet?platform=android">
<img alt="Google Play Store" class="img img-fluid" src="project/static/src/img/play_store.png"/>
<img alt="Google Play Store" class="img img-fluid h-100" src="project/static/src/img/play_store.png"/>
</a>
</div>
</div>
addons/sale_timesheet/views/res_config_settings_views.xml
+5 -5
View File
@@ -9,7 +9,7 @@
<field name="arch" type="xml">
<xpath expr="//div[@name='section_leaves']" position="before">
<h2>Billing</h2>
<div name="timesheet_billing" class="row mt16 o_settings_container" title="Sell services (e.g. project, maintenance), record time spent using Timesheets app and invoice them based on a fixed price (ordered quantity) or on the time spent (delivered quantity)">
<div name="timesheet_billing" class="row mt16 o_settings_container">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_right_pane">
<span class="o_form_label">Time Billing</span>
@@ -17,15 +17,15 @@
Sell services and invoice time spent
</div>
<div class="content-group" name="msg_module_sale_timesheet">
<div class="mt16">
<div class="pt-2">
<div>
<button name="%(sale_timesheet.product_template_action_time_based)d" string="Setup your time-based services" type="action" class="btn-link" icon="fa-arrow-right"/>
<button name="%(sale_timesheet.product_template_action_fixed)d" string="Configure your fixed price services" type="action" class="btn-link" icon="fa-arrow-right"/>
</div>
<div>
<button name="%(sale_timesheet.product_template_action_fixed)d" string="Setup your fixed price services" type="action" class="btn-link" icon="fa-arrow-right"/>
<button name="%(sale_timesheet.product_template_action_time_based)d" string="Configure your time-based services" type="action" class="btn-link" icon="fa-arrow-right"/>
</div>
<div>
<button name="%(sale_timesheet.product_template_action_milestone)d" string="Setup your milestone services" type="action" class="btn-link" icon="fa-arrow-right"/>
<button name="%(sale_timesheet.product_template_action_milestone)d" string="Configure your milestone services" type="action" class="btn-link" icon="fa-arrow-right"/>
</div>
</div>
</div>