diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 8fd35a21a89..1e3f4d5d373 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -88,11 +88,12 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Account Data">
-                            <field name="partner_id" select="1"/>
-                            <field name="currency_id" select="1"/>
+                            <field name="partner_id"/>
+                            <field name="contact_id"/>
+                            <field name="currency_id"/>
                             <newline/>
                             <field name="date_start"/>
-                            <field name="date" select="2"/>
+                            <field name="date"/>
                             <newline/>
                             <field name="quantity_max"/>
                             <field name="user_id"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 55be89c2252..45f14c3e2df 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -327,9 +327,8 @@
                     domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]"
                 />
                 <separator orientation="vertical"/>
-                <field name="name" string="Subject"/>
-                <field name="partner_name"/>
-                <field name="email_from"/>
+                <field name="name" string="Lead / Customer"
+                    domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                 <field name="user_id">
                     <filter icon="terp-personal-"
                         domain="[('user_id','=', False)]"
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index ec842a2c791..842ede252df 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -306,41 +306,41 @@
             </field>
         </record>
 
-		<record id="base.view_crm_partner_info_History1" model="ir.ui.view">
-			<field name="name">res.partner.crm.history.inherit1</field>
-			<field name="model">res.partner</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.view_partner_form"/>
-			<field name="arch" type="xml">
-				<xpath expr="/form/notebook/page[@string='History']" position="attributes">
-					<attribute name="invisible">False</attribute>
-				</xpath>
-			</field>
-		</record>	
-		<record id="view_claim_partner_info_form1" model="ir.ui.view">
-			<field name="name">res.partner.claim.info.form</field>
-			<field name="model">res.partner</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="base.view_partner_form"/>
-			<field name="priority">20</field>
-			<field name="arch" type="xml">
-				<data>
-					<xpath expr="/form/notebook/page[@string='History']" position="inside">
-						<field name="claims_ids" colspan="4" nolabel="1">
-							<tree string="Partners Claim" editable="bottom">
-								<field name="name"/>
-							</tree>
-						</field>
-					</xpath>
-				</data>
-			</field>
-		</record>		
+        <record id="base.view_crm_partner_info_History1" model="ir.ui.view">
+            <field name="name">res.partner.crm.history.inherit1</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page[@string='History']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+            </field>
+        </record>    
+        <record id="view_claim_partner_info_form1" model="ir.ui.view">
+            <field name="name">res.partner.claim.info.form</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="priority">20</field>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/form/notebook/page[@string='History']" position="inside">
+                        <field name="claims_ids" colspan="4" nolabel="1">
+                            <tree string="Partners Claim" editable="bottom">
+                                <field name="name"/>
+                            </tree>
+                        </field>
+                    </xpath>
+                </data>
+            </field>
+        </record>        
 
         <act_window
             context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
             id="act_claim_partner"
-            name="Report a Claim"
-            view_mode="form,tree"
+            name="Claims"
+            view_mode="tree,form"
             res_model="crm.claim"
             src_model="res.partner"/>
 
@@ -349,8 +349,8 @@
             domain="[('partner_address_id', '=', active_id)]"
             context="{'default_partner_id': partner_id}"
             id="act_claim_partner_address"
-            name="Report a Claim"
-            view_mode="form,tree"
+            name="Claims"
+            view_mode="tree,form"
             res_model="crm.claim"
             src_model="res.partner.address"/>
 
diff --git a/addons/project/project.py b/addons/project/project.py
index 6a262e16428..7b60ddcc447 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -433,7 +433,7 @@ class task(osv.osv):
         'date_start': fields.datetime('Starting Date',select=True),
         'date_end': fields.datetime('Ending Date',select=True),
         'date_deadline': fields.date('Deadline',select=True),
-        'project_id': fields.many2one('project.project', 'Project', ondelete='cascade'),
+        'project_id': fields.many2one('project.project', 'Project', ondelete='set null'),
         'parent_ids': fields.many2many('project.task', 'project_task_parent_rel', 'task_id', 'parent_id', 'Parent Tasks'),
         'child_ids': fields.many2many('project.task', 'project_task_parent_rel', 'parent_id', 'task_id', 'Delegated Tasks'),
         'notes': fields.text('Notes'),
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d3b28c0d562..5faa0090a15 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -224,7 +224,7 @@
                 <form string="Task edition">
                     <group colspan="6" col="6">
                         <field name="name" select="1"/>
-                        <field name="project_id" select="1"  on_change="onchange_project(project_id)" domain="['|',('user_id','=',uid),('members','=',uid)]" />
+                        <field name="project_id" select="1"  on_change="onchange_project(project_id)"/>
                         <field name="total_hours" widget="float_time"/>
                         <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                         <field name="user_id" select="1" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
@@ -264,11 +264,11 @@
                                 <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/>
                                 <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                                 <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
-                                <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
+                                <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending"/>
                                 <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
                             </group>
                         </page>
-                        <page groups="base.group_extended" string="Delegations">
+                        <page groups="base.group_extended" string="Delegations History">
                             <separator string="Parent Tasks" colspan="4"/>
                             <field colspan="4" height="150" name="parent_ids" nolabel="1"/>
                             <separator string="Delegated tasks" colspan="4"/>
@@ -322,7 +322,7 @@
                 <tree colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
-                    <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]" invisible="context.get('user_invisible', False)"/>
+                    <field name="project_id" icon="gtk-indent" invisible="context.get('user_invisible', False)"/>
                     <field name="user_id" invisible="context.get('user_invisible', False)"/>
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
                     <field name="total_hours" invisible="1"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 2d516f1a8a5..636ae0cb067 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -621,8 +621,8 @@ class stock_picking(osv.osv):
         'state': fields.selection([
             ('draft', 'Draft'),
             ('auto', 'Waiting'),
-            ('confirmed', 'Confirmed'),
-            ('assigned', 'Available'),
+            ('confirmed', 'Waiting Availability'),
+            ('assigned', 'Ready to Process'),
             ('done', 'Done'),
             ('cancel', 'Cancelled'),
             ], 'State', readonly=True, select=True,