diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 375f772e05d..5878253d82c 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -52,9 +52,9 @@ class account_move_line(osv.osv):
 
         if context.get('periods', False):
             ids = ','.join([str(x) for x in context['periods']])
-            return obj+".active AND "+obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) AND id in (%s)) %s" % (fiscalyear_clause, ids,where_move_state)
+            return obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) AND id in (%s)) %s" % (fiscalyear_clause, ids,where_move_state)
         else:
-            return obj+".active AND "+obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) %s)" % (fiscalyear_clause,where_move_state)
+            return obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) %s)" % (fiscalyear_clause,where_move_state)
 
     def default_get(self, cr, uid, fields, context={}):
         data = self._default_get(cr, uid, fields, context)
@@ -157,7 +157,7 @@ class account_move_line(osv.osv):
         for id in ids:
             cr.execute('SELECT date,account_id FROM account_move_line WHERE id=%d', (id,))
             dt, acc = cr.fetchone()
-            cr.execute('SELECT SUM(debit-credit) FROM account_move_line WHERE account_id=%d AND (date<%s OR (date=%s AND id<=%d)) and active', (acc,dt,dt,id))
+            cr.execute('SELECT SUM(debit-credit) FROM account_move_line WHERE account_id=%d AND (date<%s OR (date=%s AND id<=%d))', (acc,dt,dt,id))
             res[id] = cr.fetchone()[0]
         return res
 
diff --git a/addons/board_crm_configuration/board_crm_demo.xml b/addons/board_crm_configuration/board_crm_demo.xml
index f6c4a233cd0..39bc1f289f5 100644
--- a/addons/board_crm_configuration/board_crm_demo.xml
+++ b/addons/board_crm_configuration/board_crm_demo.xml
@@ -6,13 +6,13 @@
 		 Administrator shortcut
 		 Demo user startup menu
 		 -->
-		<record model="ir.ui.view_sc" id="sc_crm_dash">
+<!-- 		<record model="ir.ui.view_sc" id="sc_crm_dash">
 			<field name="name">CRM Dashboard</field>
 			<field name="user_id" ref="base.user_demo"/>
 			<field name="resource">ir.ui.menu</field>
 			<field name="sequence">3</field>
 			<field name="res_id" ref="menu_board_crm"/>
-		</record>
+		</record> -->
 		<record model="res.users" id="base.user_admin">
 			<field name="action_id" ref="open_board_crm"/>
 		</record>
diff --git a/addons/crm_vertical/crm_vertical_view.xml b/addons/crm_vertical/crm_vertical_view.xml
index 3c5b0356b4b..32a47904ff6 100644
--- a/addons/crm_vertical/crm_vertical_view.xml
+++ b/addons/crm_vertical/crm_vertical_view.xml
@@ -15,7 +15,7 @@
 			<field eval="&quot;terp-sale&quot;" name="icon"/>
 			<field eval="False" name="parent_id"/>
 		</record>
-		<record id="crm_configuration.menu_crm_case_jobs" model="ir.ui.menu">
+		<record id="crm_configuration.menu_crm_case_job_req_main" model="ir.ui.menu">
 			<field eval="&quot;terp-hr&quot;" name="icon"/>
 			<field eval="False" name="parent_id"/>
 		</record>
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 37d9cc01534..219253c8ccf 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -668,9 +668,9 @@ class mrp_procurement(osv.osv):
         'date_close': fields.date('Date Closed'),
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'product_qty': fields.float('Quantity', required=True),
-        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
-        'product_uos_qty': fields.float('Quantity'),
-        'product_uos': fields.many2one('product.uom', 'Product UOM'),
+        'product_uom': fields.many2one('product.uom', 'Product UoM', required=True),
+        'product_uos_qty': fields.float('UoS Quantity'),
+        'product_uos': fields.many2one('product.uom', 'Product UoS'),
         'move_id': fields.many2one('stock.move', 'Reservation', ondelete='set null'),
 
         'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True),
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index e4530548a5b..f4f85c082a9 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -389,11 +389,9 @@
 						<field name="product_id" on_change="product_id_change(product_id)" select="1"/>
 						<field name="product_qty"/>
 						<field name="product_uom"/>
-						<group colspan="6" col="6">
-							<label string="" colspan="2"/>
-							<field name="product_uos_qty" groups="product.group_uos"/>
-							<field name="product_uos" groups="product.group_uos"/>
-						</group>
+                        <label string="" colspan="2"/>
+                        <field name="product_uos_qty" groups="product.group_uos"/>
+                        <field name="product_uos" groups="product.group_uos"/>
 					</group>
 
                     <notebook colspan="4">
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 9cd3ae93053..83e78b5803d 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -56,7 +56,7 @@
 		<field name="name">All Operations</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">mrp.production.workcenter.line</field>
-		<field name="view_type">tree</field>
+		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
 
@@ -66,7 +66,7 @@
 		<field name="name">Confirm Operations</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">mrp.production.workcenter.line</field>
-		<field name="view_type">tree</field>
+		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','confirm')]</field>
 	</record>
@@ -77,7 +77,7 @@
 		<field name="name">Draft Operations</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">mrp.production.workcenter.line</field>
-		<field name="view_type">tree</field>
+		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','draft')]</field>
 	</record>