From f8e3aed20ba073294fa1453f86709d6cbce650f5 Mon Sep 17 00:00:00 2001 From: Haresh Shyara Date: Mon, 27 Aug 2018 15:10:51 +0530 Subject: [PATCH] [REF] mrp, resource: Changing labels TASK-ID: 1879655 --- addons/mrp/models/mrp_routing.py | 2 +- addons/mrp/models/mrp_workcenter.py | 2 +- addons/mrp/views/mrp_production_views.xml | 42 ----------------------- addons/mrp/views/mrp_workcenter_views.xml | 4 +-- addons/mrp/views/mrp_workorder_views.xml | 2 +- addons/resource/views/resource_views.xml | 4 +-- 6 files changed, 6 insertions(+), 50 deletions(-) diff --git a/addons/mrp/models/mrp_routing.py b/addons/mrp/models/mrp_routing.py index 7c2c48c0fcd..8e39942f7e4 100644 --- a/addons/mrp/models/mrp_routing.py +++ b/addons/mrp/models/mrp_routing.py @@ -9,7 +9,7 @@ class MrpRouting(models.Model): _name = 'mrp.routing' _description = 'Routings' - name = fields.Char('Routing Name', required=True) + name = fields.Char('Routing', required=True) active = fields.Boolean( 'Active', default=True, help="If the active field is set to False, it will allow you to hide the routing without removing it.") diff --git a/addons/mrp/models/mrp_workcenter.py b/addons/mrp/models/mrp_workcenter.py index 7ba89c9e290..420069fdf3e 100644 --- a/addons/mrp/models/mrp_workcenter.py +++ b/addons/mrp/models/mrp_workcenter.py @@ -14,7 +14,7 @@ class MrpWorkcenter(models.Model): _inherit = ['resource.mixin'] # resource - name = fields.Char(related='resource_id.name', store=True) + name = fields.Char('Work Center', related='resource_id.name', store=True) time_efficiency = fields.Float('Time Efficiency', related='resource_id.time_efficiency', default=100, store=True) active = fields.Boolean('Active', related='resource_id.active', default=True, store=True) diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml index 045186b16b7..a8d8fe51ff4 100644 --- a/addons/mrp/views/mrp_production_views.xml +++ b/addons/mrp/views/mrp_production_views.xml @@ -326,48 +326,6 @@ parent="menu_mrp_manufacturing" sequence="1"/> - - Manufacturing Orders - ir.actions.act_window - mrp.production - form - tree,kanban,form,calendar,pivot,graph - [('state', '=', 'confirmed'), ('routing_id', '!=', False)] - -

- Create a new manufacturing order -

- A manufacturing order, based on a bill of materials, will - consume raw materials and produce finished products. -

- Manufacturing orders are usually proposed automatically based - on customer requirements or automated rules like the minimum - stock rule. -

-
-
- - - Waiting Availability MO - ir.actions.act_window - mrp.production - form - tree,form,kanban,calendar,pivot,graph - [('availability', 'in', ('waiting', 'partially_available'))] - -

- Create a new manufacturing order -

- A manufacturing order, based on a bill of materials, will - consume raw materials and produce finished products. -

- Manufacturing orders are usually proposed automatically based - on customer requirements or automated rules like the minimum - stock rule. -

-
-
- Manufacturing Orders ir.actions.act_window diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml index a26ebc0d323..518535a1674 100644 --- a/addons/mrp/views/mrp_workcenter_views.xml +++ b/addons/mrp/views/mrp_workcenter_views.xml @@ -127,7 +127,7 @@ - Work Orders Performance + Work Orders ir.actions.act_window mrp.workorder [] @@ -548,11 +548,9 @@ - - diff --git a/addons/mrp/views/mrp_workorder_views.xml b/addons/mrp/views/mrp_workorder_views.xml index 896aa25a293..a10d6ebd8bd 100644 --- a/addons/mrp/views/mrp_workorder_views.xml +++ b/addons/mrp/views/mrp_workorder_views.xml @@ -369,7 +369,7 @@ - Work Orders + Work Orders Planning ir.actions.act_window mrp.workorder form diff --git a/addons/resource/views/resource_views.xml b/addons/resource/views/resource_views.xml index 54c17e16be8..3807f70bca3 100644 --- a/addons/resource/views/resource_views.xml +++ b/addons/resource/views/resource_views.xml @@ -279,14 +279,14 @@ resource.calendar - + - Working Time + Working Times resource.calendar form tree,form