[IMP] project: improvements in configuration,
>Remove the Sale Service option, because 'sale_service' module doesn't exist anymore. >Remove the option "Time on Tasks" and link the Time Scheduling (resource_calendar_id) to Forecast. >Hide the Timesheets section if the 'hr_timesheet_sheet' app is not installed. >Change the label "Timesheets on Issues" instead of "Timesheets Invoicing". >"Timesheets on Issues" shouldn't appear if hr_timesheet_sheet + project_issue apps are not installed.
This commit is contained in:
Mansi Gandhi
committed by
Yannick Tivisse
Yannick Tivisse
parent
d5943607dd
commit
78643853ac
@@ -3,4 +3,5 @@
|
||||
|
||||
import hr_timesheet_sheet
|
||||
import hr_department
|
||||
import hr_timesheet_sheet_config_settings
|
||||
import wizard
|
||||
|
||||
@@ -34,6 +34,7 @@ The validation can be configured in the company:
|
||||
'hr_timesheet_sheet_data.xml',
|
||||
'views/hr_timesheet_sheet.xml',
|
||||
'hr_timesheet_sheet_view.xml',
|
||||
'hr_timesheet_sheet_config_settings_views.xml',
|
||||
'hr_dashboard.xml',
|
||||
],
|
||||
'test':['../account/test/account_minimal_test.xml', 'test/test_hr_timesheet_sheet.yml'],
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
from odoo import fields, models
|
||||
|
||||
class HrTimesheetConfiguration(models.TransientModel):
|
||||
_inherit = 'project.config.settings'
|
||||
|
||||
module_project_timesheet_synchro = fields.Boolean(string="Timesheet app for Chrome/Android/iOS")
|
||||
@@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
|
||||
<record id="view_config_settings_form_inherit_hr_timesheet_sheet" model="ir.ui.view">
|
||||
<field name="name">project.config.settings.form.inherit.timesheet.sheet</field>
|
||||
<field name="model">project.config.settings</field>
|
||||
<field name="inherit_id" ref="project.view_config_settings"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//group[@name='timesheets']" position="attributes">
|
||||
<attribute name="string">Timesheets</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//group[@name='timesheets']" position="inside">
|
||||
<label for="id" string="Extra features"/>
|
||||
<div>
|
||||
<field name="module_project_timesheet_synchro" widget="upgrade_boolean"/>
|
||||
<label for="module_project_timesheet_synchro"/>
|
||||
<a href="https://www.odoo.com/page/timesheet" target="_blank"> More Info </a>
|
||||
</div>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
@@ -118,9 +118,6 @@
|
||||
groups="base.group_no_one"/>
|
||||
</group>
|
||||
<group name="misc">
|
||||
<group string="Time Scheduling" groups="project.group_time_work_estimation_tasks">
|
||||
<field name="resource_calendar_id"/>
|
||||
</group>
|
||||
<group string="Configuration" groups="base.group_no_one">
|
||||
<field name="sequence" groups="base.group_no_one"/>
|
||||
</group>
|
||||
|
||||
@@ -10,14 +10,6 @@ class project_configuration(osv.osv_memory):
|
||||
_inherit = 'res.config.settings'
|
||||
|
||||
_columns = {
|
||||
'module_sale_service': fields.selection([
|
||||
(0, "No automatic task creation"),
|
||||
(1, 'Generate tasks from sale orders')
|
||||
], "Sale Service",
|
||||
help='This feature automatically creates project tasks from service products in sale orders. '
|
||||
'In order to make it work, the product has to be a service and \'Create Task Automatically\' '
|
||||
'has to be flagged on the procurement tab in the product form.\n'
|
||||
'-This installs the module sale_service.'),
|
||||
'module_pad': fields.selection([
|
||||
(0, "Task description is a plain text"),
|
||||
(1, "Collaborative rich text on task description")
|
||||
@@ -30,24 +22,11 @@ class project_configuration(osv.osv_memory):
|
||||
(1, 'Allow activating customer rating on projects, at issue completion')
|
||||
], "Rating",
|
||||
help="This allows customers to give rating on provided services"),
|
||||
'module_project_issue_sheet': fields.selection([
|
||||
(0, "Do not track working hours on issues"),
|
||||
(1, "Activate timesheets on issues")
|
||||
], "Timesheets Invoicing",
|
||||
help='Provides timesheet support for the issues/bugs management in project.\n'
|
||||
'-This installs the module project_issue_sheet.'),
|
||||
'group_time_work_estimation_tasks': fields.selection([
|
||||
(0, "Do not estimate working time on tasks"),
|
||||
(1, "Manage time estimation on tasks")
|
||||
], "Time on Tasks",
|
||||
implied_group='project.group_time_work_estimation_tasks',
|
||||
help="Allows you to compute Time Estimation on tasks."),
|
||||
'generate_project_alias': fields.selection([
|
||||
(0, "Do not create an email alias automatically"),
|
||||
(1, "Automatically generate an email alias at the project creation")
|
||||
], "Project Alias",
|
||||
help="Odoo will generate an email alias at the project creation from project name."),
|
||||
'module_project_timesheet_synchro': fields.boolean("Timesheet app for Chrome/Android/iOS"),
|
||||
'module_project_forecast': fields.boolean("Forecasts, planning and Gantt charts"),
|
||||
}
|
||||
|
||||
|
||||
@@ -12,9 +12,7 @@
|
||||
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
|
||||
</header>
|
||||
<group string="Project Management" name="project_management">
|
||||
<field name="module_sale_service" widget="radio"/>
|
||||
<field name="module_pad" widget="radio"/>
|
||||
<field name="group_time_work_estimation_tasks" widget="radio"/>
|
||||
<label for="id" string="Forecasts"/>
|
||||
<div>
|
||||
<div>
|
||||
@@ -24,15 +22,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</group>
|
||||
<group string="Timesheets">
|
||||
<label for="id" string="Extra features"/>
|
||||
<div>
|
||||
<field name="module_project_timesheet_synchro" widget="upgrade_boolean"/>
|
||||
<label for="module_project_timesheet_synchro"/>
|
||||
<a href="https://www.odoo.com/page/timesheet" target="_blank"> More Info </a>
|
||||
</div>
|
||||
<field name="module_project_issue_sheet" widget="radio"/>
|
||||
</group>
|
||||
<group name="timesheets"/>
|
||||
<group string="Helpdesk & Support">
|
||||
<field name="module_rating_project" widget="radio"/>
|
||||
</group>
|
||||
|
||||
@@ -4,3 +4,4 @@
|
||||
import models
|
||||
import project_issue
|
||||
import report
|
||||
import project_issue_config_settings
|
||||
|
||||
@@ -21,6 +21,7 @@ It allows the manager to quickly check the issues, assign them and decide on the
|
||||
],
|
||||
'data': [
|
||||
'project_issue_view.xml',
|
||||
'project_issue_config_settings_views.xml',
|
||||
'project_issue_menu.xml',
|
||||
'report/project_issue_report_view.xml',
|
||||
'security/project_issue_security.xml',
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
|
||||
from openerp import models, fields
|
||||
|
||||
class ProjectIssueConfiguration(models.TransientModel):
|
||||
_inherit = 'project.config.settings'
|
||||
|
||||
module_project_issue_sheet = fields.Selection([
|
||||
(0, "Do not track working hours on issues"),
|
||||
(1, "Activate timesheets on issues")
|
||||
], string="Timesheets on Issues",
|
||||
help='Provides timesheet support for the issues/bugs management in project.\n'
|
||||
'-This installs the module project_issue_sheet.')
|
||||
@@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
<data>
|
||||
<record id="view_config_settings_form_inherit_project_issue" model="ir.ui.view">
|
||||
<field name="name">project issue settings</field>
|
||||
<field name="model">project.config.settings</field>
|
||||
<field name="inherit_id" ref="project.view_config_settings"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//group[@name='timesheets']" position="attributes">
|
||||
<attribute name="string">Timesheets</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//group[@name='timesheets']" position="inside">
|
||||
<field name="module_project_issue_sheet" widget="radio"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</data>
|
||||
</odoo>
|
||||
Reference in New Issue
Block a user