diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 91513709e03..5cdaedfd08a 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -175,22 +175,6 @@
             </field>
         </record>
 
-        <record id="view_picking_withcarrier_delivery_form" model="ir.ui.view">
-            <field name="name">delivery.stock.picking_withcarrier.delivery.form.view</field>
-            <field name="type">form</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.view_picking_delivery_form"/>
-            <field name="arch" type="xml">
-                <field name="address_id" position="after">
-                    <field name="carrier_id"/>
-                    <field name="carrier_tracking_ref" groups="base.group_extended"/>
-                    <field name="number_of_packages" groups="base.group_extended"/>
-                    <field name="weight"/>
-                    <field name="weight_net"/>
-                </field>
-            </field>
-        </record>
-
         <record id="action_picking_tree4" model="ir.actions.act_window">
             <field name="name">Picking to be invoiced</field>
             <field name="res_model">stock.picking</field>
@@ -242,19 +226,6 @@
             </field>
         </record>
 
-        <record id="view_picking_withcarrier_delivery_move_form" model="ir.ui.view">
-            <field name="name">delivery.stock.picking_withcarrier.delivery.move.form.view</field>
-            <field name="type">form</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.view_picking_delivery_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
-                    <field name="weight"/>
-                    <field name="weight_net"/>
-                </xpath>
-            </field>
-        </record>
-
         <record id="view_move_withweight_form" model="ir.ui.view">
             <field name="name">stock.move.form.weight</field>
             <field name="type">form</field>
diff --git a/addons/delivery/test/delivery_report.yml b/addons/delivery/test/delivery_report.yml
index a88b6bd1942..53b06a9d36a 100644
--- a/addons/delivery/test/delivery_report.yml
+++ b/addons/delivery/test/delivery_report.yml
@@ -12,7 +12,6 @@
     invoice_state: none
     move_lines:
       - company_id: base.main_company
-        date_planned: '2010-05-11 15:18:57'
         location_dest_id: stock.stock_location_customers
         location_id: stock.stock_location_stock
         name: HP CD writers
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 94fad9f68b0..9abdf3d1ff5 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -23,6 +23,7 @@ import time
 from mx import DateTime
 
 from osv import osv
+from tools.translate import _
 import netsvc
 import pooler
 from tools.translate import _