From 84fd8db1443a3b76ff2256f65570c4fc37aed1e7 Mon Sep 17 00:00:00 2001 From: Geoffroy Larue Date: Mon, 15 Apr 2019 14:36:52 +0000 Subject: [PATCH] [IMP] sale_timesheet: remove assign SO item action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If timesheets are recorded on tasks that aren't linked to any Sales Order, the user can assign a SOL (in batch) later on by going to the Action > Assign Sale Order Item. Since the introduction of FSM, the user can directly create Sales Orders from the Project Overview and from Tasks. This makes the "Assign Sale Order Item" action redundant. This commit removes this action. Task-1968074 closes odoo/odoo#32696 Signed-off-by: Jérome Maes (jem) --- addons/sale_timesheet/__manifest__.py | 1 - addons/sale_timesheet/wizard/__init__.py | 1 - .../wizard/project_task_assign_so_line.py | 29 ---------------- .../project_task_assign_so_line_views.xml | 34 ------------------- 4 files changed, 65 deletions(-) delete mode 100644 addons/sale_timesheet/wizard/project_task_assign_so_line.py delete mode 100644 addons/sale_timesheet/wizard/project_task_assign_so_line_views.xml diff --git a/addons/sale_timesheet/__manifest__.py b/addons/sale_timesheet/__manifest__.py index beb318b3ad9..9a5c5f71075 100644 --- a/addons/sale_timesheet/__manifest__.py +++ b/addons/sale_timesheet/__manifest__.py @@ -26,7 +26,6 @@ have real delivered quantities in sales orders. 'views/hr_timesheet_templates.xml', 'report/project_profitability_report_analysis_views.xml', 'data/sale_timesheet_filters.xml', - 'wizard/project_task_assign_so_line_views.xml', 'wizard/project_create_sale_order_views.xml', 'wizard/project_create_invoice_views.xml', ], diff --git a/addons/sale_timesheet/wizard/__init__.py b/addons/sale_timesheet/wizard/__init__.py index 0a4df69a6c2..ca68115ebf6 100644 --- a/addons/sale_timesheet/wizard/__init__.py +++ b/addons/sale_timesheet/wizard/__init__.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from . import project_task_assign_so_line from . import project_create_sale_order from . import project_create_invoice diff --git a/addons/sale_timesheet/wizard/project_task_assign_so_line.py b/addons/sale_timesheet/wizard/project_task_assign_so_line.py deleted file mode 100644 index 48f424f9b73..00000000000 --- a/addons/sale_timesheet/wizard/project_task_assign_so_line.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -# Part of Odoo. See LICENSE file for full copyright and licensing details. - -from odoo import api, fields, models - - -class ProjectTaskAssignSOLine(models.TransientModel): - _name = 'project.task.assign.sale' - _description = "Assign Sale Order line to tasks" - - @api.model - def default_get(self, fields): - result = super(ProjectTaskAssignSOLine, self).default_get(fields) - if self._context.get('active_model') == 'project.task' and 'task_ids' in fields: - result['task_ids'] = self._context.get('active_ids', []) - return result - - sale_line_id = fields.Many2one('sale.order.line', 'Sales Order Item', domain=[('is_service', '=', True)], help="Sale order line to link to selected tasks") - partner_id = fields.Many2one('res.partner', related='sale_line_id.order_partner_id', readonly=True) - task_ids = fields.Many2many('project.task', 'project_task_assign_so_line_rel', 'task_id', 'wizard_id', string='Tasks', domain=[('parent_id', '=', False)], help="Select the tasks to assign to the Sale Order Items. You can only choose task (no sub tasks).") - - @api.multi - def action_assign_sale_line(self): - for wizard in self: - wizard.task_ids.write({ - 'sale_line_id': wizard.sale_line_id.id, - 'partner_id': wizard.partner_id.id, - }) - return {'type': 'ir.actions.act_window_close'} diff --git a/addons/sale_timesheet/wizard/project_task_assign_so_line_views.xml b/addons/sale_timesheet/wizard/project_task_assign_so_line_views.xml deleted file mode 100644 index e28f411c8b6..00000000000 --- a/addons/sale_timesheet/wizard/project_task_assign_so_line_views.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - project.task.assign.sale.wizard.form - project.task.assign.sale - -
- - - - - -
-
-
-
-
- - - Assign Sale Order Item - ir.actions.act_window - project.task.assign.sale - form - form - - new - True - - - -