Skip to content
Snippets Groups Projects
Commit 1113b951 authored by Jérome Maes's avatar Jérome Maes Committed by Thibault Delavallée
Browse files

[IMP] hr_timesheet, sale: improve timesheet-related settings

Sale module now installs sale_timesheet module and not its auto-install
enterprise bridge. It seems more intuitive to installe real applications
and let bridges automatically install themselves.

Some wording is also improved to ease user experience through the various
timesheet related blocks of settings.
parent 5d6090f7
No related branches found
No related tags found
No related merge requests found
......@@ -47,7 +47,7 @@
</div>
</div>
<h2>Billing</h2>
<div name="timesheet_billing" class="row mt16 o_settings_container">
<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 class="col-xs-12 col-md-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_sale_timesheet"/>
......@@ -57,6 +57,11 @@
<div class="text-muted">
Sell services and invoice time spent
</div>
<div class="content-group" name="msg_module_sale_timesheet">
<div class="text-warning mt16" attrs="{'invisible': [('module_sale_timesheet','=',False)]}">
Save this page and come back here to set up the feature.
</div>
</div>
</div>
</div>
</div>
......
......@@ -23,7 +23,7 @@ class SaleConfiguration(models.TransientModel):
implied_group='product.group_uom')
group_discount_per_so_line = fields.Boolean("Discounts", implied_group='sale.group_discount_per_so_line')
group_stock_packaging = fields.Boolean("Packaging", implied_group='product.group_stock_packaging',
help="""Ability to select a package type in sales orders and
help="""Ability to select a package type in sales orders and
to force a quantity that is a multiple of the number of units per package.""")
module_sale_margin = fields.Boolean("Margins")
group_sale_layout = fields.Boolean("Sections on Sales Orders", implied_group='sale.group_sale_layout')
......@@ -78,7 +78,7 @@ class SaleConfiguration(models.TransientModel):
module_delivery_ups = fields.Boolean("UPS")
module_delivery_usps = fields.Boolean("USPS")
module_timesheet_grid_sale = fields.Boolean("Timesheets")
module_sale_timesheet = fields.Boolean("Timesheets")
module_sale_ebay = fields.Boolean("eBay")
module_print_docsaway = fields.Boolean("Docsaway")
module_web_clearbit = fields.Boolean("Customer Autocomplete")
......
......@@ -285,17 +285,17 @@
</div>
<h2>Timesheets</h2>
<div class="row mt16 o_settings_container">
<div class="col-xs-12 col-md-6 o_setting_box" title="Create new projects &amp; tasks for sold services, record time spent and get delivered quantities updated in sales orders accordingly." id="timesheet_grid_sale">
<div class="col-xs-12 col-md-6 o_setting_box" 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)" name="sale_timesheet_box">
<div class="o_setting_left_pane">
<field name="module_timesheet_grid_sale" widget="upgrade_boolean"/>
<field name="module_sale_timesheet" widget="upgrade_boolean"/>
</div>
<div class="o_setting_right_pane">
<label for="module_timesheet_grid_sale"/>
<label for="module_sale_timesheet"/>
<div class="text-muted">
Record time spent on services and invoice it
</div>
<div class="content-group" id="msg_module_timesheet_grid_sale">
<div class="text-warning mt16" attrs="{'invisible': [('module_timesheet_grid_sale','=',False)]}">
<div class="content-group" name="msg_module_sale_timesheet">
<div class="text-warning mt16" attrs="{'invisible': [('module_sale_timesheet','=',False)]}">
Save this page and come back here to set up the feature.
</div>
</div>
......
......@@ -27,4 +27,4 @@ have real delivered quantities in sales orders.
'data/sale_service_demo.xml',
],
'auto_install': True,
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment