diff --git a/addons/mrp/models/mrp_workcenter.py b/addons/mrp/models/mrp_workcenter.py index 431f65a2145..7a255dcc994 100644 --- a/addons/mrp/models/mrp_workcenter.py +++ b/addons/mrp/models/mrp_workcenter.py @@ -36,14 +36,14 @@ class MrpWorkcenter(models.Model): workorder_count = fields.Integer('# Work Orders', compute='_compute_workorder_count') workorder_ready_count = fields.Integer('# Read Work Orders', compute='_compute_workorder_count') workorder_progress_count = fields.Integer('Total Running Orders', compute='_compute_workorder_count') - workorder_pending_count = fields.Integer('Total Running Orders', compute='_compute_workorder_count') + workorder_pending_count = fields.Integer('Total Pending Orders', compute='_compute_workorder_count') workorder_late_count = fields.Integer('Total Late Orders', compute='_compute_workorder_count') time_ids = fields.One2many('mrp.workcenter.productivity', 'workcenter_id', 'Time Logs') working_state = fields.Selection([ ('normal', 'Normal'), ('blocked', 'Blocked'), - ('done', 'In Progress')], 'Status', compute="_compute_working_state", store=True) + ('done', 'In Progress')], 'Workcenter Status', compute="_compute_working_state", store=True) blocked_time = fields.Float( 'Blocked Time', compute='_compute_blocked_time', help='Blocked hour(s) over the last month', digits=(16, 2)) diff --git a/addons/mrp/models/mrp_workorder.py b/addons/mrp/models/mrp_workorder.py index 90980117b29..9a3f093a87d 100644 --- a/addons/mrp/models/mrp_workorder.py +++ b/addons/mrp/models/mrp_workorder.py @@ -113,7 +113,6 @@ class MrpWorkorder(models.Model): final_lot_id = fields.Many2one( 'stock.production.lot', 'Lot/Serial Number', domain="[('product_id', '=', product_id)]", states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}) - tracking = fields.Selection(related='production_id.product_id.tracking') time_ids = fields.One2many( 'mrp.workcenter.productivity', 'workorder_id') is_user_working = fields.Boolean( diff --git a/addons/mrp/models/res_config_settings.py b/addons/mrp/models/res_config_settings.py index d7ae6ee4ee6..3cf13109582 100644 --- a/addons/mrp/models/res_config_settings.py +++ b/addons/mrp/models/res_config_settings.py @@ -16,7 +16,7 @@ class ResConfigSettings(models.TransientModel): module_mrp_workorder = fields.Boolean("Work Orders") module_mrp_repair = fields.Boolean("Repair") module_quality_control = fields.Boolean("Quality") - group_mrp_routings = fields.Boolean("Work Orders", + group_mrp_routings = fields.Boolean("Mrp", implied_group='mrp.group_mrp_routings') @api.model diff --git a/addons/mrp/views/res_config_settings_views.xml b/addons/mrp/views/res_config_settings_views.xml index 87256906259..2381b925e3b 100644 --- a/addons/mrp/views/res_config_settings_views.xml +++ b/addons/mrp/views/res_config_settings_views.xml @@ -17,7 +17,7 @@
-