diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 3837588035e..b3004fffb2f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -856,46 +856,5 @@
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_mrp_configuration" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
 
-        <!-- Display the BoMs in the product form -->
-
-        <record model="ir.ui.view" id="view_product_form_expiry">
-            <field name="name">product.normal.form</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view" />
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Bill of Materials">
-                        <field name="bom_ids" colspan="4" nolabel="1" widget="one2many_form">
-                            <group colspan="4" col="6">
-                                <field name="name" select="1" colspan="4"/>
-                                <field name="code" select="1" string="BoM Reference" groups="base.group_extended"/>
-                                <newline/>
-                                <field name="product_uom"/>
-                                <field name="product_qty"/>
-                                <field name="routing_id" groups="base.group_extended"/>
-                                <newline/>
-                                <field name="product_uos" groups="product.group_uos"/>
-                                <field name="product_uos_qty" groups="product.group_uos" />
-                                <newline/>
-                                <field name="type" groups="base.group_extended"/>
-                                <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                            </group>
-                            <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list">
-                                <tree string="Components" editable="bottom">
-                                    <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
-                                    <field name="product_uom"/>
-                                    <field name="product_qty"/>
-                                    <field name="name" invisible="1"/>
-                                    <field name="date_start"/>
-                                    <field name="date_stop"/>
-                                </tree>
-                            </field>
-                        </field>
-                    </page>
-                </notebook>
-            </field>
-        </record>
- 
     </data>
 </openerp>
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 8089be4a431..736203b307d 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -2,8 +2,8 @@
 "access_mrp_workcenter","mrp.workcenter","model_mrp_workcenter","mrp.group_mrp_user",1,0,0,0
 "access_mrp_routing","mrp.routing","model_mrp_routing","mrp.group_mrp_user",1,0,0,0
 "access_mrp_routing_workcenter","mrp.routing.workcenter","model_mrp_routing_workcenter","mrp.group_mrp_user",1,0,0,0
-"access_mrp_bom","mrp.bom","model_mrp_bom","mrp.group_mrp_user",1,0,0,0
-"access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","mrp.group_mrp_user",1,0,0,0
+"access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,0,0,0
+"access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","group_mrp_user",1,0,0,0
 "access_mrp_production","mrp.production","model_mrp_production","mrp.group_mrp_user",1,1,1,1
 "access_mrp_production_workcenter_line","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
 "access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index 4a3e2e3e1da..885607d9539 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -182,14 +182,14 @@
 -
   !python {model: procurement.order}: |
     from tools.translate import _
-    proc_ids = self.search(cr, uid, [('state','!=','cofirmed')])
+    proc_ids = self.search(cr, uid, [('state','!=','confirmed')])
     assert proc_ids, _('No Procurements!')
 -
   The scheduler runs.
 -
   !function {model: procurement.order, name: run_scheduler}:
     - model: procurement.order
-      search: "[('state','!=','cofirmed')]"
+      search: "[('state','!=','confirmed')]"
 -
   I am checking Internal picking. I see one picking for Orange juice and its 
   stock moves for Oranges, Sugar and Water made correctly.
@@ -247,4 +247,4 @@
      picking_ids = pick_obj.search(cr, uid, [('type','=','in')])
      self.view_init(cr, uid, ['date','partner_id','address_id'],context={'active_ids': picking_ids})
      self.do_partial(cr, uid, [1], context={'active_ids': picking_ids})
-     
\ No newline at end of file
+
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 1a2fac38c6a..502c8af0596 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -19,9 +19,6 @@
 "access_task_by_days","task.by.days","model_task_by_days","project.group_project_user",1,1,1,1
 "access_close_task","close.task","model_close_task","project.group_project_user",1,1,1,1
 "access_close_task_manager","close.task manager","model_close_task","project.group_project_manager",1,1,1,1
