diff --git a/mrp_operations_extension/models/mrp_bom.py b/mrp_operations_extension/models/mrp_bom.py
index 10e33f7ea..0afbde093 100644
--- a/mrp_operations_extension/models/mrp_bom.py
+++ b/mrp_operations_extension/models/mrp_bom.py
@@ -17,6 +17,7 @@
 ##############################################################################
 
 from openerp import models, fields, api, _
+import math
 
 
 class MrpBom(models.Model):
@@ -53,9 +54,7 @@ class MrpBom(models.Model):
                         routing_line_id = routing_line.id
                         break
             wc = routing_line_obj.browse(routing_line_id)
-            cycle = factor / wc.cycle_nbr
-            if wc.limited_production_capacity and not cycle.is_integer():
-                cycle = int(cycle) + 1
+            cycle = int(math.ceil(factor / wc.cycle_nbr))
             hour = wc.hour_nbr * cycle
             default_wc_line = wc.op_wc_lines.filtered(lambda r: r.default)
             work_order['cycle'] = cycle
diff --git a/mrp_operations_extension/views/mrp_bom_view.xml b/mrp_operations_extension/views/mrp_bom_view.xml
index e4250fb97..fa20e52a6 100644
--- a/mrp_operations_extension/views/mrp_bom_view.xml
+++ b/mrp_operations_extension/views/mrp_bom_view.xml
@@ -10,8 +10,9 @@
                 <xpath expr="//tree/field[@name='product_id']"
                     position="after">
                     <field name="operation"
-                        domain="[('routing_id', '=', parent.routing_id)]"
-                        groups="mrp.group_mrp_routings" />
+                           widget="selection"
+                           domain="[('routing_id', '=', parent.routing_id)]"
+                           groups="mrp.group_mrp_routings" />
                 </xpath>
             </field>
         </record>