diff --git a/addons/account/board_account_demo.xml b/addons/account/board_account_demo.xml
index 98eb64cb411..cfcebdbcdf1 100644
--- a/addons/account/board_account_demo.xml
+++ b/addons/account/board_account_demo.xml
@@ -5,16 +5,16 @@
 			Administrator shortcut
 			Demo user startup menu
 		-->
-        <record id="sc_account_dash" model="ir.ui.view_sc">
+        <!-- <record id="sc_account_dash" model="ir.ui.view_sc">
             <field name="name">Accounting dashboard</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="resource">ir.ui.menu</field>
             <field name="sequence">0</field>
             <field name="res_id" ref="menu_board_account"/>
-        </record>
+        </record> -->
         <record id="base.user_root" model="res.users">
             <field name="action_id" ref="open_board_account"/>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 69ca8e964e9..4729ab7283d 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -19,15 +19,16 @@
 			<field name="res_model">crm.lead</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
-			<field name="view_id" ref="crm.crm_case_tree_view_leads"/>
+			<field name="view_id" ref="crm.crm_case_tree_view_oppor"/>
             <field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
 		</record>
+
 		<record model="ir.actions.act_window" id="act_my_meetings">
 			<field name="res_model">crm.meeting</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">tree,form</field>
 			<field name="view_id" ref="crm.crm_case_tree_view_meet"/>
-			<field name="domain">[('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')]</field>
+            <field name="domain">[('user_id','=',uid),('state','!=','cancel'),('date','ilike',time.strftime("%Y-%m"))]</field>
 		</record>
 
 		<record model="ir.actions.act_window" id="act_my_leads_stage">
@@ -53,34 +54,28 @@
 			<field name="arch" type="xml">
 				<form string="Connecting Dashboard">
 					<hpaned>
-
 						<child1>
-
 							<action
+								string="My Opportunities"
 								name="%(act_my_leads)d"
 								colspan="4"
 								height="150"
 								width="510"/>
-
 							<action
 								string="My Meetings"
 								name="%(act_my_meetings)d"
 								height="150"
 								colspan="4"/>
-
 						</child1>
-
 						<child2>
 							<action
-                                string="My Leads By Stage"
+                                string="Revenues by stage"
                                 name="%(act_my_leads_stage)d"
                                 colspan="4"/>
-
                             <action
                                 string="My Sales Pipeline"
                                 name="%(act_sales_pipeline)d"
                                 colspan="4"/>
-
                         </child2>
                     </hpaned>
                 </form>
@@ -105,7 +100,5 @@
             action="open_board_crm"
             sequence="1"
             id="menu_board_crm" icon="terp-graph"/>
-
-
     </data>
 </openerp>
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 5292b297c89..014a08299e2 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -59,9 +59,9 @@
             <field name="model">crm.lead.report</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-                <graph orientation="horizontal" string="Leads Analysis" type="bar">
-                    <field name="state"/>
-                    <field name="nbr" operator="+"/>
+                <graph orientation="vertical" string="Leads Analysis" type="bar">
+                    <field name="stage_id"/>
+                    <field name="planned_revenue" operator="+"/>
                     <field group="True" name="user_id"/>
                 </graph>
             </field>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 769cb5d5c81..d5bd5c1a3e9 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -4,62 +4,62 @@
 
          <!--  Partners inherited form -->
 
