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

[IMP] sale_timesheet: projects of sale order

Browse Source 
The stat button now shows all the project involved
in the sale order (created, or linked).

This commits introduce the field `project_ids`,
containing all the project involved in the sales
order (created, or linked via products).

The stat button now shows all involded projects (if
many) or the timesheet overview of the single project.
This commit is contained in:
Jérome Maes
2017-09-13 08:41:31 +02:00
parent 26905ec24a
commit 40beeed12d
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale_timesheet/models/sale_order.py
+22 -10
View File
@@ -5,18 +5,20 @@ from odoo import api, fields, models, _
from odoo.exceptions import ValidationError
from odoo.osv import expression
from odoo.tools.safe_eval import safe_eval
class SaleOrder(models.Model):
_inherit = 'sale.order'
timesheet_ids = fields.Many2many('account.analytic.line', compute='_compute_timesheet_ids', string='Timesheet activities associated to this sale')
timesheet_count = fields.Float(string='Timesheet activities', compute='_compute_timesheet_ids')
timesheet_count = fields.Float(string='Timesheet activities', compute='_compute_timesheet_ids', groups="hr_timesheet.group_hr_timesheet_user")
tasks_ids = fields.Many2many('project.task', compute='_compute_tasks_ids', string='Tasks associated to this sale')
tasks_count = fields.Integer(string='Tasks', compute='_compute_tasks_ids')
tasks_count = fields.Integer(string='Tasks', compute='_compute_tasks_ids', groups="project.group_project_user")
project_project_id = fields.Many2one('project.project', compute='_compute_project_project_id', string='Project associated to this sale')
project_ids = fields.Many2many('project.project', compute="_compute_project_ids", string='Projects', copy=False, groups="project.group_project_user", help="Projects used in this sales order.")
@api.multi
@api.depends('analytic_account_id.line_ids')
@@ -86,15 +88,25 @@ class SaleOrder(models.Model):
return result
@api.multi
def action_view_project_project(self):
def action_view_project_ids(self):
self.ensure_one()
action = self.env.ref('project.open_view_project_all').read()[0]
form_view_id = self.env.ref('project.edit_project').id
action['views'] = [(form_view_id, 'form')]
action['res_id'] = self.project_project_id.id
action.pop('target', None)
if len(self.project_ids) == 1:
if self.env.user.has_group("hr_timesheet.group_hr_timesheet_user"):
action = self.project_ids.action_view_timesheet_plan()
else:
action = self.env.ref("project.act_project_project_2_project_task_all").read()[0]
action['context'] = safe_eval(action.get('context', '{}'), {'active_id': self.project_ids.id, 'active_ids': self.project_ids.ids})
else:
view_form_id = self.env.ref('project.edit_project').id
view_kanban_id = self.env.ref('project.view_project_kanban').id
action = {
'type': 'ir.actions.act_window',
'domain': [('id', 'in', self.project_ids.ids)],
'views': [(view_kanban_id, 'kanban'), (view_form_id, 'form')],
'view_mode': 'kanban,form',
'name': _('Projects'),
'res_model': 'project.project',
}
return action
@api.multi
addons/sale_timesheet/views/sale_order_views.xml
+5 -5
View File
@@ -16,17 +16,17 @@
</button>
</xpath>
<xpath expr="//button[@name='action_view_invoice']" position="before">
<field name="project_project_id" invisible="1"/>
<button type="object"
name="action_view_project_project"
name="action_view_project_ids"
class="oe_stat_button"
icon="fa-puzzle-piece"
string="Project"
attrs="{'invisible': [('project_project_id', '=', False)]}" groups="base.group_user">
string="Project(s) Overview"
attrs="{'invisible': [('project_ids', '=', [])]}"
groups="project.group_project_user">
<field name="project_ids" invisible="1"/>
</button>
</xpath>
<xpath expr="//button[@name='action_view_invoice']" position="before">
<field name="tasks_ids" invisible="1"/>
<button type="object"
name="action_view_task"
class="oe_stat_button"