diff --git a/crm_claim_rma/account_invoice_view.xml b/crm_claim_rma/account_invoice_view.xml
index 0a6eb798..e4d699aa 100644
--- a/crm_claim_rma/account_invoice_view.xml
+++ b/crm_claim_rma/account_invoice_view.xml
@@ -14,10 +14,9 @@
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.invoice_form" />
             <field eval="16" name="priority"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/notebook/page[@string='Other Info']/field[@name='origin']" position="after">
+                    <xpath expr="/form/sheet/notebook/page[@string='Other Info']/group/group/field[@name='origin']" position="after">
                         <field name="claim_id" attrs="{'invisible':[('type','!=','out_refund')]}"/>
                     </xpath>
                 </data>
diff --git a/crm_claim_rma/crm_claim_rma.py b/crm_claim_rma/crm_claim_rma.py
index 363225cf..a95fb98d 100644
--- a/crm_claim_rma/crm_claim_rma.py
+++ b/crm_claim_rma/crm_claim_rma.py
@@ -88,7 +88,7 @@ class claim_line(osv.osv):
         'guarantee_limit': fields.date('Warranty limit', help="The warranty limit is computed as: invoice date + warranty defined on selected product.", readonly=True),
         'warning': fields.char('Warranty', size=64, readonly=True,help="If warranty has expired"), #select=1,
         'warranty_type': fields.char('Warranty type', size=64, readonly=True,help="from product form"),