-<!--		<record id="view_crm_partner_info_form" model="ir.ui.view">-->
-<!--            <field name="name">res.partner.crm.info.inherit</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="//notebook[last()]" position="after">-->
-<!--                    <notebook colspan="4">-->
-<!--		               		<page string="CRM">-->
-<!--								<field name="meeting_ids" colspan="4" nolabel="1" />-->
-<!--								<field name="phonecall_ids" colspan="4" nolabel="1" />-->
-<!--								<field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">-->
-<!--		               				<tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">-->
-<!--						                <field name="create_date"/>-->
-<!--						                <field name="partner_name"/>-->
-<!--						                <field name="name"/>-->
-<!--						                <field name="email_from"/>-->
-<!--						                <field name="phone"/>-->
-<!--						-->
-<!--						                <field name="categ_id" invisible="1"/>-->
-<!--						                <field name="type_id" invisible="1"/>-->
-<!--						                <field name="referred" invisible="1"/>-->
-<!--						-->
-<!--						                <field name="stage_id"/>-->
-<!--						                <button name="stage_previous" string="Previous"-->
-<!--						                    states="open,pending" type="object" icon="gtk-go-back" />-->
-<!--						                <button name="stage_next" string="Next"-->
-<!--						                    states="open,pending" type="object"-->
-<!--						                    icon="gtk-go-forward" />-->
-<!--						                <field name="section_id"-->
-<!--						                    invisible="context.get('invisible_section', True)" />-->
-<!--						                <field name="user_id" />-->
-<!--						                <field name="state" />-->
-<!--						                <button name="case_open" string="Open"-->
-<!--						                    states="draft,pending" type="object"-->
-<!--						                    icon="gtk-go-forward" />-->
-<!--						                <button name="case_close" string="Close"-->
-<!--						                    states="open,draft,pending" type="object"-->
-<!--						                    icon="gtk-close" />-->
-<!--						                <button string="Convert to Opportunity"-->
-<!--						                    name="convert_opportunity"-->
-<!--						                    states="draft,open,pending" icon="gtk-index"-->
-<!--						                    type="object" />-->
-<!--						                <button name="case_escalate" string="Escalate"-->
-<!--						                    states="open,draft,pending" type="object"-->
-<!--						                    icon="gtk-go-up" />-->
-<!--						                <button name="case_cancel" string="Cancel"-->
-<!--						                    states="draft,open,pending" type="object"-->
-<!--						                    icon="gtk-cancel" />-->
-<!--						            </tree>-->
-<!--		               			</field>-->
-<!--							</page>-->
-<!--						</notebook>-->
-<!--                </xpath>-->
-<!--            </field>-->
-<!--        </record>-->
+		<record id="view_crm_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.crm.info.inherit</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="//notebook[last()]" position="after">
+                    <notebook colspan="4">
+		               		<page string="CRM">
+								<field name="meeting_ids" colspan="4" nolabel="1" />
+								<field name="phonecall_ids" colspan="4" nolabel="1" />
+								<field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]">
+		               				<tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+						                <field name="create_date"/>
+						                <field name="partner_name"/>
+						                <field name="name"/>
+						                <field name="email_from"/>
+						                <field name="phone"/>
+
+						                <field name="categ_id" invisible="1"/>
+						                <field name="type_id" invisible="1"/>
+						                <field name="referred" invisible="1"/>
+
+						                <field name="stage_id"/>
+						                <button name="stage_previous" string="Previous"
+						                    states="open,pending" type="object" icon="gtk-go-back" />
+						                <button name="stage_next" string="Next"
+						                    states="open,pending" type="object"
+						                    icon="gtk-go-forward" />
+						                <field name="section_id"
+						                    invisible="context.get('invisible_section', True)" />
+						                <field name="user_id" />
+						                <field name="state" />
+						                <button name="case_open" string="Open"
+						                    states="draft,pending" type="object"
+						                    icon="gtk-go-forward" />
+						                <button name="case_close" string="Close"
+						                    states="open,draft,pending" type="object"
+						                    icon="gtk-close" />
+						                <button string="Convert to Opportunity"
+						                    name="convert_opportunity"
+						                    states="draft,open,pending" icon="gtk-index"
+						                    type="object" />
+						                <button name="case_escalate" string="Escalate"
+						                    states="open,draft,pending" type="object"
+						                    icon="gtk-go-up" />
+						                <button name="case_cancel" string="Cancel"
+						                    states="draft,open,pending" type="object"
+						                    icon="gtk-cancel" />
+						            </tree>
+		               			</field>
+							</page>
+						</notebook>
+                </xpath>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 480ea0f10a1..92cf8e1031b 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -99,8 +99,7 @@ class crm_send_new_email(osv.osv_memory):
                 message_id = hist.message_id
                 model = hist.model
                 model_pool = self.pool.get(model)
-                res_ids = model_pool.search(cr, uid, [('thread_id','=', hist.thread_id.id)])
-                res_id = res_ids and res_ids[0] or False
+                res_id = hist.res_id
                 case = model_pool.browse(cr, uid, res_id)
             emails = [obj.email_to]
             email_cc = (obj.email_cc or '').split(',')
@@ -206,8 +205,7 @@ class crm_send_new_email(osv.osv_memory):
                 return {}
 
             model_pool = self.pool.get(model)
-            res_ids = model_pool.search(cr, uid, [('thread_id','=', hist.thread_id.id)])
-            res_id = res_ids and res_ids[0] or False            
+            res_id = hist.res_id      
             case = model_pool.browse(cr, uid, res_id)
             if 'email_to' in fields:
                 res.update({'email_to': case.email_from or hist.email_from or False})
diff --git a/addons/document/board_document_demo.xml b/addons/document/board_document_demo.xml
index 6f8f8ffa39e..672fb5cb268 100644
--- a/addons/document/board_document_demo.xml
+++ b/addons/document/board_document_demo.xml
@@ -6,12 +6,12 @@
             Administrator shortcut
             Demo user startup menu
         -->
-         <record model="ir.ui.view_sc" id="sc_document_dash">
+        <!-- <record model="ir.ui.view_sc" id="sc_document_dash">
             <field name="name">Documents dashboard</field>
              <field name="user_id" ref="base.user_root"/>
              <field name="resource">ir.ui.menu</field>
              <field name="sequence">1</field>
             <field name="res_id" ref="menu_board_document_manager"/>
-         </record>
+         </record> -->
      </data>
  </openerp>
diff --git a/addons/mrp/board_manufacturing_demo.xml b/addons/mrp/board_manufacturing_demo.xml
index 080467eb8b7..aea87558a1c 100644
--- a/addons/mrp/board_manufacturing_demo.xml
+++ b/addons/mrp/board_manufacturing_demo.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <record id="sc_manufacturing_dash" model="ir.ui.view_sc">
+        <!-- <record id="sc_manufacturing_dash" model="ir.ui.view_sc">
             <field name="name">Production dashboard</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="resource">ir.ui.menu</field>
             <field name="sequence">4</field>
             <field name="res_id" ref="menu_board_manufacturing"/>
