diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 91513709e03..3d03235d872 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>
@@ -287,7 +258,7 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                     <xpath expr="/form/notebook/page[@string='Sales Order']/group[1]/button[@name='button_dummy']" position="after">
-                         <button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':id}"/>                    
+                         <button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':active_id}"/>                    
                     </xpath>
             </field>
         </record>
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 88dbafc3c62..9abdf3d1ff5 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -23,8 +23,10 @@ import time
 from mx import DateTime
 
 from osv import osv
+from tools.translate import _
 import netsvc
 import pooler
+from tools.translate import _
 
 class procurement_order(osv.osv):
     _inherit = 'procurement.order'
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 86784a34351..77a0aff7bb4 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -31,8 +31,9 @@
 "access_account_sequence_fiscalyear_purchase_user","account.sequence.fiscalyear purchase","account.model_account_sequence_fiscalyear","group_purchase_user",1,1,1,1
 "access_res_partner_purchase_user","res.partner purchase","base.model_res_partner","group_purchase_user",1,0,0,0
 "access_res_partner_address_purchase_user","res.partner.address purchase","base.model_res_partner_address","group_purchase_user",1,0,0,0
-"access_account_journal","account.journal","account.model_account_journal","group_purchase_user",1,1,1,0
-"access_account_journal_manager","account.journal","account.model_account_journal","group_purchase_manager",1,1,1,1
+"access_account_journal_period","account.journal.period","account.model_account_journal_period","group_purchase_user",1,1,1,0
+"access_account_journal","account.journal","account.model_account_journal","group_purchase_user",1,0,0,0
+"access_account_journal_manager","account.journal","account.model_account_journal","group_purchase_manager",1,0,0,0
 "access_account_period","account.period","account.model_account_period","group_purchase_user",1,0,0,0
 "access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","group_purchase_user",1,0,0,0
 "access_account_move","account.move","account.model_account_move","group_purchase_user",1,1,1,1
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index a54e6a485c2..c514c9714eb 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -41,14 +41,14 @@ class stock_split_into(osv.osv_memory):
         quantity = self.browse(cr, uid, data[0], context).quantity or 0.0
         for move in move_obj.browse(cr, uid, rec_id):
             quantity_rest = move.product_qty - quantity
-            if move.tracking_id :
-                raise osv.except_osv(_('Error!'),  _('The current move line is already assigned to a pack, please remove it first if you really want to change it ' \
-                                    'for this product: "%s" (id: %d)') % \
-                                    (move.product_id.name, move.product_id.id,))                  
+            #if move.tracking_id :
+            #    raise osv.except_osv(_('Error!'),  _('The current move line is already assigned to a pack, please remove it first if you really want to change it ' \
+            #                        'for this product: "%s" (id: %d)') % \
+            #                        (move.product_id.name, move.product_id.id,))
             if quantity > move.product_qty:
                 raise osv.except_osv(_('Error!'),  _('Total quantity after split exceeds the quantity to split ' \
                                     'for this product: "%s" (id: %d)') % \
-                                    (move.product_id.name, move.product_id.id,))              
+                                    (move.product_id.name, move.product_id.id,))
             if quantity > 0:
                 move_obj.setlast_tracking(cr, uid, [move.id], context=context)
                 move_obj.write(cr, uid, [move.id], {
@@ -63,12 +63,12 @@ class stock_split_into(osv.osv_memory):
                     move_obj.write(cr, uid, [move.id], {'tracking_id': tracking_id})
                 else:    
                     default_val = {
-                    'product_qty': quantity_rest,
-                    'product_uos_qty': quantity_rest,
-                    'tracking_id': tracking_id,
-                    'state': move.state,
-                    'product_uos': move.product_uom.id
-                }
+                        'product_qty': quantity_rest,
+                        'product_uos_qty': quantity_rest,
+                        'tracking_id': tracking_id,
+                        'state': move.state,
+                        'product_uos': move.product_uom.id
+                    }
                     move_obj.copy(cr, uid, move.id, default_val)
         return {}
 stock_split_into()