diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index ca488ac0818..b9d333e7c1b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -530,7 +530,7 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="routing_id" date_start="date_planned" string="Manufacturing Orders">
-                    <field name="origin"/>
+                    <field name="name"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
                 </calendar>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 756fa94568a..a8d90f1e48c 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -98,6 +98,8 @@
                         <separator string="" colspan="4"/>
                         <group col="13" colspan="4">
                             <field name="state"/>
+                            <button name="cancel" states="draft" string="Cancel Repair" icon="gtk-stop"/>
+                            <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action" icon="gtk-stop"/>
                             <button name="repair_confirm" states="draft" string="Confirm Repair" icon="terp-camera_test"/>
                             <button name="repair_ready" states="confirmed" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
                             <button name="action_repair_start" states="ready" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
@@ -107,8 +109,6 @@
                             <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" icon="terp-dolar"/>
                             <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" icon="gtk-stop"/>
                             <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                            <button name="cancel" states="draft" string="Cancel Repair" icon="gtk-stop"/>
-                            <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action" icon="gtk-stop"/>
                         </group>
                     </page>
                     <page string="Invoicing">