diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 3f0ce0fde85..89c19a436d0 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -141,7 +141,7 @@
             <field name="name">List of Accounts</field>
             <field name="res_model">account.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
         </record>
         <menuitem id="account_account_menu" name="Financial Accounts" parent="account.menu_finance_accounting"/>
         <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
@@ -166,6 +166,7 @@
             <field name="name">Chart of Accounts</field>
             <field name="res_model">account.account</field>
             <field name="view_type">tree</field>
+            <field name="view_mode">form</field>
             <field name="view_id" ref="view_account_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
@@ -1629,6 +1630,17 @@
 
 		<menuitem parent="account.account_account_menu" action="action_wizard_multi_chart" id="menu_wizard"/>
 
+		<record id="account_account_graph" model="ir.ui.view">
+            <field name="name">account.account.graph</field>
+            <field name="model">account.account</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Account Statistics" type="bar">
+                    <field name="name"/>
+                    <field name="balance" operator="+"/>
+                </graph>
+            </field>
+     </record>
 
     </data>
 </openerp>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 45a4307a6c9..ccc8fb420e7 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -73,6 +73,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
         </record>
         <!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>-->
@@ -84,6 +85,7 @@
             <field name="res_model">account.analytic.account</field>
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
+             <field name="view_mode">form,graph</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
         </record>
         <menuitem
@@ -96,7 +98,7 @@
             <field name="name">New Analytic Account</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
+            <field name="view_mode">form,tree,graph</field>
             <field eval="view_account_analytic_account_form" name="view_id"/>
         </record>
         <menuitem action="analytic_account_form" id="account_analytic_form" parent="account.account_analytic_def_account"/>
@@ -356,5 +358,17 @@
             </field>
         </record>
 
+	 <record id="analytic_accounts_graph" model="ir.ui.view">
+            <field name="name">analytic.accounts.graph</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Analytic Account Statistics" type="bar">
+                    <field name="complete_name"/>
+                    <field name="balance" operator="+"/>
+                </graph>
+            </field>
+     </record>
+
     </data>
 </openerp>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index c57a0cdba70..ebe0d4638bb 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <menuitem icon="terp-project" id="menu_main" name="Project Management"/>
-        
+
         <record id="action_account_analytic_managed" model="ir.actions.act_window">
             <field name="name">My managed accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
             <field name="domain">[('user_id','=',uid)]</field>
         </record>
-        
+
         <menuitem id="next_id_71" name="Analytic Accounts" parent="account_analytic_analysis.menu_main"/><menuitem action="action_account_analytic_managed" id="menu_analytic_account_managed" parent="next_id_71"/>
-        
+
         <record id="action_hr_tree_invoiced_my" model="ir.actions.act_window">
             <field name="name">Uninvoiced entries of my accounts</field>
             <field name="res_model">account.analytic.line</field>
@@ -20,85 +21,93 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('account_id.user_id','=',uid)]</field>
         </record>
-        
+
         <menuitem action="action_hr_tree_invoiced_my" id="menu_action_hr_tree_invoiced_my" parent="account_analytic_analysis.next_id_71"/>
-        
+
         <record id="action_account_analytic_managed_open" model="ir.actions.act_window">
             <field name="name">My Open Managed Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
             <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
         </record>
-        
+
         <menuitem action="action_account_analytic_managed_open" id="menu_analytic_account_to_valid_open" parent="account_analytic_analysis.menu_analytic_account_managed"/>
-        
+
         <record id="action_account_analytic_managed_pending" model="ir.actions.act_window">
             <field name="name">My Pending Managed Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
             <field name="domain">[('user_id','=',uid),('state','=','pending')]</field>
         </record>
-        
+
         <menuitem action="action_account_analytic_managed_pending" id="menu_analytic_account_to_valid_pending" parent="account_analytic_analysis.menu_analytic_account_managed"/>
-        
-        <record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window"> 
+
+        <record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window">
             <field name="name">Overpassed accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
             <field name="domain">[('date','&lt;=',time.strftime('%Y-%m-%d')),('state','=','open')]</field>
         </record>
