diff --git a/addons/crm_project/wizard/crm_lead_convert2task.py b/addons/crm_project/wizard/crm_lead_convert2task.py index 2ada685b53d..6f9f8de10d3 100644 --- a/addons/crm_project/wizard/crm_lead_convert2task.py +++ b/addons/crm_project/wizard/crm_lead_convert2task.py @@ -17,7 +17,7 @@ class CrmLeadConvert2Task(models.TransientModel): return result lead_id = fields.Many2one('crm.lead', string='Lead', domain=[('type', '=', 'lead')]) - project_id = fields.Many2one('project.project', string='Project', domain=[('use_tasks', '=', True)]) + project_id = fields.Many2one('project.project', string='Project') @api.multi def action_lead_to_project_task(self): diff --git a/addons/hr_timesheet/tests/test_timesheet.py b/addons/hr_timesheet/tests/test_timesheet.py index e744d4341f7..e27ee1a6534 100644 --- a/addons/hr_timesheet/tests/test_timesheet.py +++ b/addons/hr_timesheet/tests/test_timesheet.py @@ -13,7 +13,6 @@ class TestTimesheet(TransactionCase): self.project_customer = self.env['project.project'].create({ 'name': 'Project X', 'allow_timesheets': True, - 'use_tasks': True, }) self.task1 = self.env['project.task'].create({ 'name': 'Task One', diff --git a/addons/hr_timesheet/views/project_views.xml b/addons/hr_timesheet/views/project_views.xml index 0a6b1446b8b..b7cbda8ac4c 100644 --- a/addons/hr_timesheet/views/project_views.xml +++ b/addons/hr_timesheet/views/project_views.xml @@ -27,10 +27,7 @@ 24 - - 0 - - + @@ -115,7 +112,7 @@ 24 - + diff --git a/addons/project/models/project.py b/addons/project/models/project.py index 756283820d9..40913c1b42e 100644 --- a/addons/project/models/project.py +++ b/addons/project/models/project.py @@ -166,12 +166,6 @@ class Project(models.Model): def _get_default_favorite_user_ids(self): return [(6, 0, [self.env.uid])] - @api.model - def default_get(self, flds): - result = super(Project, self).default_get(flds) - result['use_tasks'] = True - return result - active = fields.Boolean(default=True, help="If the active field is set to False, it will allow you to hide the project without removing it.") sequence = fields.Integer(default=10, help="Gives the sequence order when displaying a list of Projects.") @@ -256,7 +250,7 @@ class Project(models.Model): @api.model def create(self, vals): - # Prevent double project creation when 'use_tasks' is checked + # Prevent double project creation self = self.with_context(project_creation_in_progress=True, mail_create_nosubscribe=True) project = super(Project, self).create(vals) if not vals.get('subtask_project_id'): @@ -878,7 +872,6 @@ class AccountAnalyticAccount(models.Model): _inherit = 'account.analytic.account' _description = 'Analytic Account' - use_tasks = fields.Boolean(string='Use Tasks', help="Check this box to manage internal activities through this project") company_uom_id = fields.Many2one('product.uom', related='company_id.project_time_mode_id', string="Company UOM") project_ids = fields.One2many('project.project', 'analytic_account_id', string='Projects') project_count = fields.Integer(compute='_compute_project_count', string='Project Count') @@ -892,7 +885,7 @@ class AccountAnalyticAccount(models.Model): ''' This function is used to decide if a project needs to be automatically created or not when an analytic account is created. It returns True if it needs to be so, False otherwise. ''' - return vals.get('use_tasks') and 'project_creation_in_progress' not in self.env.context + return 'project_creation_in_progress' not in self.env.context @api.multi def project_create(self, vals): @@ -906,7 +899,6 @@ class AccountAnalyticAccount(models.Model): project_values = { 'name': vals.get('name'), 'analytic_account_id': self.id, - 'use_tasks': True, } return Project.create(project_values).id return False diff --git a/addons/project/views/project_portal_templates.xml b/addons/project/views/project_portal_templates.xml index afb8a5534c0..a86176bd10c 100644 --- a/addons/project/views/project_portal_templates.xml +++ b/addons/project/views/project_portal_templates.xml @@ -56,7 +56,7 @@ - + diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index b05720f1d82..35709475566 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -109,7 +109,7 @@ - @@ -126,9 +126,8 @@
- -
@@ -225,9 +224,6 @@ - - -