-        "warranty_return_partner" : fields.many2one('res.partner.address', 'Warranty return',help="Where the customer has to send back the product(s)"),        
+        "warranty_return_partner" : fields.many2one('res.partner', 'Warranty return',help="Where the customer has to send back the product(s)"),        
         'claim_id': fields.many2one('crm.claim', 'Related claim',help="To link to the case.claim object"),
         'state' : fields.selection([('draft','Draft'),
                                     ('refused','Refused'),
@@ -303,7 +303,7 @@ class crm_claim(osv.osv):
         res = super(crm_claim, self).onchange_partner_address_id(cr, uid, ids, add, email=email)
         if add:
             if not res['value']['email_from'] or not res['value']['partner_phone']:
-                address = self.pool.get('res.partner.address').browse(cr, uid, add)
+                address = self.pool.get('res.partner').browse(cr, uid, add)
                 for other_add in address.partner_id.address:
                     if other_add.email and not res['value']['email_from']:
                         res['value']['email_from'] = other_add.email
diff --git a/crm_claim_rma/crm_claim_rma_data.xml b/crm_claim_rma/crm_claim_rma_data.xml
index 9d098335..3e1d97a5 100644
--- a/crm_claim_rma/crm_claim_rma_data.xml
+++ b/crm_claim_rma/crm_claim_rma_data.xml
@@ -21,7 +21,7 @@
 	<record model="crm.case.section" id="section_after_sales_service">
             <field name="name">After Sales Service</field>
             <field name="code">ASV</field>
-            <field name="stage_ids" eval="[(4, ref('crm_claim.stage_claim1')), (4, ref('crm_claim.stage_claim2')), (4, ref('crm_claim.stage_claim3')), (4, ref('stage_claim5'))]"/>
+            <field name="stage_ids" eval="[(4, ref('crm_claim.stage_claim1')), (4, ref('crm_claim.stage_claim2')), (4, ref('crm_claim.stage_claim3')), (4, ref('crm_claim.stage_claim5'))]"/>
         </record>
 		
         <!--
diff --git a/crm_claim_rma/crm_claim_rma_view.xml b/crm_claim_rma/crm_claim_rma_view.xml
index 65749ca1..c7c40562 100644
--- a/crm_claim_rma/crm_claim_rma_view.xml
+++ b/crm_claim_rma/crm_claim_rma_view.xml
@@ -28,7 +28,6 @@
         <record id="view_crm_claim_lines_filter" model="ir.ui.view">
             <field name="name">CRM - Claims Search</field>
             <field name="model">claim.line</field>
-            <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Claims">
                     <filter icon="terp-check" string="Current" name="current"
@@ -75,7 +74,6 @@
         <record model="ir.ui.view" id="crm_claim_line_tree_view">
             <field name="name">CRM - Claims Tree</field>
             <field name="model">claim.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree editable="top" string="Returned lines">
                     <field name="state"/>
@@ -133,10 +131,10 @@
 
 <!-- Picking follow -->
         <!-- TREE -->
+<!--
         <record model="ir.ui.view" id="crm_picking_follow_tree_view">
             <field name="name">CRM - Picking follow Tree</field>
             <field name="model">picking.follow</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Picking follows">
                     <field name="picking_id"/>
@@ -147,8 +145,9 @@
                 </tree>
             </field>
         </record>
-
+-->
         <!-- FORM -->
+<!--
         <record model="ir.ui.view" id="crm_picking_follow_form_view">
             <field name="name">CRM - Picking follow Form</field>
             <field name="model">picking.follow</field>
@@ -162,7 +161,7 @@
                 </form>
             </field>
         </record>
-
+-->
 <!-- PRODUCT EXCHANGE -->
     <!-- TREE -->
 <!--    <record model="ir.ui.view" id="crm_product_exchange_tree_view">-->
@@ -218,10 +217,16 @@
         <field name="model">crm.claim</field>
         <field name="inherit_id" ref="crm_claim.crm_case_claims_form_view"/>
         <field name="arch" type="xml">
+            <page string="Follow Up" position="after">
+                <field name="invoice_ids" colspan="4" nolabel="1" readonly="1"/>
+                <field name="picking_ids" colspan="4" nolabel="1" readonly="1"/>
+	    </page>
+<!--                
             <xpath expr="/form/group/notebook/page[@string='Communication &amp; History']/field" position="after">
                 <field name="invoice_ids" colspan="4" nolabel="1" readonly="1"/>
                 <field name="picking_ids" colspan="4" nolabel="1" readonly="1"/>
             </xpath>
+-->
             <field name="description" position="after">
                 <group name="Product Return" colspan="4">
                     <separator string="Product Return" colspan="4"/>
diff --git a/crm_claim_rma/res_company.py b/crm_claim_rma/res_company.py
index 8c41d327..a335752a 100644
--- a/crm_claim_rma/res_company.py
+++ b/crm_claim_rma/res_company.py
@@ -27,7 +27,7 @@ class res_company(osv.osv):
     _inherit = "res.company"
 
     _columns = {
-        'crm_return_address_id': fields.many2one('res.partner.address', 'Crm return address', help="Default address where the customers has to send back the returned product in a crm claim. If empty the address is the company address"),
+        'crm_return_address_id': fields.many2one('res.partner', 'Crm return address', help="Default address where the customers has to send back the returned product in a crm claim. If empty the address is the company address"),
     }
 
 res_company()
diff --git a/crm_claim_rma/res_company_view.xml b/crm_claim_rma/res_company_view.xml
index c75338be..2e076d44 100644
--- a/crm_claim_rma/res_company_view.xml
+++ b/crm_claim_rma/res_company_view.xml
@@ -14,7 +14,6 @@
             <field name="model">res.company</field>
             <field name="inherit_id" ref="base.view_company_form" />
             <field eval="16" name="priority"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
                     <field name="company_registry" position="after">
diff --git a/crm_claim_rma/stock_view.xml b/crm_claim_rma/stock_view.xml
index 64256268..1760706b 100644
--- a/crm_claim_rma/stock_view.xml
+++ b/crm_claim_rma/stock_view.xml
@@ -14,7 +14,6 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_in_form" />
             <field eval="16" name="priority"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/notebook/page[@string='Additional Info']/field[@name='type']" position="after">
@@ -46,7 +45,6 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form" />
             <field eval="16" name="priority"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/notebook/page[@string='Additional info']/field[@name='type']" position="after">
@@ -65,10 +63,9 @@
             <field name="model">stock.warehouse</field>
             <field name="inherit_id" ref="stock.view_warehouse" />
             <field eval="16" name="priority"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/field[@name='lot_output_id']" position="after">
+                    <xpath expr="/form/group/group/field[@name='lot_output_id']" position="after">
                         <field name="lot_rma_id"/>
                         <field name="lot_carrier_loss_id"/>
                         <field name="lot_breakage_loss_id"/>
@@ -83,9 +80,8 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_in_search" />
             <field eval="16" name="priority"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <filter string="To invoice" position="after">
+                <filter string="To Invoice" position="after">
                     <separator orientation="vertical"/>
                     <filter string="RMA" name="to_do" icon="terp-accessories-archiver-minus" domain="[('claim_picking', '=', 'False'), ('claim_id', '!=', 'False')]" />
                 </filter>
diff --git a/crm_claim_rma/wizard/claim_make_picking_from_picking_view.xml b/crm_claim_rma/wizard/claim_make_picking_from_picking_view.xml
index 67091e11..77d31c42 100644
--- a/crm_claim_rma/wizard/claim_make_picking_from_picking_view.xml
+++ b/crm_claim_rma/wizard/claim_make_picking_from_picking_view.xml
@@ -10,7 +10,6 @@
         <record id="view_claim_picking_from_picking" model="ir.ui.view">
             <field name="name">claim_picking</field>
             <field name="model">claim_make_picking_from_picking.wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select lines to add in picking">
                     <separator string="Locations" colspan="4"/>
diff --git a/crm_claim_rma/wizard/claim_make_picking_view.xml b/crm_claim_rma/wizard/claim_make_picking_view.xml
index f36ffd20..89ff4162 100644
--- a/crm_claim_rma/wizard/claim_make_picking_view.xml
+++ b/crm_claim_rma/wizard/claim_make_picking_view.xml
@@ -10,7 +10,6 @@
         <record id="view_claim_picking" model="ir.ui.view">
             <field name="name">claim_picking</field>
             <field name="model">claim_make_picking.wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select exchange lines to add in picking">
                     <separator string="Locations" colspan="4"/>
diff --git a/crm_claim_rma/wizard/get_empty_serial_view.xml b/crm_claim_rma/wizard/get_empty_serial_view.xml
index a3d3248d..87cc3513 100644
--- a/crm_claim_rma/wizard/get_empty_serial_view.xml
+++ b/crm_claim_rma/wizard/get_empty_serial_view.xml
@@ -27,7 +27,6 @@
         <record id="view_get_empty_serial" model="ir.ui.view">
             <field name="name">get_empty_serial</field>
             <field name="model">get_empty_serial.wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select invoice">
 					<!-- field name="prodlot_ids"/ --> <!-- domain="[('partner_id','=',partner_id)]"/ -->
diff --git a/crm_claim_rma/wizard/returned_lines_from_invoice_wizard_view.xml b/crm_claim_rma/wizard/returned_lines_from_invoice_wizard_view.xml
index 2ae90c6e..68021840 100644
--- a/crm_claim_rma/wizard/returned_lines_from_invoice_wizard_view.xml
+++ b/crm_claim_rma/wizard/returned_lines_from_invoice_wizard_view.xml
@@ -27,7 +27,6 @@
         <record id="view_create_return_invoice_form" model="ir.ui.view">
             <field name="name">returned_lines_from_invoice_view</field>
             <field name="model">returned_lines_from_invoice_invoice.wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select invoice">
 					<field name="invoice_id" domain="[('partner_id','=',partner_id)]"/>
@@ -57,7 +56,6 @@
         <record id="view_create_return_invoice_line_form" model="ir.ui.view">
             <field name="name">returned_lines_from_invoice_line_wiew</field>
             <field name="model">returned_lines_from_invoice_line.wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select return lines to create">
                 <separator string="Select return lines to create" colspan="4"/>
@@ -74,7 +72,6 @@
         <record model="ir.ui.view" id="temp_claim_line_tree_view">
             <field name="name">temp_claim_line_Tree</field>
             <field name="model">temp.claim.line</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Confirm return lines">
                     <field name="invoice_id"/>
diff --git a/crm_claim_rma/wizard/returned_lines_from_serial_wizard_view.xml b/crm_claim_rma/wizard/returned_lines_from_serial_wizard_view.xml
index 45e9cb6e..0acd515e 100644
--- a/crm_claim_rma/wizard/returned_lines_from_serial_wizard_view.xml
+++ b/crm_claim_rma/wizard/returned_lines_from_serial_wizard_view.xml
@@ -27,7 +27,6 @@
         <record id="view_create_return_serial_form" model="ir.ui.view">
             <field name="name">returned_lines_from_serial_wiew</field>
             <field name="model">returned_lines_from_serial.wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select serial numbers to create">
 					<group col="3" colspan="4">
diff --git a/product_warranty/product_warranty_view.xml b/product_warranty/product_warranty_view.xml
index 6dae3cb9..1ab3e23f 100644
--- a/product_warranty/product_warranty_view.xml
+++ b/product_warranty/product_warranty_view.xml
@@ -26,7 +26,6 @@
         <record model="ir.ui.view" id="product_return_instructions_tree_view">
             <field name="name">product.return.instructions.tree</field>
             <field name="model">return.instruction</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Return instructions">
                     <field name="name"/>
@@ -40,7 +39,6 @@
         <record model="ir.ui.view" id="product_return_instructions_form_view">
             <field name="name">product.return.instructions.form</field>
             <field name="model">return.instruction</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Return instructions">
                     <field name="name"/>
@@ -53,7 +51,6 @@
 
         <record id="product_return_instructions_action" model="ir.actions.act_window">
             <field name="name">Products return instructions</field>
-            <field name="type">ir.actions.act_window</field>
             <field name="res_model">return.instruction</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -61,7 +58,7 @@
         </record>
         
         <menuitem action="product_return_instructions_action"
-            groups="base.group_extended"
+            groups="base.group_no_one"
             id="menu_product_return_instructions_action"
             parent="product.prod_config_main" sequence="3"/>        
 <!-- supplier info -->
@@ -70,7 +67,6 @@
             <field name="name">product.supplierinfo.warranty.tree</field>
             <field name="model">product.supplierinfo</field>
             <field name="inherit_id" ref="product.product_supplierinfo_tree_view" />
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <field position="after" name="delay">
                     <field name="warranty_duration"/>
@@ -87,7 +83,6 @@
             <field name="name">product.supplierinfo.warranty.form</field>
             <field name="model">product.supplierinfo</field>
             <field name="inherit_id" ref="product.product_supplierinfo_form_view" />
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <field position="after" name="delay">
                     <field name="warranty_duration"/>