-        
+
         <menuitem action="action_account_analytic_managed_overpassed" id="menu_action_account_analytic_managed_overpassed" parent="account_analytic_analysis.next_id_71"/>
-        
+
         <record id="action_account_analytic_all" model="ir.actions.act_window">
             <field name="name">All Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="account.view_account_analytic_account_list"/>
             <field name="domain">[]</field>
         </record>
-        
+
         <menuitem action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="account_analytic_analysis.next_id_71"/>
-        
+
         <record id="action_account_analytic_all_draft" model="ir.actions.act_window">
             <field name="name">Draft Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="account.view_account_analytic_account_list"/>
             <field name="domain">[('state','=','draft')]</field>
         </record>
-        
+
         <menuitem id="next_id_72" name="All Analytic Accounts" parent="account_analytic_analysis.next_id_71"/><menuitem action="action_account_analytic_all_draft" id="menu_action_account_analytic_all_draft" parent="next_id_72"/>
-        
+
         <record id="action_account_analytic_all_open" model="ir.actions.act_window">
             <field name="name">Open Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="account.view_account_analytic_account_list"/>
             <field name="domain">[('state','=','open')]</field>
         </record>
-        
+
         <menuitem action="action_account_analytic_all_open" id="menu_action_account_analytic_all_open" parent="account_analytic_analysis.next_id_72"/>
-        
+
         <record id="action_account_analytic_all_pending" model="ir.actions.act_window">
             <field name="name">Pending Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="account.view_account_analytic_account_list"/>
             <field name="domain">[('state','=','pending')]</field>
         </record>
-        
+
         <menuitem action="action_account_analytic_all_pending" id="menu_action_account_analytic_all_pending" parent="account_analytic_analysis.next_id_72"/>
-        
+
         <record id="action_account_analytic_all_simplified" model="ir.actions.act_window">
             <field name="name">Simplified View Analytic Accounts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
             <field name="view_id" ref="view_account_analytic_simplified"/>
             <field name="domain">[]</field>
         </record>
-        
+
         <menuitem action="action_account_analytic_all_simplified" id="menu_action_account_analytic_all_simplified" parent="account_analytic_analysis.next_id_72"/>
-        
+
     </data>
 </openerp>
diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml
index 6efa01a7267..00104813896 100644
--- a/addons/base_contact/base_contact_demo.xml
+++ b/addons/base_contact/base_contact_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
         <!-- Create the functions -->
 		<record id="res_partner_function_privateaddress0" model="res.partner.function">
@@ -323,4 +323,4 @@
             <field name="sequence_contact">1</field>
 		</record>
 	</data>
-</terp>
+</openerp>
diff --git a/addons/document/custom_report.xml b/addons/document/custom_report.xml
index 02cf10e6a4a..ebfe70e4c50 100644
--- a/addons/document/custom_report.xml
+++ b/addons/document/custom_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/document/custom_view.xml b/addons/document/custom_view.xml
index 4909336c498..61d95f9aa27 100644
--- a/addons/document/custom_view.xml
+++ b/addons/document/custom_view.xml
@@ -1,4 +1,4 @@
-<terp>
+<openerp>
 <data>
 	<record model="res.groups" id="group_compta_user">
  		<field name="name">grcompta</field>
@@ -8,5 +8,5 @@
 	</record>
 	<menuitem name="Administration" groups="admin,grcomptaadmin" icon="terp-stock" id="menu_admin_compta"/>
 </data>
-</terp>
+</openerp>
 
diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index 98793851804..9953d07dd92 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/document/document_demo.xml b/addons/document/document_demo.xml
index 3de248ffa28..94c52923556 100644
--- a/addons/document/document_demo.xml
+++ b/addons/document/document_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 	<record model="document.directory" id="dir_root">
@@ -90,4 +90,4 @@
 	</record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 4aaa2ece59f..dfc3cc4c85a 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -1,4 +1,4 @@
-<terp>
+<openerp>
 <data>
     <menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
 
@@ -237,5 +237,5 @@
         </record>
 
 </data>
-</terp>
+</openerp>