diff options
| author | Josse Colpaert <jco@odoo.com> | 2016-07-22 19:39:35 +0200 |
|---|---|---|
| committer | Josse Colpaert <jco@odoo.com> | 2016-07-25 12:35:44 +0200 |
| commit | 91e2dca945cbb5c0e0cc64a9ea4f195c19449dae (patch) | |
| tree | 8ffa75bbe1d6725ce36452956df91e009221342d /addons | |
| parent | f7703c5d9b3ccfaf16ec6a233eb71ca3d0c9cd70 (diff) | |
[FIX] mrp: working_state should depend on time_ids when we just add one, OEE: efficiency -> effectiveness
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/mrp/models/mrp_workcenter.py | 4 | ||||
| -rw-r--r-- | addons/mrp/views/mrp_workcenter_views.xml | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/addons/mrp/models/mrp_workcenter.py b/addons/mrp/models/mrp_workcenter.py index 43bc966060b..465875cc35b 100644 --- a/addons/mrp/models/mrp_workcenter.py +++ b/addons/mrp/models/mrp_workcenter.py @@ -46,7 +46,7 @@ class MrpWorkcenter(models.Model): productive_time = fields.Float( 'Productive Time', compute='_compute_productive_time', help='Productive hours over the last month') - oee = fields.Float(compute='_compute_oee', help='Overall Equipment Efficiency, based on the last month') + oee = fields.Float(compute='_compute_oee', help='Overall Equipment Effectiveness, based on the last month') oee_target = fields.Float(string='OEE Target', help="OEE Target in percentage", default=90) performance = fields.Integer('Performance', compute='_compute_performance', help='Performance over the last month') @@ -72,7 +72,7 @@ class MrpWorkcenter(models.Model): workcenter.workorder_late_count = count_data.get(workcenter.id, 0) @api.multi - @api.depends('time_ids.date_end', 'time_ids.loss_type') + @api.depends('time_ids', 'time_ids.date_end', 'time_ids.loss_type') def _compute_working_state(self): for workcenter in self: time_log = self.env['mrp.workcenter.productivity'].search([('workcenter_id', '=', workcenter.id)], limit=1) diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml index bfafaeda307..d946ee89020 100644 --- a/addons/mrp/views/mrp_workcenter_views.xml +++ b/addons/mrp/views/mrp_workcenter_views.xml @@ -59,7 +59,7 @@ </field> </record> <record model="ir.actions.act_window" id="mrp_workcenter_productivity_report_oee"> - <field name="name">Overall Equipment Efficiency</field> + <field name="name">Overall Equipment Effectiveness</field> <field name="type">ir.actions.act_window</field> <field name="res_model">mrp.workcenter.productivity</field> <field name="view_type">form</field> @@ -69,7 +69,7 @@ <field name="context">{'search_default_thismonth':True}</field> <field name="help" type="html"> <p> - Overall Equipment Efficiency: no working or blocked time. + Overall Equipment Effectiveness: no working or blocked time. </p> </field> </record> @@ -539,7 +539,7 @@ </record> <record model="ir.actions.act_window" id="mrp_workcenter_productivity_report"> - <field name="name">Overall Equipment Efficiency</field> + <field name="name">Overall Equipment Effectiveness</field> <field name="type">ir.actions.act_window</field> <field name="res_model">mrp.workcenter.productivity</field> <field name="view_type">form</field> @@ -548,7 +548,7 @@ <field name="context">{'search_default_thismonth':True}</field> <field name="help" type="html"> <p> - Overall Equipment Efficiency: no working or blocked time. + Overall Equipment Effectiveness: no working or blocked time. </p> </field> </record> |