-"access_resource_calendar_project_user","resource.resource.calendar project user","resource.model_resource_calendar","project.group_project_user",1,0,0,0
-"access_resource_calendar_project_manager","resource.resource.calendar project manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
-"access_fiscalyear_sequence_project_manager","account.sequence.fiscalyear project manager","account.model_account_sequence_fiscalyear","project.group_project_manager",1,1,0,0
 "access_partner_task user","base.res.partner user","base.model_res_partner","project.group_project_user",1,0,0,0
 "access_partner_task manager","base.res.partner manager","base.model_res_partner","project.group_project_manager",1,0,0,0
 "access_partner_address_task user","base.res.partner.address user","base.model_res_partner_address","project.group_project_user",1,0,0,0
diff --git a/addons/sale/test/sale_procurement.yml b/addons/sale/test/sale_procurement.yml
index 33ba22667ec..2475c7bdceb 100644
--- a/addons/sale/test/sale_procurement.yml
+++ b/addons/sale/test/sale_procurement.yml
@@ -2,9 +2,7 @@
   In order to test the sale order working with procurements I will create some
   products with different supply method and procurement method.
 -
-  I create two products.
--
-  I create one product Table.
+  I create one product Table as MTO.
 -
   !record {model: product.product, id: product_product_table0}:
     categ_id: product.cat1
@@ -15,7 +13,7 @@
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
 -
-  I create another product Wood.
+  I create another product Wood as MTS.
 -
   !record {model: product.product, id: product_product_wood0}:
     categ_id: product.cat1
@@ -26,7 +24,7 @@
     uom_id: product.product_uom_kgm
     uom_po_id: product.product_uom_kgm
 -
-  I define Minimum stock rule for my stockable product wood
+  I define Minimum stock rule for my stockable product Wood (qty between 10 and 15)
 - 
   !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
     company_id: base.main_company
@@ -77,19 +75,16 @@
     proc_ids = self.search(cr, uid, [('state','=','confirmed')])
     assert proc_ids, _('No Procurements!')
 - 
-  The scheduler runs.
+  I run the scheduler.
 -
   !function {model: procurement.order, name: run_scheduler}:
     - model: procurement.order
       search: "[('state','=','confirmed')]"
 -
   I check that the procurement for the product table is in exception state.
-  As my product's supply method is produce and mrp module is yet not installed.
+  As my product's supply method is produce and the BoM is not defined.
 -
   !python {model: procurement.order}: |
     from tools.translate import _
-    proc_ids = self.search(cr, uid, [('state','=','exception')])
-    assert proc_ids, _('No Procurements are in exception state!')
-  
-  
-  
\ No newline at end of file
+    proc_ids = self.search(cr, uid, [('state','=','exception'),('product_id','=',ref('sale.product_product_table0'))])
+    assert proc_ids, _('No Procurements are in exception state for the table!')
diff --git a/addons/sale/test/shipping_manual_sale_order.yml b/addons/sale/test/shipping_manual_sale_order.yml
index c030a80c64a..1f5bc5fe10a 100644
--- a/addons/sale/test/shipping_manual_sale_order.yml
+++ b/addons/sale/test/shipping_manual_sale_order.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
+  In order to test the sale module, I need to configure details regarding product & customer.
 -
   I am going to sell my Mobile products to the customer with name Cleartrail
 - 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5a01ddbc83b..87346d092f6 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -602,7 +602,7 @@ class stock_picking(osv.osv):
             ("2binvoiced", "To Be Invoiced"),
             ("none", "Not from Picking")], "Invoice Status",
             select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
-        'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
+        'company_id': fields.many2one('res.company', 'Company', select=1),
     }
     _defaults = {
         'name': lambda self, cr, uid, context: '/',
@@ -1380,7 +1380,7 @@ class stock_move(osv.osv):
                                   \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'price_unit': fields.float('Unit Price',
             digits_compute= dp.get_precision('Account')),
-        'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
+        'company_id': fields.many2one('res.company', 'Company', select=1),
         'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner"),
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order"),
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 918250236cb..5f930361dfe 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -247,7 +247,6 @@ class split_in_production_lot(osv.osv_memory):
                     }
                     if quantity_rest > 0:
                         current_move = move_obj.copy(cr, uid, move.id, default_val)
-                        move_obj.action_confirm(cr, uid, [current_move])
                         new_move.append(current_move)
                     if quantity_rest == 0:
                         current_move = move.id