diff --git a/addons/crm_claim/__init__.py b/addons/crm_claim/__init__.py
new file mode 100644
index 00000000000..7395ea83fe5
--- /dev/null
+++ b/addons/crm_claim/__init__.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import crm_claim
+import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
new file mode 100644
index 00000000000..32a9319b75e
--- /dev/null
+++ b/addons/crm_claim/__openerp__.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Customer & Supplier Relationship Management',
+    'version': '1.0',
+    'category': 'Generic Modules/CRM & SRM',
+    'description': """claim""",
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
+    'depends': ['crm'],
+    'init_xml': [
+         'crm_claim_data.xml',
+    ],
+
+    'update_xml': [
+        'crm_claim_view.xml',
+        'crm_claim_menu.xml',
+        'security/ir.model.access.csv',
+        'report/crm_claim_report_view.xml',
+    ],
+    'demo_xml': [
+        'crm_claim_demo.xml',
+        'test/test_crm_claim.yml'
+    ],
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_claim.py b/addons/crm_claim/crm_claim.py
similarity index 99%
rename from addons/crm/crm_claim.py
rename to addons/crm_claim/crm_claim.py
index 43ec4fe9895..a2a2652ff23 100644
--- a/addons/crm/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
-import crm
+from crm import crm
 
 class crm_claim(osv.osv):
     """
@@ -70,4 +70,4 @@ class crm_claim(osv.osv):
 
 crm_claim()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_claims_data.xml b/addons/crm_claim/crm_claim_data.xml
similarity index 76%
rename from addons/crm/crm_claims_data.xml
rename to addons/crm_claim/crm_claim_data.xml
index fc1b37e14be..a176b3aa8e0 100644
--- a/addons/crm/crm_claims_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -8,19 +8,19 @@
 		
 		<record model="crm.case.categ" id="categ_claim1">
 			<field name="name">Factual Claims</field>
-			<field name="section_id" ref="section_sales_department"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 		</record>
 		
 		<record model="crm.case.categ" id="categ_claim2">
 			<field name="name">Value Claims</field>
-			<field name="section_id" ref="section_sales_department"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 		</record>
 		
 		<record model="crm.case.categ" id="categ_claim3">
 			<field name="name">Policy Claims</field>
-			<field name="section_id" ref="section_sales_department"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 		</record>
 	
@@ -30,13 +30,13 @@
 		
 		<record model="crm.case.resource.type" id="type_claim1">
 			<field name="name">Corrective</field>
-			<field name="section_id" ref="section_sales_department"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 		</record>	
 		
 		<record model="crm.case.resource.type" id="type_claim2">
 			<field name="name">Preventive</field>
-			<field name="section_id" ref="section_sales_department"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 		</record>
 	
@@ -46,33 +46,33 @@
 		
 		<record model="crm.case.stage" id="stage_claim1">
 			<field name="name">Accepted as Claim</field>
-			<field name="section_id" ref="section_sales_department"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 		</record>	
 		
 		<record model="crm.case.stage" id="stage_claim2">
 			<field name="name">Fixed</field>
-			<field name="section_id" ref="section_sales_department"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 		</record>
 			
 		<record model="crm.case.stage" id="stage_claim3">
 			<field name="name">Won't fix</field>
-			<field name="section_id" ref="section_sales_department"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 		</record>	
 		
 		<record model="crm.case.stage" id="stage_claim4">
 			<field name="name">Invalid</field>
-			<field name="section_id" ref="section_sales_department"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 		</record>	
 		
 		<record model="crm.case.stage" id="stage_claim5">
 			<field name="name">Awaiting Response</field>
-			<field name="section_id" ref="section_sales_department"/>
+			<field name="section_id" ref="crm.section_sales_department"/>
 			<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/> 
 		</record>
 	
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm/crm_claims_demo.xml b/addons/crm_claim/crm_claim_demo.xml
similarity index 81%
rename from addons/crm/crm_claims_demo.xml
rename to addons/crm_claim/crm_claim_demo.xml
index daa5914e167..db21223656e 100644
--- a/addons/crm/crm_claims_demo.xml
+++ b/addons/crm_claim/crm_claim_demo.xml
@@ -9,7 +9,7 @@
 		<record id="crm_case_claim01" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_15"/>
 			<field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
-			<field name="type_id" ref="crm.type_claim1"/>
+			<field name="type_id" ref="crm_claim.type_claim1"/>
 			<field name="partner_id" ref="base.res_partner_11"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
@@ -18,15 +18,15 @@
 			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(726) 782-0636&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
-			<field name="categ_id" ref="crm.categ_claim1"/>
-			<field name="stage_id" ref="crm.stage_claim1"/>
+			<field name="categ_id" ref="crm_claim.categ_claim1"/>
+			<field name="stage_id" ref="crm_claim.stage_claim1"/>
 			<field eval="&quot;(769) 703-274&quot;" name="partner_phone"/>
 		</record>
 		
 		<record id="crm_case_claim02" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_6"/>
 			<field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/>
-			<field name="type_id" ref="crm.type_claim2"/>
+			<field name="type_id" ref="crm_claim.type_claim2"/>
 			<field name="partner_id" ref="base.res_partner_6"/>
 			<field eval="&quot;4&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
@@ -35,15 +35,15 @@
 			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(392) 895-7917&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
-			<field name="categ_id" ref="crm.categ_claim2"/>
-			<field name="stage_id" ref="crm.stage_claim5"/>
+			<field name="categ_id" ref="crm_claim.categ_claim2"/>
+			<field name="stage_id" ref="crm_claim.stage_claim5"/>
 			<field eval="&quot;(956) 293-2595&quot;" name="partner_phone"/>
 		</record>
 		
 		<record id="crm_case_claim03" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_2"/>
 			<field eval="time.strftime('%Y-%m-15 17:44:12')" name="date"/>
-			<field name="type_id" ref="crm.type_claim1"/>
+			<field name="type_id" ref="crm_claim.type_claim1"/>
 			<field name="partner_id" ref="base.res_partner_10"/>
 			<field eval="&quot;2&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_demo"/>
@@ -52,15 +52,15 @@
 			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(820) 167-3208&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
-			<field name="categ_id" ref="crm.categ_claim3"/>
-			<field name="stage_id" ref="crm.stage_claim2"/>
+			<field name="categ_id" ref="crm_claim.categ_claim3"/>
+			<field name="stage_id" ref="crm_claim.stage_claim2"/>
 			<field eval="&quot;(079) 681-2139&quot;" name="partner_phone"/>
 			<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
 		</record>
 		
 		<record id="crm_case_claim04" model="crm.claim">
 			<field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/>
-			<field name="type_id" ref="crm.type_claim2"/>
+			<field name="type_id" ref="crm_claim.type_claim2"/>
 			<field name="partner_id" ref="base.res_partner_tinyatwork"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
@@ -69,15 +69,15 @@
 			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(077) 582-4035&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
-			<field name="categ_id" ref="crm.categ_claim1"/>
-			<field name="stage_id" ref="crm.stage_claim5"/>
+			<field name="categ_id" ref="crm_claim.categ_claim1"/>
+			<field name="stage_id" ref="crm_claim.stage_claim5"/>
 			<field eval="&quot;(514) 698-4118&quot;" name="partner_phone"/>
 		</record>
 		
 		<record id="crm_case_claim05" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_10"/>
 			<field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/>
-			<field name="type_id" ref="crm.type_claim1"/>
+			<field name="type_id" ref="crm_claim.type_claim1"/>
 			<field name="partner_id" ref="base.res_partner_5"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
@@ -86,15 +86,15 @@
 			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(333) 715-1450&quot;" name="partner_mobile"/>
 			<field eval="1" name="active"/>
-			<field name="categ_id" ref="crm.categ_claim3"/>
-			<field name="stage_id" ref="crm.stage_claim3"/>
+			<field name="categ_id" ref="crm_claim.categ_claim3"/>
+			<field name="stage_id" ref="crm_claim.stage_claim3"/>
 			<field eval="&quot;(855) 924-4364&quot;" name="partner_phone"/>
 		</record>
 		
 		<record id="crm_case_claim06" model="crm.claim">
 			<field name="partner_address_id" ref="base.res_partner_address_1"/>
 			<field eval="1" name="active"/>
-			<field name="type_id" ref="crm.type_claim2"/>
+			<field name="type_id" ref="crm_claim.type_claim2"/>
 			<field name="partner_id" ref="base.res_partner_9"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
@@ -103,15 +103,15 @@
 			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;(468) 017-2684&quot;" name="partner_mobile"/>
 			<field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
-			<field name="categ_id" ref="crm.categ_claim1"/>
-			<field name="stage_id" ref="crm.stage_claim4"/>
+			<field name="categ_id" ref="crm_claim.categ_claim1"/>
+			<field name="stage_id" ref="crm_claim.stage_claim4"/>
 			<field eval="&quot;(373) 907-1009&quot;" name="partner_phone"/>
 			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
 		</record>
 		
 		<record id="crm_case_claims07" model="crm.claim">
 			<field eval="1" name="active"/>
-			<field name="type_id" ref="crm.type_claim1"/>
+			<field name="type_id" ref="crm_claim.type_claim1"/>
 			<field name="partner_id" ref="base.res_partner_seagate"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
@@ -120,8 +120,8 @@
 			<field name="section_id" ref="crm.section_sales_department"/>
 			<field eval="&quot;	(463) 014-1208&quot;" name="partner_mobile"/>
 			<field eval="time.strftime('%Y-%m-19 13:01:05')" name="date"/>
-			<field name="categ_id" ref="crm.categ_claim3"/>
-			<field name="stage_id" ref="crm.stage_claim2"/>
+			<field name="categ_id" ref="crm_claim.categ_claim3"/>
+			<field name="stage_id" ref="crm_claim.stage_claim2"/>
 			<field eval="&quot;(282) 603-7489&quot;" name="partner_phone"/>
 		</record>
 		
diff --git a/addons/crm/crm_claims_menu.xml b/addons/crm_claim/crm_claim_menu.xml
similarity index 96%
rename from addons/crm/crm_claims_menu.xml
rename to addons/crm_claim/crm_claim_menu.xml
index 16711036100..b0d17495dee 100644
--- a/addons/crm/crm_claims_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -15,7 +15,7 @@
             <field name="view_mode">tree,calendar,form,graph</field>
             <field name="view_id" ref="crm_case_claims_tree_view"/>
             <field name="context">{"search_default_section_id":section_id,"search_default_current":1,"search_default_my_claims":1}</field>
-            <field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
+            <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
new file mode 100644
index 00000000000..ffd0c4943e0
--- /dev/null
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -0,0 +1,294 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+    <!-- Claims categories  -->
+
+    <record id="crm_claim_categ_action" model="ir.actions.act_window">
+        <field name="name">Claim Categories</field>
+        <field name="res_model">crm.case.categ</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
+        <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
+        <field name="context">{'object_id':'crm.claim'}</field>
+    </record>
+
+    <menuitem action="crm_claim_categ_action"
+        id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ" />
+
+    <!-- Claim Stages -->
+
+    <record id="crm_claim_stage_act" model="ir.actions.act_window">
+        <field name="name">Claim Stages</field>
+        <field name="res_model">crm.case.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="crm.crm_case_stage_tree"/>
+        <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
+        <field name="context">{'object_id':'crm.claim'}</field>
+    </record>
+
+    <menuitem action="crm_claim_stage_act"
+            id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage" />
+
+    <!-- Claim Resource Type -->
+
+    <record id="crm_claim_resource_act" model="ir.actions.act_window">
+        <field name="name">Claim Resource Type</field>
+        <field name="res_model">crm.case.resource.type</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
+        <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
+        <field name="context">{'object_id':'crm.claim'}</field>
+    </record>
+
+    <menuitem action="crm_claim_resource_act"
+            id="menu_crm_claim_stage_act"
+            parent="crm.menu_crm_case_resource_type" />
+
+        <!-- Claims    -->
+
+    <record model="ir.ui.view" id="crm_case_claims_tree_view">
+        <field name="name">CRM - Claims Tree</field>
+        <field name="model">crm.claim</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Claims" colors="blue:state=='pending';black:state=='open';grey:state in ('close', 'cancel')">
+                <field name="id"/>
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="user_id" />
+                <field name="section_id"/>
+                <field name="date" string="Claim Date"/>
+                <field name="date_deadline" string="Deadline"/>
+                <field name="date_closed" string="Closure Date"/>
+                <field name="categ_id" string="Type" select="1"/>
+                <field name="state"/>
+                <button name="case_open" string="Open"
+                    states="draft,pending" type="object"
+                    icon="gtk-go-forward" />
+                <button name="case_pending" string="Pending"
+                    states="draft,open" type="object"
+                    icon="gtk-media-pause" />
+                <button name="case_close" string="Close"
+                    states="open,draft,pending" type="object"
+                    icon="gtk-close" />
+                <button name="case_cancel" string="Cancel"
+                    states="draft,open,pending" type="object"
+                    icon="gtk-cancel" />
+                <button name="case_reset" string="Reset to Draft"
+                    states="done,cancel" type="object" icon="gtk-convert" />
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="crm_case_claims_form_view">
+        <field name="name">CRM - Claims Form</field>
+        <field name="model">crm.claim</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Claims">
+                <group colspan="4" col="4">
+                    <field name="name"/>
+                    <field name="date" string="Date of Claim"/>
+                    <field name="date_deadline" string="Deadline"/>
+                </group>
+                <group colspan="4" col="4">
+
+                <notebook>
+                <page string="Claim Info">
+                    <separator colspan="4" string="Communication"/>
+                    <group colspan="4" col="4">
+                        <field name="partner_id" string="Partner"
+                            on_change="onchange_partner_id(partner_id)" />
+                        <field name="partner_address_id" string="Contact"
+                            on_change="onchange_partner_address_id(partner_address_id, email_from)" />
+                        <field name="partner_phone"/>
+                        <field name="partner_mobile"/>
+                        <field name="email_from"/>
+                    </group>
+                    <separator colspan="4" string="Status and Categorization"/>
+                    <group colspan="4" col="6">
+                        <field name="user_id" string="Responsible"/>
+                        <field name="section_id" widget="selection"/>
+                        <label string="Stage: " align="1.0"/>
+                        <group colspan="1" col="2">
+                            <field name="stage_id" select="1" nolabel="1"/>
+                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+                        </group>
+                        <field name="categ_id" select="1" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.claim')]" />
+                        <field name="type_id" string="Type of Action" select="1"
+                            domain="[('object_id.model', '=', 'crm.claim')]" />
+                        <field name="priority"/>
+                    </group>
+                    <separator colspan="4" string="References"/>
+                    <group colspan="4" col="4">
+                        <field name="ref"/>
+                        <field name="ref2"/>
+                    </group>
+                    <separator colspan="4" string="Claim/Action Description"/>
+                    <field name="description" colspan="4" nolabel="1"/>
+                    <separator colspan="4" string=""/>
+                    <group col="8" colspan="4">
+                        <field name="state" select="1"/>
+                        <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" />
+                    </group>
+                </page>
+                <page string="History" groups="base.group_extended">
+                    <field name="id" select="1"/>
+                    <field name="active"/>
+                    <field name="canal_id"/>
+                    <field name="som"/>
+                    <separator colspan="4" string="Dates"/>
+                    <field name="create_date"/>
+                    <field name="date_closed"/>
+                    <field name="log_ids" nolabel="1" colspan="4">
+                        <form string="Actions">
+                            <separator string="Action Information" colspan="4"/>
+                            <field name="name" colspan="4"/>
+                            <field name="date"/>
+                            <field name="user_id"/>                            
+                        </form>
+                    </field>
+                </page>
+                <page string="Emails" groups="base.group_extended">
+                   <group colspan="4">
+                       <field colspan="4" name="email_cc" string="CC"/>
+                   </group>
+                    <field name="history_line" colspan="4" nolabel="1" mode="form,tree">
+                        <form string="Communication history">
+                            <group col="7" colspan="4">
+                                <field name="date"/>
+                                <field name="email_to"/>
+                                <field name="email_from"/>
+                               <button
+                                     string="Add a CC"
+                                               name="%(crm.action_view_crm_email_add_cc_wizard)d"
+                                               icon="gtk-add" type="action"/>
+                                   </group>
+                                   <newline/>
+                                   <field name="description" colspan="4" nolabel="1"/>
+                                   <button colspan="4"
+                                       string="Reply to Last Email"
+                                       name="%(crm.action_crm_send_mail)d"
+                                       context="{'mail':'reply', 'model': 'crm.claim'}"
+                                       icon="gtk-undo" type="action" />
+                               </form>
+                               <tree string="Communication history">
+                                   <field name="description"/>
+                                   <field name="email_to"/>
+                                   <field name="date"/>
+                               </tree>
+                           </field>
+                           <button colspan="4" string="Send New Email"
+                               name="%(crm.action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'crm.claim'}"
+                               icon="gtk-go-forward" type="action" />
+                 </page>
+                </notebook>
+
+                </group>
+            </form>
+        </field>
+    </record>
+
+    <!-- Claim Calendar view -->
+
+    <record model="ir.ui.view" id="crm_case_claims_calendar_view">
+        <field name="name">CRM - Claims Calendar</field>
+        <field name="model">crm.claim</field>
+        <field name="type">calendar</field>
+        <field name="priority" eval="2"/>
+        <field name="arch" type="xml">
+            <calendar string="Claims" date_start="date" color="user_id">
+                <field name="name"/>
+                <field name="partner_name"/>
+                <field name="categ_id"/>
+            </calendar>
+        </field>
+    </record>
+
+    <!-- Claim Graph view -->
+
+    <record model="ir.ui.view" id="crm_case_graph_view_stage_cost">
+        <field name="name">CRM -Graph</field>
+        <field name="model">crm.claim</field>
+        <field name="type">graph</field>
+        <field name="arch" type="xml">
+            <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
+                <field name="stage_id"/>
+                <field name="planned_cost" operator="+"/>
+                <field name="planned_revenue" operator="+"/>
+            </graph>
+        </field>
+    </record>
+
+    <!-- Crm claim Search view -->
+
+    <record id="view_crm_case_claims_filter" model="ir.ui.view">
+            <field name="name">CRM - Claims Search</field>
+            <field name="model">crm.claim</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Claims">
+                   <filter icon="gtk-new" string="Current"
+                       domain="[('state','in',('draft', 'open'))]"
+                       separator="1" help="Current Claims" default="1"
+                   />
+                   <filter icon="gtk-execute"
+                       string="In Progress"
+                       domain="[('state','=','open')]"
+                       separator="1" help="In Progress Claims"
+                   />
+                   <filter icon="gtk-media-pause"
+                       string="Pending"
+                       domain="[('state','=','pending')]"
+                       separator="1" help="All pending Claims"
+                   />
+                   <separator orientation="vertical"/>
+                   <field name="name" select='1'/>
+                   <field name="partner_id" select="1"/>
+                   <field name="user_id" select="1" widget="selection">
+                           <filter icon="terp-partner"
+                               domain="[('user_id','=',uid)]" help="My Claims"
+                               default="1" />
+                           <filter icon="terp-partner"
+                               domain="[('user_id','=', False)]"
+                               help="Unassigned Claims" />
+                   </field>
+                   <field name="section_id" select="1"
+                       widget="selection"
+                       default="context.get('section_id', False)">
+                       <filter icon="terp-crm"
+                           domain="[('section_id','=',context.get('section_id',False))]"
+                           help="My section" />
+                   </field>
+                   <newline/>
+                   <group expand="1" string="Group By..." colspan="10" col="20">
+                       <filter string="Deadline" icon="terp-crm"
+                           domain="[]"
+                           context="{'group_by':'date_deadline'}" />
+                       <filter string="Closure" icon="terp-crm"
+                           domain="[]"
+                           context="{'group_by':'date_closed'}" />
+                   </group>
+               </search>
+           </field>
+        </record>
+
+     </data>
+</openerp>
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm_claim/crm_claims_view.xml
similarity index 100%
rename from addons/crm/crm_claims_view.xml
rename to addons/crm_claim/crm_claims_view.xml
diff --git a/addons/crm_claim/report/__init__.py b/addons/crm_claim/report/__init__.py
new file mode 100644
index 00000000000..4f13d7bd837
--- /dev/null
+++ b/addons/crm_claim/report/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+import crm_claim_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/crm/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
similarity index 99%
rename from addons/crm/report/crm_claim_report.py
rename to addons/crm_claim/report/crm_claim_report.py
index 4148a834810..04f00f4a95e 100644
--- a/addons/crm/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -21,7 +21,7 @@
 
 from osv import fields,osv
 import tools
-import crm_report
+from crm.report import crm_report
 
 
 class crm_claim_report(osv.osv):
diff --git a/addons/crm/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
similarity index 97%
rename from addons/crm/report/crm_claim_report_view.xml
rename to addons/crm_claim/report/crm_claim_report_view.xml
index 647a0125179..fb4b0af3287 100644
--- a/addons/crm/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -33,7 +33,7 @@
         <record id="view_report_crm_claim_form" model="ir.ui.view">
             <field name="name">crm.claim.report.form</field>
             <field name="model">crm.claim.report</field>
-            <field name="inherit_id" ref="view_crm_case_form"/>
+            <field name="inherit_id" ref="crm.view_crm_case_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="nbr" position="after">
@@ -66,7 +66,7 @@
         <record id="view_report_crm_claim_filter" model="ir.ui.view">
             <field name="name">crm.claim.report.select</field>
             <field name="model">crm.claim.report</field>
-            <field name="inherit_id" ref="view_crm_case_filter"/>
+            <field name="inherit_id" ref="crm.view_crm_case_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
             <data>
diff --git a/addons/crm_claim/security/ir.model.access.csv b/addons/crm_claim/security/ir.model.access.csv
new file mode 100644
index 00000000000..f903ab0c1d7
--- /dev/null
+++ b/addons/crm_claim/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_crm_claim","crm.claim","model_crm_claim","crm.group_crm_manager",1,1,1,1
+"access_crm_claim_report_user","crm.claim.report","model_crm_claim_report","crm.group_crm_user",1,0,0,0
diff --git a/addons/crm/test/test_crm_claim.yml b/addons/crm_claim/test/test_crm_claim.yml
similarity index 88%
rename from addons/crm/test/test_crm_claim.yml
rename to addons/crm_claim/test/test_crm_claim.yml
index 54ef47a56f5..e8000161a1e 100644
--- a/addons/crm/test/test_crm_claim.yml
+++ b/addons/crm_claim/test/test_crm_claim.yml
@@ -6,7 +6,7 @@
   date of claim at which  claim is created.
 - 
   !record {model: crm.claim, id: crm_claim_damagedproduct0}:
-    categ_id: crm.categ_claim2
+    categ_id: crm_claim.categ_claim2
     date: '2010-04-21 20:13:00'
     email_from: info@balmerinc.be
     name: 'Damaged product '
@@ -23,8 +23,8 @@
 - |
   Now I make sure that claim is at "Accepted" stage.
 - 
-  !record {model: crm.claim, id: crm.crm_claim_damagedproduct0}:
-    stage_id: crm.stage_claim1
+  !assert {model: crm.claim, id: crm_claim.crm_claim_damagedproduct0}:
+    stage_id: crm_claim.stage_claim1
 - |
   I can change that stage by next button right on it
 -