-        </record>
+        </record> -->
         <record id="base.user_root" model="res.users">
             <field name="action_id" ref="open_board_manufacturing"/>
         </record>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 3523485f542..c4d92dc048f 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -332,7 +332,7 @@ class project_issue(osv.osv, crm.crm_case):
         if res:
             vals.update(res)
         res = self.create(cr, uid, vals, context)
-        
+        self.convert_to_bug(cr, uid, [res], context=context)
         
         attachents = msg.get('attachments', [])
         for attactment in attachents or []:
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 973e0a1a20c..fd523ad7774 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -95,7 +95,7 @@
                                     <button colspan="4"
                                     string="Reply to Last Email"
                                     name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'reply', 'model': 'project.issue'}"
+                                    context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
                                     icon="gtk-undo" type="action" />
                                 </form>
                                 <tree string="Communication history">
diff --git a/addons/sale/board_sale_demo.xml b/addons/sale/board_sale_demo.xml
index 996821c02e1..09419de206c 100644
--- a/addons/sale/board_sale_demo.xml
+++ b/addons/sale/board_sale_demo.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        
+
         <!--
 			Administrator shortcut
 			Demo user startup menu
 		-->
-        <record id="sc_sale_dash" model="ir.ui.view_sc">
+       <!--  <record id="sc_sale_dash" model="ir.ui.view_sc">
             <field name="name">Sales dashboard</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="resource">ir.ui.menu</field>
             <field name="sequence">1</field>
             <field name="res_id" ref="menu_board_sales_manager"/>
-        </record>
+        </record> -->
     </data>
 </openerp>
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 9464db91b6f..f293b6ee436 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -40,6 +40,7 @@ crm modules.
     'init_xml': [],
     'update_xml': ['sale_crm_wizard.xml',
                    'sale_crm_view.xml',
+                   'board_sale_crm_view.xml',
                    'process/sale_crm_process.xml',
                    'security/sale_crm_security.xml',
                    ],
diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
new file mode 100644
index 00000000000..42b7cc1cd47
--- /dev/null
+++ b/addons/sale_crm/board_sale_crm_view.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+
+		<record id="action_quotation_for_sale_crm" model="ir.actions.act_window">
+	        <field name="name">Quotations</field>
+	        <field name="res_model">sale.order</field>
+	        <field name="view_type">form</field>
+	        <field name="view_mode">tree,form</field>
+	        <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
+	   		<field name="view_id" ref="sale.view_order_tree"/>
+    	</record>
+
+    	<record id="view_turnover_by_month_tree" model="ir.ui.view">
+	        <field name="name">turnover.by.month.tree</field>
+	        <field name="model">account.invoice.report</field>
+	        <field name="type">tree</field>
+	        <field name="arch" type="xml">
+	            <tree string="Turnover By Months">
+	                <field name="month"/>
+	                <field name="price_total"/>
+	            </tree>
+	        </field>
+	    </record>
+
+	    <record id="view_turnover_by_month_graph" model="ir.ui.view">
+	        <field name="name">turnover.by.month.graph</field>
+	        <field name="model">account.invoice.report</field>
+	        <field name="type">graph</field>
+	        <field name="arch" type="xml">
+	            <graph string="Turnover By Months" type="bar">
+	                <field name="month"/>
+	                <field name="price_total" operator="+"/>
+	            </graph>
+	        </field>
+	    </record>
+
+		<record model="ir.actions.act_window" id="action_turnover_by_month">
+			<field name="res_model">account.invoice.report</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">graph,tree</field>
+			<field name="view_id" ref="view_turnover_by_month_tree"/>
+			<field name="domain">[('year','ilike',time.strftime('%Y')),('user_id','=',uid)]</field>
+			<field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
+        	<field name="search_view_id" ref="account.view_account_invoice_report_search"/>
+         </record>
+
+		<record model="ir.ui.view" id="crm.board_crm_form">
+			<field name="name">CRM - Dashboard Form</field>
+			<field name="model">board.board</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Connecting Dashboard">
+					<hpaned>
+						<child1>
+							<action
+								string="My Opportunities"
+								name="%(crm.act_my_leads)d"
+								colspan="4"
+								height="150"
+								width="510"/>
+
+							<action
+								string="My Meetings"
+								name="%(crm.act_my_meetings)d"
+								height="150"
+								colspan="4"/>
+							<action
+								string="My Quotations"
+								name="%(action_quotation_for_sale_crm)d"
+								colspan="4"
+								height="150"
+								width="510"/>
+						</child1>
+						<child2>
+							<action
+                                string="Revenues by stage"
+                                name="%(crm.act_my_leads_stage)d"
+                                colspan="4"/>
+                            <action
+                                string="My Sales Pipeline"
+                                name="%(crm.act_sales_pipeline)d"
+                                colspan="4"/>
+                             <action
+                                string="Turnover By Months"
+                                name="%(action_turnover_by_month)d"
+                                colspan="4"/>
+                        </child2>
+                    </hpaned>
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>