diff --git a/addons/crm/crm.py b/addons/crm/crm.py
old mode 100644
new mode 100755
index b0f85a9e52a..3c52022b98b
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -74,7 +74,9 @@ class crm_case_section(osv.osv):
         'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by Open ERP about cases in this section"),
         'parent_id': fields.many2one('crm.case.section', 'Parent Section'),
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Sections'),
-        "gateway_ids" : fields.one2many("crm.email.gateway",'section_id',"Email Gateway")        
+        "gateway_ids" : fields.one2many("crm.email.gateway",'section_id',"Email Gateway"),
+        'calendar' : fields.boolean('Calendar', help='Allow to show calendar'),   
+             
     }
     _defaults = {
         'active': lambda *a: 1,
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
old mode 100644
new mode 100755
index e9b23b8b50d..66512cbb1a3
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -37,8 +37,11 @@
                             <field name="active" select="2"/>
                             <field name="user_id" select="2"/>
                             <field name="parent_id" select="2" widget="selection"/>
-                            <field name="allow_unlink" select="2"/>
-                            <field name="reply_to" select="2"/>
+                            <group colspan="2" >
+	                            <field name="allow_unlink" select="2"/>
+	                            <field name="calendar" select="2"/>
+	                        </group>
+	                            <field name="reply_to" select="2"/>
                             <field name="gateway_ids" widget="one2many_list" nolabel="1" colspan="4">
                                 <tree string="Email Gateway" editable="bottom">                                   
                                    <field name="name" />                                                                    
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
old mode 100644
new mode 100755
index 112decd8491..992e29c3ed0
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -23,10 +23,6 @@
                             <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                         </group>
                     <field name="date"/>
-                    <group colspan="2">
-                        <field name="case_id" select="1"/>
-                        <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
-                    </group>    
                     <field name="user_id" />
                 </group>
                 <notebook colspan="4">
@@ -38,7 +34,10 @@
                     <field name="category2_id" string="Version"/>
                     <field name="categ_id"  on_change="onchange_categ_id(categ_id)"/>
                     <field name="priority" string="Severity"/>
-
+                    <group colspan="2">
+                        <field name="case_id" select="1"/>
+                        <button string="Assign" name="%(crm_generic_wizard_act)d"  type="action" />
+                    </group>    
                     <newline/>
                     <separator string= "Description" colspan="4"/>
                     <field name="description" nolabel="1" colspan="4"/>
diff --git a/addons/crm_configuration/crm_claims_view.xml b/addons/crm_configuration/crm_claims_view.xml
old mode 100644
new mode 100755
index 81b2153e2b8..6e29ba34cfe
--- a/addons/crm_configuration/crm_claims_view.xml
+++ b/addons/crm_configuration/crm_claims_view.xml
@@ -12,17 +12,12 @@
         <field name="arch" type="xml">
             <tree string="Claims"  colors="red:state=='open'">
                 <field name="id"/>
+                <field name="name"/>
                 <field name="partner_id"/>
-                <field name="date" string="Date of Claim"/>
-                <field name="categ_id" string="Type of claim" select="1"/>
-                <field name="date_closed"/>
-                <field name="planned_cost" string="Claim Cost"/>
+                <field name="date" string="Date"/>
+                <field name="categ_id" string="Type" select="1"/>
+                <field name="user_id" string="Responsible" select="2"/>
                 <field name="state"/>
-                <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>                
             </tree>
         </field>
     </record>
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
old mode 100644
new mode 100755
index d4c1739f28c..09a9874e340
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -13,10 +13,10 @@
             <tree string="Jobs - Recruitment Tree"  colors="red:state=='open'">
                 <field name="id"/>
                 <field name="name" string="Description"/>
-                <field name="partner_name" string="Candidate Name"/>
-                <field name="partner_phone"/>
+                <field name="partner_name" string="Name"/>
+                <field name="email_from" string="Candidate Email"/>
+                <field name="partner_phone" string="Candidate Phone"/>
                 <field name="categ_id" string="Applied Job" select="1"/>
-                <field name="category2_id" string="Degree" select="1"/>
                 <field name="stage_id"/>
                 <field name="priority" string="Appreciation"/>
                 <field name="user_id"/>
@@ -40,7 +40,8 @@
                     <field name="name" string="Description" colspan="2"/>
                     <field name="section_id" colspan="1" widget="selection"/>
                     <field name="user_id" string="Responsible" select="2"/>
-                    <button name="set_partner" string="Convert to Partner" icon="terp-partner"/>
+                	<button string="Schedule a Phone Call"
+                        name="%(wizard_crm_reschedule_phone_call)d" icon="gtk-redo" type="action" />
                     <newline/>
                         <label string="Stage: " align="1.0"/>
                         <group colspan="1" col="2">
@@ -60,8 +61,11 @@
                         <field name="partner_mobile"/>
                         <field name="email_from" string="Candidate Email"/>
                         <newline/>
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+                        <group col="6" colspan="4">
+                        <field  name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+                        <button name="set_partner" string="Convert to Partner" icon="terp-partner"/>
                         <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+                        </group>
                         <separator colspan="4" string="Contract Data"/>
                         <field name="probability" string="Availability (weeks)"/>
                         <newline/>
diff --git a/addons/crm_configuration/crm_meeting_menu.xml b/addons/crm_configuration/crm_meeting_menu.xml
old mode 100644
new mode 100755
index 96c43b0c203..6a9bfb93848
--- a/addons/crm_configuration/crm_meeting_menu.xml
+++ b/addons/crm_configuration/crm_meeting_menu.xml
@@ -47,6 +47,7 @@
         <field name="view_id" ref="crm_case_calendar_view"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
+        <field name="domain" eval="[('section_id.calendar','=',1)]"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
         <field name="sequence" eval="1"/>
@@ -81,7 +82,7 @@
         <field name="res_model">crm.case</field>
         <field name="view_mode">calendar,tree,form,graph,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
-        <field name="domain" eval="'[(\'user_id\',\'=\',uid)]'"/>
+        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'section_id.calendar\',\'=\',1)]'"/>
         <field name="context" eval="{'default_state':'open'}"/>
         <field name="filter" eval="True"/>
         <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
old mode 100644
new mode 100755