summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorJérome Maes <jem@openerp.com>2017-10-23 13:51:05 +0200
committerJérome Maes <jem@openerp.com>2017-10-23 14:26:06 +0200
commit5c77f2c512020ddd0d703570946a3bc6fc3bf8ef (patch)
treefc1f246d77be5d6b0d3ec02b081199eb9412b590 /addons
parentb465ae97c65faca26ee3aa000898fecbec3f90f1 (diff)
[MOV] project: split code in correct file
So, move analytic code into its own file for a better understanding and too fit the guidelines.
Diffstat (limited to 'addons')
-rw-r--r--addons/project/models/__init__.py1
-rw-r--r--addons/project/models/analytic.py91
-rw-r--r--addons/project/models/project.py85
3 files changed, 92 insertions, 85 deletions
diff --git a/addons/project/models/__init__.py b/addons/project/models/__init__.py
index 0507afc3e0a..7c7f36c7752 100644
--- a/addons/project/models/__init__.py
+++ b/addons/project/models/__init__.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from . import analytic
from . import project
from . import res_config_settings
from . import res_company
diff --git a/addons/project/models/analytic.py b/addons/project/models/analytic.py
new file mode 100644
index 00000000000..65f756cf6a4
--- /dev/null
+++ b/addons/project/models/analytic.py
@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+
+
+class AccountAnalyticAccount(models.Model):
+ _inherit = 'account.analytic.account'
+ _description = 'Analytic Account'
+
+ 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("Project Count", compute='_compute_project_count')
+
+ def _compute_project_count(self):
+ for account in self:
+ account.project_count = len(account.with_context(active_test=False).project_ids)
+
+ @api.model
+ def create(self, vals):
+ analytic_account = super(AccountAnalyticAccount, self).create(vals)
+ analytic_account.project_create(vals)
+ return analytic_account
+
+ @api.multi
+ def write(self, vals):
+ vals_for_project = vals.copy()
+ for account in self:
+ if not vals.get('name'):
+ vals_for_project['name'] = account.name
+ account.project_create(vals_for_project)
+ return super(AccountAnalyticAccount, self).write(vals)
+
+ @api.multi
+ def unlink(self):
+ projects = self.env['project.project'].search([('analytic_account_id', 'in', self.ids)])
+ has_tasks = self.env['project.task'].search_count([('project_id', 'in', projects.ids)])
+ if has_tasks:
+ raise UserError(_('Please remove existing tasks in the project linked to the accounts you want to delete.'))
+ return super(AccountAnalyticAccount, self).unlink()
+
+ @api.model
+ def name_search(self, name, args=None, operator='ilike', limit=100):
+ if args is None:
+ args = []
+ if self.env.context.get('current_model') == 'project.project':
+ return self.search(args + [('name', operator, name)], limit=limit).name_get()
+
+ return super(AccountAnalyticAccount, self).name_search(name, args=args, operator=operator, limit=limit)
+
+ @api.multi
+ def projects_action(self):
+ projects = self.with_context(active_test=False).mapped('project_ids')
+ result = {
+ "type": "ir.actions.act_window",
+ "res_model": "project.project",
+ "views": [[False, "tree"], [False, "form"]],
+ "domain": [["id", "in", projects.ids]],
+ "context": {"create": False},
+ "name": "Projects",
+ }
+ if len(projects) == 1:
+ result['views'] = [(False, "form")]
+ result['res_id'] = projects.id
+ else:
+ result = {'type': 'ir.actions.act_window_close'}
+ return result
+
+ @api.model
+ def _trigger_project_creation(self, vals):
+ """ 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 'project_creation_in_progress' not in self.env.context
+
+ @api.multi
+ def project_create(self, vals):
+ """ This function is called at the time of analytic account creation and is used to create a project
+ automatically linked to it if the conditions are meet.
+ """
+ self.ensure_one()
+ Project = self.env['project.project']
+ project = Project.with_context(active_test=False).search([('analytic_account_id', '=', self.id)])
+ if not project and self._trigger_project_creation(vals):
+ project_values = {
+ 'name': vals.get('name'),
+ 'analytic_account_id': self.id,
+ }
+ return Project.create(project_values).id
+ return False
diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index 6907edf4543..10c01a592f6 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -867,91 +867,6 @@ class Task(models.Model):
}
-class AccountAnalyticAccount(models.Model):
- _inherit = 'account.analytic.account'
- _description = 'Analytic Account'
-
- 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')
-
- def _compute_project_count(self):
- for account in self:
- account.project_count = len(account.with_context(active_test=False).project_ids)
-
- @api.model
- def _trigger_project_creation(self, vals):
- '''
- 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 'project_creation_in_progress' not in self.env.context
-
- @api.multi
- def project_create(self, vals):
- '''
- This function is called at the time of analytic account creation and is used to create a project automatically linked to it if the conditions are meet.
- '''
- self.ensure_one()
- Project = self.env['project.project']
- project = Project.with_context(active_test=False).search([('analytic_account_id', '=', self.id)])
- if not project and self._trigger_project_creation(vals):
- project_values = {
- 'name': vals.get('name'),
- 'analytic_account_id': self.id,
- }
- return Project.create(project_values).id
- return False
-
- @api.model
- def create(self, vals):
- analytic_account = super(AccountAnalyticAccount, self).create(vals)
- analytic_account.project_create(vals)
- return analytic_account
-
- @api.multi
- def write(self, vals):
- vals_for_project = vals.copy()
- for account in self:
- if not vals.get('name'):
- vals_for_project['name'] = account.name
- account.project_create(vals_for_project)
- return super(AccountAnalyticAccount, self).write(vals)
-
- @api.multi
- def unlink(self):
- projects = self.env['project.project'].search([('analytic_account_id', 'in', self.ids)])
- has_tasks = self.env['project.task'].search_count([('project_id', 'in', projects.ids)])
- if has_tasks:
- raise UserError(_('Please remove existing tasks in the project linked to the accounts you want to delete.'))
- return super(AccountAnalyticAccount, self).unlink()
-
- @api.model
- def name_search(self, name, args=None, operator='ilike', limit=100):
- if args is None:
- args = []
- if self.env.context.get('current_model') == 'project.project':
- return self.search(args + [('name', operator, name)], limit=limit).name_get()
-
- return super(AccountAnalyticAccount, self).name_search(name, args=args, operator=operator, limit=limit)
-
- @api.multi
- def projects_action(self):
- projects = self.with_context(active_test=False).mapped('project_ids')
- result = {
- "type": "ir.actions.act_window",
- "res_model": "project.project",
- "views": [[False, "tree"], [False, "form"]],
- "domain": [["id", "in", projects.ids]],
- "context": {"create": False},
- "name": "Projects",
- }
- if len(projects) == 1:
- result['views'] = [(False, "form")]
- result['res_id'] = projects.id
- else:
- result = {'type': 'ir.actions.act_window_close'}
- return result
-
class ProjectTags(models.Model):
""" Tags of project's tasks """
_name = "project.tags"