From d9a506bb4c58761bc66236bb90196a882ab5322d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 6 Apr 2010 18:15:10 +0200
Subject: [PATCH] merge

bzr revid: fp@tinyerp.com-20100406161510-u7t9vi4kxlm30l6y
---
 .../report/account_invoice_report_view.xml    |   22 +-
 addons/analytic/project.py                    |    2 +-
 addons/crm/crm_claims_view.xml                |  102 +-
 addons/crm/crm_fund_view.xml                  |  197 +-
 addons/crm/crm_helpdesk_view.xml              |  116 +-
 addons/crm/crm_lead_view.xml                  |  178 +-
 addons/crm/crm_opportunity_view.xml           |  151 +-
 addons/crm/crm_phonecall_view.xml             |   69 +-
 addons/crm/crm_view.xml                       |  200 +-
 .../crm/wizard/crm_lead_to_partner_view.xml   |   88 +-
 addons/hr/hr_view.xml                         |    2 -
 addons/hr_expense/hr_expense_view.xml         |   36 +-
 addons/hr_holidays/__terp__.py                |    2 +-
 addons/hr_holidays/hr_holidays.py             |   22 +-
 .../wizard/holidays_summary_employees.py      |    4 -
 addons/hr_timesheet/hr_timesheet_view.xml     |   19 +-
 .../hr_timesheet_invoice_report_view.xml      |  106 +-
 .../hr_timesheet_sheet_view.xml               |   31 +-
 addons/mrp/mrp.py                             |    1 -
 addons/mrp/mrp_view.xml                       |  149 +-
 addons/product/product.py                     |    2 +-
 addons/project/project_view.xml               |    3 +-
 addons/project/report/project_report.py       |   10 +-
 addons/project/report/project_report_view.xml |   49 +-
 addons/project_issue/project_feature_menu.xml |   31 -
 addons/project_issue/project_issue.py         |    3 +-
 addons/project_issue/project_issue_view.xml   |    6 +-
 addons/project_long_term/project_long_term.py |   17 +-
 .../project_long_term_view.xml                |  193 +-
 addons/resource/resource_view.xml             |   60 +-
 addons/sale/sale_view.xml                     |    4 +-
 .../wizard/stock_change_standard_price.py     |   23 +-
 addons/survey/survey_demo.xml                 | 4357 ++++++++---------
 33 files changed, 3086 insertions(+), 3169 deletions(-)

diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index de046de6211..47b6ebf3110 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -58,6 +58,9 @@
                 <filter icon="terp-account"
                     string="Invoices"
                     domain="[('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"/>
+                <filter icon="terp-account"
+                    string="Paid"
+                    domain="[('state','=','paid')]"/>
                 <separator orientation="vertical"/>
                 <field name="product_id"/>
                 <field name="user_id" widget="selection">
@@ -71,17 +74,19 @@
                 <newline/>
                 <group expand="1" string="Extended options..." colspan="10" col="12">
                     <filter icon="terp-account"
-                    		string="Customer Invoices"
-                    		domain="[('type','=','out_invoice')]"/>
+                        string="Customer Invoices"
+                        domain="[('type','=','out_invoice')]"
+                        default="1"/>
                     <filter icon="terp-account"
-                    		string="Supplier Invoices"
-                    		domain="[('type','=','in_invoice')]"/>
+                        string="Customer Refunds"
+                        domain="[('type','=','out_refund')]"/>
+                    <separator orientation="vertical"/>
                     <filter icon="terp-account"
-                    		string="Customer Refunds"
-                    		domain="[('type','=','out_refund')]"/>
+                        string="Supplier Invoices"
+                        domain="[('type','=','in_invoice')]"/>
                     <filter icon="terp-account"
-                    		string="Supplier Refunds"
-                    		domain="[('type','=','in_refund')]"/>
+                        string="Supplier Refunds"
+                        domain="[('type','=','in_refund')]"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
@@ -90,6 +95,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-account" context="{'group_by':'product_id'}"/>
                     <filter string="Partner" icon="terp-account" context="{'group_by':'partner_id'}"/>
+                    <filter string="Type" icon="terp-account" context="{'group_by':'type'}"/>
                     <filter string="State" icon="terp-account" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Month" icon="terp-account" context="{'group_by':'date'}"/>
diff --git a/addons/analytic/project.py b/addons/analytic/project.py
index e9558f7a101..0c3c46690ac 100644
--- a/addons/analytic/project.py
+++ b/addons/analytic/project.py
@@ -204,7 +204,7 @@ class account_analytic_account(osv.osv):
         'date': fields.date('Date End'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Currency'),
-        'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'State', required=True,readonly=True,
+        'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed'),('template', 'Template')], 'State', required=True,readonly=True,
                                   help='* When an account is created its in \'Draft\' state.\
                                   \n* If any associated partner is there, it can be in \'Open\' state.\
                                   \n* If any pending balance is there it can be in \'Pending\'. \
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 6677bf7184b..f791a1b86cc 100755
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -14,7 +14,7 @@
     </record>
 
     <menuitem action="crm_claim_categ_action"
-    	id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ" />
+        id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ" />
 
     <!-- Claim Stages -->
 
@@ -28,7 +28,7 @@
     </record>
 
     <menuitem action="crm_claim_stage_act"
-        	id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage" />
+            id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage" />
 
     <!-- Claim Resource Type -->
 
@@ -42,8 +42,8 @@
     </record>
 
     <menuitem action="crm_claim_resource_act"
-        	id="menu_crm_claim_stage_act"
-        	parent="crm.menu_crm_case_resource_type" />
+            id="menu_crm_claim_stage_act"
+            parent="crm.menu_crm_case_resource_type" />
 
         <!-- Claims    -->
 
@@ -57,26 +57,26 @@
                 <field name="name"/>
                 <field name="partner_id"/>
                 <field name="user_id" />
-                <field name="section_id" string="Section" />
+                <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" />
+                    states="draft,pending" type="object"
+                    icon="gtk-go-forward" />
                 <button name="case_pending" string="Pending"
-                	states="draft,open" type="object"
-                	icon="gtk-media-pause" />
+                    states="draft,open" type="object"
+                    icon="gtk-media-pause" />
                 <button name="case_close" string="Close"
-                	states="open,draft,pending" type="object"
-                	icon="gtk-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" />
+                    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" />
+                    states="done,cancel" type="object" icon="gtk-convert" />
             </tree>
         </field>
     </record>
@@ -132,20 +132,20 @@
                     <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" />
+                            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" />
+                            states="draft,pending" type="object"
+                            icon="gtk-go-forward" />
                         <button name="case_cancel" string="Cancel"
-                        	states="draft,open,pending" type="object"
-                        	icon="gtk-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" />
+                            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" />
+                            string="Reset to Draft" states="done,cancel"
+                            type="object" icon="gtk-convert" />
                     </group>
                 </page>
                 <page string="History" groups="base.group_extended">
@@ -183,10 +183,10 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'crm.claim'}"
-                                   	icon="gtk-undo" type="action" />
+                                       string="Reply to Last Email"
+                                       name="%(action_crm_send_mail)d"
+                                       context="{'mail':'reply', 'model': 'crm.claim'}"
+                                       icon="gtk-undo" type="action" />
                                </form>
                                <tree string="Communication history">
                                    <field name="description"/>
@@ -195,9 +195,9 @@
                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'crm.claim'}"
-                           	icon="gtk-go-forward" type="action" />
+                               name="%(action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'crm.claim'}"
+                               icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
 
@@ -206,7 +206,7 @@
         </field>
     </record>
 
-	<!-- Claim Calendar view -->
+    <!-- Claim Calendar view -->
 
     <record model="ir.ui.view" id="crm_case_claims_calendar_view">
         <field name="name">CRM - Claims Calendar</field>
@@ -222,7 +222,7 @@
         </field>
     </record>
 
-	<!-- Claim Graph view -->
+    <!-- Claim Graph view -->
 
     <record model="ir.ui.view" id="crm_case_graph_view_stage_cost">
         <field name="name">CRM -Graph</field>
@@ -237,7 +237,7 @@
         </field>
     </record>
 
-	<!-- Crm claim Search view -->
+    <!-- Crm claim Search view -->
 
     <record id="view_crm_case_claims_filter" model="ir.ui.view">
             <field name="name">CRM - Claims Search</field>
@@ -263,28 +263,28 @@
                    <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" />
+                           <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" string="Section"
-                   	default="context.get('section_id', False)">
-                   	<filter icon="terp-crm"
-                   		domain="[('section_id','=',context.get('section_id',False))]"
-                   		help="My section" />
+                       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'}" />
+                       <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>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 170e7f9b4a0..ec4f0d49236 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -8,29 +8,29 @@
         <field name="name">Fundraising 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.fundraising')]</field>
-		<field name="context">{'object_id':'crm.fundraising'}</field>
+         <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
+        <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
+        <field name="context">{'object_id':'crm.fundraising'}</field>
     </record>
 
     <menuitem action="crm_fund_categ_action"
-    	id="menu_crm_case_fundraising-act"
-    	parent="crm.menu_crm_case_categ" />
+        id="menu_crm_case_fundraising-act"
+        parent="crm.menu_crm_case_categ" />
 
 <!-- Fund Stage Form View -->
 
-	    <record id="crm_fundraising_stage_act" model="ir.actions.act_window">
-	        <field name="name">Fundraising 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.fundraising')]</field>
-   			<field name="context">{'object_id':'crm.fundraising'}</field>
-	    </record>
+        <record id="crm_fundraising_stage_act" model="ir.actions.act_window">
+            <field name="name">Fundraising 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.fundraising')]</field>
+               <field name="context">{'object_id':'crm.fundraising'}</field>
+        </record>
 
-	    <menuitem action="crm_fundraising_stage_act"
-	    	id="menu_crm_fundraising_stage_act"
-	    	parent="crm.menu_crm_case_stage" />
+        <menuitem action="crm_fundraising_stage_act"
+            id="menu_crm_fundraising_stage_act"
+            parent="crm.menu_crm_case_stage" />
 
 <!-- Fund  Resource Type Form View -->
 
@@ -39,13 +39,13 @@
             <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.fundraising')]</field>
-   			<field name="context">{'object_id':'crm.fundraising'}</field>
+               <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
+               <field name="context">{'object_id':'crm.fundraising'}</field>
         </record>
 
         <menuitem action="crm_fundraising_resource_act"
-        	id="menu_crm_fundraising_resource_act"
-        	parent="crm.menu_crm_case_resource_type" />
+            id="menu_crm_fundraising_resource_act"
+            parent="crm.menu_crm_case_resource_type" />
 
 
 <!-- Fund Raising Tree View -->
@@ -56,31 +56,31 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Funds Tree"
-            	colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-            	<field name="id" />
-            	<field name="name" string="Fund Description" />
-            	<field name="categ_id" />
-            	<field name="type_id" string="Payment Mode" />
-            	<field name="planned_cost" string="Amount" />
-            	<field name="probability" />
-            	<field name="user_id" />
-            	<field name="state" />
-            	<button name="case_close" string="Done"
-            		states="open,draft,pending" type="object"
-            		icon="gtk-close" />
-            	<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_escalate" string="Escalate"
-            		states="open,draft,pending" type="object"
-            		icon="gtk-go-up" />
-            	<button name="case_reset" string="Reset to Draft"
-            		states="done,cancel" type="object" icon="gtk-convert" />
+                colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                <field name="id" />
+                <field name="name" string="Fund Description" />
+                <field name="categ_id" />
+                <field name="type_id" string="Payment Mode" />
+                <field name="planned_cost" string="Amount" />
+                <field name="probability" />
+                <field name="user_id" />
+                <field name="state" />
+                <button name="case_close" string="Done"
+                    states="open,draft,pending" type="object"
+                    icon="gtk-close" />
+                <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_escalate" string="Escalate"
+                    states="open,draft,pending" type="object"
+                    icon="gtk-go-up" />
+                <button name="case_reset" string="Reset to Draft"
+                    states="done,cancel" type="object" icon="gtk-convert" />
             </tree>
         </field>
     </record>
@@ -96,20 +96,20 @@
                 <group colspan="4" col="4">
                     <field name="name" select="1" string="Name"/>
                     <field name="type_id" string="Payment Mode" select="1" widget="selection"
-                    		domain="[('object_id.model', '=', 'crm.fundraising')]" />
+                            domain="[('object_id.model', '=', 'crm.fundraising')]" />
                 </group>
                 <notebook colspan="4">
                 <page string="Funds">
-                	<separator colspan="4" string="Communication"/>
-                	<group colspan="4" col="4">
-	                    <field name="partner_id" select="1"
-	                    	on_change="onchange_partner_id(partner_id, email_from)"
-	                    	colspan="2" />
-	                    <field name="partner_address_id"
-	                    	string="Contact"
-	                    	on_change="onchange_partner_address_id(partner_address_id, email_from)"
-	                    	colspan="1" />
-	                    <field name="email_from" colspan="2"/>
+                    <separator colspan="4" string="Communication"/>
+                    <group colspan="4" col="4">
+                        <field name="partner_id" select="1"
+                            on_change="onchange_partner_id(partner_id, email_from)"
+                            colspan="2" />
+                        <field name="partner_address_id"
+                            string="Contact"
+                            on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                            colspan="1" />
+                        <field name="email_from" colspan="2"/>
                     </group>
                     <separator colspan="4" string="Estimates"/>
                     <field name="planned_cost"/>
@@ -117,13 +117,13 @@
                     <field name="probability"/>
                     <separator colspan="4" string="Categorization"/>
                     <group colspan="4" col="6">
-                    	<field name="user_id" select="2" string="Responsible"/>
+                        <field name="user_id" select="2" string="Responsible"/>
                         <field name="section_id" colspan="1" widget="selection"/>
-                    	<field name="categ_id" select="1"
-                    		widget="selection"
-                    		domain="[('object_id.model', '=', 'crm.fundraising')]" />
-                    	<field name="date"/>
-	                    <field name="duration"/>
+                        <field name="categ_id" select="1"
+                            widget="selection"
+                            domain="[('object_id.model', '=', 'crm.fundraising')]" />
+                        <field name="date"/>
+                        <field name="duration"/>
                     </group>
                     <separator colspan="4" string="Details"/>
                         <field name="description" nolabel="1" colspan="4"/>
@@ -131,23 +131,23 @@
                     <group col="8" colspan="4">
                         <field name="state" select="2"/>
                         <button name="case_close" string="Done"
-                        	states="open,draft,pending" type="object"
-                        	icon="gtk-close" />
+                            states="open,draft,pending" type="object"
+                            icon="gtk-close" />
                         <button name="case_open" string="Open"
-                        	states="draft,pending" type="object"
-                        	icon="gtk-go-forward" />
+                            states="draft,pending" type="object"
+                            icon="gtk-go-forward" />
                         <button name="case_cancel" string="Cancel"
-                        	states="draft,open,pending" type="object"
-                        	icon="gtk-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" />
+                            states="draft,open" type="object"
+                            icon="gtk-media-pause" />
                         <button name="case_escalate" string="Escalate"
-                        	states="open,draft,pending" type="object"
-                        	icon="gtk-go-up" />
+                            states="open,draft,pending" type="object"
+                            icon="gtk-go-up" />
                         <button name="case_reset"
-                        	string="Reset to Draft" states="done,cancel"
-                        	type="object" icon="gtk-convert" />
+                            string="Reset to Draft" states="done,cancel"
+                            type="object" icon="gtk-convert" />
                     </group>
                 </page>
                 <page string="History" groups="base.group_extended">
@@ -191,10 +191,10 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'crm.fundraising'}"
-                                   	icon="gtk-undo" type="action" />
+                                       string="Reply to Last Email"
+                                       name="%(action_crm_send_mail)d"
+                                       context="{'mail':'reply', 'model': 'crm.fundraising'}"
+                                       icon="gtk-undo" type="action" />
                                </form>
                                <tree string="Communication history">
                                    <field name="description"/>
@@ -203,9 +203,9 @@
                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'crm.fundraising'}"
-                           	icon="gtk-go-forward" type="action" />
+                               name="%(action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'crm.fundraising'}"
+                               icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
             </form>
@@ -256,32 +256,33 @@
                            separator="1"
                            help="Funds Related to Current User"
                            />
+                       <separator orientation="vertical" />
                        <filter icon="gtk-new" string="Current Funds"
-                       	domain="[('state','in',('draft', 'open'))]"
-                       	help="Current Funds" />
+                           domain="[('state','in',('draft', 'open'))]"
+                           help="Current Funds" />
                        <filter icon="gtk-yes" string="Open Funds"
-                       	domain="[('state','=','open')]"
-                       	help="Open Funds" />
+                           domain="[('state','=','open')]"
+                           help="Open Funds" />
                        <filter icon="gtk-media-pause"
-                       	string="Pending Funds"
-                       	domain="[('state','=','pending')]"
-                       	help="Pending Funds" />
+                           string="Pending Funds"
+                           domain="[('state','=','pending')]"
+                           help="Pending Funds" />
                        <separator orientation="vertical" />
                        <field name="state" select="1" />
                        <field name="name" select='1'
-                       	string="Fund Description" />
+                           string="Fund Description" />
                        <field name="user_id" select="1"
-                       	widget="selection">
-                       	<filter icon="terp-partner"
-                       		domain="[('user_id','=', False)]"
-                       		help="Unassigned" />
+                           widget="selection">
+                           <filter icon="terp-partner"
+                               domain="[('user_id','=', False)]"
+                               help="Unassigned" />
                        </field>
                        <field name="section_id" select="1"
-                       	widget="selection" string="Section"
-                       	default="context.get('section_id', False)">
-                       	<filter icon="terp-crm"
-                       		domain="[('section_id','=',context.get('section_id',False))]"
-                       		help="My section" />
+                           widget="selection"
+                           default="context.get('section_id', False)">
+                           <filter icon="terp-crm"
+                               domain="[('section_id','=',context.get('section_id',False))]"
+                               help="My section" />
                        </field>
                    </group>
                </search>
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 542b37d69ab..6bb356bacfb 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -8,13 +8,13 @@
         <field name="name">Helpdesk 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="view_id" ref="crm.crm_case_categ_tree-view"/>
         <field name="domain">[('object_id.model', '=', 'crm.helpdesk')]</field>
-		<field name="context">{'object_id':'crm.helpdesk'}</field>
+        <field name="context">{'object_id':'crm.helpdesk'}</field>
     </record>
 
     <menuitem action="crm_helpdesk_categ_action"
-    	id="menu_crm_case_helpdesk-act" parent="crm.menu_crm_case_categ" />
+        id="menu_crm_case_helpdesk-act" parent="crm.menu_crm_case_categ" />
 
 <!--  Helpdesk Support Form View -->
 
@@ -31,20 +31,20 @@
                 </group>
                 <notebook colspan="4">
                     <page string="General">
-                    	<separator colspan="4" string="Communication"/>
+                        <separator colspan="4" string="Communication"/>
                         <group col="7" colspan="4">
                             <field name="partner_id"
-                            	on_change="onchange_partner_id(partner_id, email_from)"
-                            	select="1" />
+                                on_change="onchange_partner_id(partner_id, email_from)"
+                                select="1" />
                             <field name="partner_address_id"
-                            	on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                            	select="2" />
+                                on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                                select="2" />
 
                             <field name="email_from" select="2" />
                             <button name="remind_partner"
-                            	states="open,pending"
-                            	string="Send Reminder" type="object"
-                            	icon="gtk-go-forward" />
+                                states="open,pending"
+                                string="Send Reminder" type="object"
+                                icon="gtk-go-forward" />
 
                         </group>
                         <separator colspan="4" string="Categorization"/>
@@ -53,37 +53,37 @@
                             <field name="section_id" widget="selection"/>
                             <field name="user_id" select="1"/>
                             <button name="remind_user"
-                            	states="open,pending"
-                            	string="Send Reminder" type="object"
-                            	icon="gtk-go-forward" />
+                                states="open,pending"
+                                string="Send Reminder" type="object"
+                                icon="gtk-go-forward" />
                         </group>
 
                         <separator colspan="4" string="Details"/>
                         <field name="description" colspan="4"
-                            	nolabel="1" widget="text_tag" readonly="1" />
+                                nolabel="1" widget="text_tag" readonly="1" />
                         <separator colspan="4"/>
                         <group col="8" colspan="4">
                             <field name="state" select="1"/>
                             <button name="case_close"
-                            	states="open,draft,pending" string="Close"
-                            	type="object" icon="gtk-close" />
+                                states="open,draft,pending" string="Close"
+                                type="object" icon="gtk-close" />
                             <button name="case_open"
-                            	states="draft,pending" string="Open"
-                            	type="object" icon="gtk-go-forward" />
+                                states="draft,pending" string="Open"
+                                type="object" icon="gtk-go-forward" />
                             <button name="case_cancel"
-                            	states="draft,open,pending" string="Cancel"
-                            	type="object" icon="gtk-cancel" />
+                                states="draft,open,pending" string="Cancel"
+                                type="object" icon="gtk-cancel" />
                             <button name="case_pending"
-                            	states="draft,open" string="Pending"
-                            	type="object" icon="gtk-media-pause" />
+                                states="draft,open" string="Pending"
+                                type="object" icon="gtk-media-pause" />
                             <button name="case_escalate"
-                            	states="open,draft,pending"
-                            	string="Escalate" type="object"
-                            	icon="gtk-go-up" />
+                                states="open,draft,pending"
+                                string="Escalate" type="object"
+                                icon="gtk-go-up" />
                             <button name="case_reset"
-                            	states="done,cancel"
-                            	string="Reset to Draft" type="object"
-                            	icon="gtk-convert" />
+                                states="done,cancel"
+                                string="Reset to Draft" type="object"
+                                icon="gtk-convert" />
                         </group>
                     </page>
                     <page string="History" groups="base.group_extended">
@@ -126,10 +126,10 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'crm.helpdesk'}"
-                                   	icon="gtk-undo" type="action" />
+                                       string="Reply to Last Email"
+                                       name="%(action_crm_send_mail)d"
+                                       context="{'mail':'reply', 'model': 'crm.helpdesk'}"
+                                       icon="gtk-undo" type="action" />
                                </form>
                                <tree string="Communication history">
                                    <field name="description"/>
@@ -138,9 +138,9 @@
                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'crm.helpdesk'}"
-                           	icon="gtk-go-forward" type="action" />
+                               name="%(action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'crm.helpdesk'}"
+                               icon="gtk-go-forward" type="action" />
                     </page>
                 </notebook>
             </form>
@@ -162,25 +162,25 @@
                 <field name="date" string="Date"/>
                 <field name="date_deadline"/>
                 <field name="user_id"/>
-                <field name="section_id" string="Section" />
+                <field name="section_id"/>
                 <field name="state"/>
                 <button name="case_close" string="Done"
-                	states="open,draft,pending" type="object"
-                	icon="gtk-close" />
+                    states="open,draft,pending" type="object"
+                    icon="gtk-close" />
                 <button name="case_open" string="Open"
-                	states="draft,pending" type="object"
-                	icon="gtk-go-forward" />
+                    states="draft,pending" type="object"
+                    icon="gtk-go-forward" />
                 <button name="case_cancel" string="Cancel"
-                	states="draft,open,pending" type="object"
-                	icon="gtk-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" />
+                    states="draft,open" type="object"
+                    icon="gtk-media-pause" />
                 <button name="case_escalate" string="Escalate"
-                	states="open,draft,pending" type="object"
-                	icon="gtk-go-up" />
+                    states="open,draft,pending" type="object"
+                    icon="gtk-go-up" />
                 <button name="case_reset" string="Reset to Draft"
-                	states="done,cancel" type="object" icon="gtk-convert" />
+                    states="done,cancel" type="object" icon="gtk-convert" />
             </tree>
         </field>
     </record>
@@ -224,24 +224,24 @@
                 <field name="partner_id" />
                 <field name="user_id" select="1" widget="selection">
                     <filter icon="terp-partner"
-                    	domain="[('user_id','=',uid)]"
-                    	help="My Helpdesk Requests" default="1" />
+                        domain="[('user_id','=',uid)]"
+                        help="My Helpdesk Requests" default="1" />
                 </field>
                 <field name="section_id"
-                	default="context.get('section_id', False)" select="1"
-                	widget="selection" string="Section">
-                	<filter icon="terp-crm"
-                		domain="[('section_id','=',context.get('section_id',False))]"
-                		help="My section" />
+                    default="context.get('section_id', False)" select="1"
+                    widget="selection" string="Section">
+                    <filter icon="terp-crm"
+                        domain="[('section_id','=',context.get('section_id',False))]"
+                        help="My section" />
                 </field>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="12" col="20">
                     <filter string="Customer" icon="terp-crm"
-                    	domain="[]" context="{'group_by':'partner_id'}" />
+                        domain="[]" context="{'group_by':'partner_id'}" />
                     <filter string="State" icon="terp-crm" domain="[]"
-                    	context="{'group_by':'state'}" />
+                        context="{'group_by':'state'}" />
                     <filter string="Priority" icon="terp-crm"
-                    	domain="[]" context="{'group_by':'priority'}" />
+                        domain="[]" context="{'group_by':'priority'}" />
                 </group>
             </search>
         </field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 13a9abe2cfd..dd8373538ba 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -13,7 +13,7 @@
         <field name="context">{'object_id':'crm.lead'}</field>
     </record>
     <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act"
-    	parent="crm.menu_crm_case_stage" />
+        parent="crm.menu_crm_case_stage" />
 
     <!--  Resource Type Form View -->
 
@@ -22,12 +22,12 @@
             <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.lead')]</field>
-	        <field name="context">{'object_id':'crm.lead'}</field>
+            <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
+            <field name="context">{'object_id':'crm.lead'}</field>
         </record>
         <menuitem action="crm_lead_resource_act"
-        	id="menu_crm_lead_resource_act"
-        	parent="crm.menu_crm_case_resource_type" />
+            id="menu_crm_lead_resource_act"
+            parent="crm.menu_crm_case_resource_type" />
 
 <!-- CRM Lead Form View  -->
 
@@ -50,18 +50,18 @@
                             attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
                     <newline />
                     <field name="section_id" colspan="1"
-                    	widget="selection" />
+                        widget="selection" />
                     <field name="user_id" />
                     <field name="stage_id" widget="selection"
-                    	readonly="1"
-                    	domain="[('object_id.model', '=', 'crm.lead')]" />
+                        readonly="1"
+                        domain="[('object_id.model', '=', 'crm.lead')]" />
                     <group col="2" colspan="1">
-                    	<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" />
+                        <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" />
                     </group>
                 </group>
                 <notebook colspan="4">
@@ -104,65 +104,31 @@
                     <group col="8" colspan="4">
                         <field name="state" select="2"/>
                         <button name="case_close" string="Close"
-                        	states="open,draft,pending" type="object"
-                        	icon="gtk-close" />
+                            states="open,draft,pending" type="object"
+                            icon="gtk-close" />
                         <button name="case_open" string="Open"
-                        	states="draft,pending" type="object"
-                        	icon="gtk-go-forward" />
+                            states="draft,pending" type="object"
+                            icon="gtk-go-forward" />
                         <button name="case_cancel" string="Cancel"
-                        	states="draft,open,pending" type="object"
-                        	icon="gtk-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" />
+                            states="draft,open" type="object"
+                            icon="gtk-media-pause" />
                         <button name="case_escalate" string="Escalate"
-                        	states="open,draft,pending" type="object"
-                        	icon="gtk-go-up" />
+                            states="open,draft,pending" type="object"
+                            icon="gtk-go-up" />
                         <button name="case_reset"
-                        	string="Reset to Draft" states="done,cancel"
-                        	type="object" icon="gtk-convert" />
+                            string="Reset to Draft" states="done,cancel"
+                            type="object" icon="gtk-convert" />
                     </group>
                  </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="%(action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'crm.lead'}"
-                                   	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="%(action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'crm.lead'}"
-                           	icon="gtk-go-forward" type="action" />
-                 </page>
                  <page string="Extra Info" groups="base.group_extended">
                     <group colspan="2" col="2">
                         <separator string="Categories" colspan="2" col="2"/>
                         <field name="company_id"
-                        	groups="base.group_multi_company"
-                        	widget="selection" colspan="2" />
+                            groups="base.group_multi_company"
+                            widget="selection" colspan="2" />
                         <field name="categ_id"
                             widget="selection"
                             domain="[('object_id.model', '=', 'crm.opportunity')]" />
@@ -181,6 +147,41 @@
                         <field name="day_close"/>
                     </group>
                  </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="%(action_crm_send_mail)d"
+                                context="{'mail':'reply', 'model': 'crm.lead'}"
+                                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="%(action_crm_send_mail)d"
+                        context="{'mail':'new', 'model': 'crm.lead'}"
+                        icon="gtk-go-forward" type="action" />
+                 </page>
+
                 </notebook>
             </form>
         </field>
@@ -206,30 +207,30 @@
 
                 <field name="stage_id"/>
                 <button name="stage_previous" string="Previous"
-                	states="open,pending" type="object" icon="gtk-go-back" />
+                    states="open,pending" type="object" icon="gtk-go-back" />
                 <button name="stage_next" string="Next"
-                	states="open,pending" type="object"
-                	icon="gtk-go-forward" />
+                    states="open,pending" type="object"
+                    icon="gtk-go-forward" />
                 <field name="section_id"
-                	invisible="context.get('invisible_section', True)" />
+                    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" />
+                    states="draft,pending" type="object"
+                    icon="gtk-go-forward" />
                 <button name="case_close" string="Close"
-                	states="open,draft,pending" type="object"
-                	icon="gtk-close" />
+                    states="open,draft,pending" type="object"
+                    icon="gtk-close" />
                 <button string="Convert to Opportunity"
-                	name="%(action_crm_lead2opportunity)d"
-                	states="draft,open,pending" icon="gtk-index"
-                	type="action" />
+                    name="%(action_crm_lead2opportunity)d"
+                    states="draft,open,pending" icon="gtk-index"
+                    type="action" />
                 <button name="case_escalate" string="Escalate"
-                	states="open,draft,pending" type="object"
-                	icon="gtk-go-up" />
+                    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" />
+                    states="draft,open,pending" type="object"
+                    icon="gtk-cancel" />
             </tree>
         </field>
     </record>
@@ -243,11 +244,11 @@
         <field name="priority" eval="2"/>
         <field name="arch" type="xml">
             <calendar string="Meeting For Leads Generation"
-            	date_start="create_date" color="user_id"
-            	date_delay="duration">
-            	<field name="name" />
-            	<field name="partner_name" />
-            	<field name="partner_contact" />
+                date_start="create_date" color="user_id"
+                date_delay="duration">
+                <field name="name" />
+                <field name="partner_name" />
+                <field name="partner_contact" />
             </calendar>
         </field>
     </record>
@@ -273,9 +274,9 @@
 
                 <separator orientation="vertical"/>
                 <filter icon="gtk-home" string="Today"
-                	domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), \
-                			('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
-                	help="Todays' Opportunities" />
+                    domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), \
+                            ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
+                    help="Todays' Opportunities" />
                 <filter icon="gtk-media-rewind" string="7 Days"
                     help="Opportunities during last 7 days"
                     domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')),\
@@ -289,6 +290,9 @@
                         domain="[('user_id','=',uid)]"
                         help="My Leads" default="1"
                     />
+                    <filter icon="terp-partner"
+                        domain="[('user_id','=', False)]"
+                        help="Unassigned Leads" />
                 </field>
                 <field name="section_id" default="context.get('section_id', False)" widget="selection"
                     context="{'invisible_section': False}">
@@ -299,7 +303,7 @@
                     <filter icon="terp-crm"
                         context="{'invisible_section': False}"
                         domain="[]"
-                        help="Show Sections"/>
+                        help="Show Sales Team"/>
                 </field>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="14">
@@ -313,7 +317,7 @@
                     <filter string="Referrer" icon="terp-crm" domain="[]" context="{'group_by':'referred'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Creation" icon="terp-project"
-                    	domain="[]" context="{'group_by':'create_date'}" />
+                        domain="[]" context="{'group_by':'create_date'}" />
                 </group>
            </search>
         </field>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 4e37620839d..caf4e0bf101 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -14,8 +14,8 @@
     </record>
 
     <menuitem action="crm_opportunity_categ_action"
-    	id="menu_crm_case_opportunity-act"
-    	parent="crm.menu_crm_case_categ" />
+        id="menu_crm_case_opportunity-act"
+        parent="crm.menu_crm_case_categ" />
 
 <!-- Opportunity Stages Form View-->
 
@@ -29,8 +29,8 @@
         </record>
 
         <menuitem action="crm_opportunity_stage_act"
-        	id="menu_crm_opportunity_stage_act"
-        	parent="crm.menu_crm_case_stage" />
+            id="menu_crm_opportunity_stage_act"
+            parent="crm.menu_crm_case_stage" />
 
 <!-- Opportunity Resource Type Form View -->
 
@@ -44,8 +44,8 @@
         </record>
 
         <menuitem action="crm_opportunity_resource_act"
-        	id="menu_crm_opportunity_resource_act"
-        	parent="crm.menu_crm_case_resource_type" />
+            id="menu_crm_opportunity_resource_act"
+            parent="crm.menu_crm_case_resource_type" />
 
 
 <!-- Opportunities Form View -->
@@ -61,19 +61,19 @@
                     <label string="Stage:" align="1.0"/>
                     <group colspan="1" col="4">
                         <field name="stage_id" nolabel="1"
-                        	on_change="onchange_stage_id(stage_id)"
-                        	widget="selection"
-                        	domain="[('object_id.model', '=', 'crm.opportunity')]" />
+                            on_change="onchange_stage_id(stage_id)"
+                            widget="selection"
+                            domain="[('object_id.model', '=', 'crm.opportunity')]" />
                         <button name="stage_previous"
-                        	states="open,pending" type="object"
-                        	icon="gtk-go-back" string="" />
+                            states="open,pending" type="object"
+                            icon="gtk-go-back" string="" />
                         <button name="stage_next" states="open,pending"
-                        	type="object" icon="gtk-go-forward" string="" />
+                            type="object" icon="gtk-go-forward" string="" />
                     </group>
                     <field name="user_id"/>
 
                        <button name="action_makeMeeting" type="object"
-                		string="Schedule Meeting" icon="gtk-redo" />
+                        string="Schedule Meeting" icon="gtk-redo" />
 
                     <field name="planned_revenue"/>
                     <field name="probability"/>
@@ -84,14 +84,14 @@
                 <notebook colspan="4">
                 <page string="Opportunity">
                     <group col="3" colspan="2">
-                        <separator colspan="3" string="Contacts"/>
+                        <separator colspan="4" string="Contacts"/>
                         <field name="partner_id" select="1"
-                        	on_change="onchange_partner_id(partner_id, email_from)"
-                        	colspan="2" />
+                            on_change="onchange_partner_id(partner_id, email_from)"
+                            colspan="2" />
                         <field name="partner_address_id"
-                        	string="Contact"
-                        	on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                        	colspan="1" />
+                            string="Contact"
+                            on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                            colspan="1" />
                         <field name="email_from" string="Email" />
                         <field name="phone"/>
                     </group>
@@ -101,8 +101,8 @@
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="priority" string="Priority"/>
                         <field name="categ_id" select="1"
-                        	string="Category" widget="selection"
-                        	domain="[('object_id.model', '=', 'crm.opportunity')]" />
+                            string="Category" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.opportunity')]" />
                     </group>
 
                     <separator colspan="4" string="Details"/>
@@ -112,23 +112,23 @@
                     <group col="8" colspan="4">
                         <field name="state" select="2"/>
                         <button name="case_open" string="Open"
-                        	states="draft,pending" type="object"
-                        	icon="gtk-go-forward" />
+                            states="draft,pending" type="object"
+                            icon="gtk-go-forward" />
                         <button name="case_escalate" string="Escalate"
-                        	states="open,draft,pending" type="object"
-                        	icon="gtk-go-up" />
+                            states="open,draft,pending" type="object"
+                            icon="gtk-go-up" />
                         <button name="case_pending" string="Pending"
-                        	states="draft,open" type="object"
-                        	icon="gtk-media-pause" />
+                            states="draft,open" type="object"
+                            icon="gtk-media-pause" />
                         <button name="case_close" string="Mark Won"
-                        	states="open,draft,pending" type="object"
-                        	icon="gtk-close" />
+                            states="open,draft,pending" type="object"
+                            icon="gtk-close" />
                         <button name="case_cancel" string="Mark Lost"
-                        	states="draft,open,pending" type="object"
-                        	icon="gtk-cancel" />
+                            states="draft,open,pending" type="object"
+                            icon="gtk-cancel" />
                         <button name="case_reset" string="Reset to New"
-                        	states="done,cancel" type="object"
-                        	icon="gtk-convert" />
+                            states="done,cancel" type="object"
+                            icon="gtk-convert" />
                     </group>
                 </page>
 
@@ -175,10 +175,10 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'crm.opportunity'}"
-                                   	icon="gtk-undo" type="action" />
+                                       string="Reply to Last Email"
+                                       name="%(action_crm_send_mail)d"
+                                       context="{'mail':'reply', 'model': 'crm.opportunity'}"
+                                       icon="gtk-undo" type="action" />
                                </form>
                                <tree string="Communication history">
                                    <field name="description"/>
@@ -187,9 +187,9 @@
                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'crm.opportunity'}"
-                           	icon="gtk-go-forward" type="action" />
+                               name="%(action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'crm.opportunity'}"
+                               icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
             </form>
@@ -211,10 +211,10 @@
                 <field name="categ_id" invisible="1"/>
                 <field name="type_id" invisible="1"/>
                 <button name="stage_previous" string="Previous"
-                	states="open,pending" type="object" icon="gtk-go-back" />
+                    states="open,pending" type="object" icon="gtk-go-back" />
                 <button name="stage_next" string="Next"
-                	states="open,pending" type="object"
-                	icon="gtk-go-forward" />
+                    states="open,pending" type="object"
+                    icon="gtk-go-forward" />
                 <field name="planned_revenue" sum="Total of Planned Revenue"/>
                 <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
                 <field name="date_deadline" string="Excepted Closing"/>
@@ -222,17 +222,17 @@
                 <field name="user_id"/>
                 <field name="state"/>
                 <button name="case_open" string="Open"
-                	states="draft,pending" type="object"
-                	icon="gtk-go-forward" />
+                    states="draft,pending" type="object"
+                    icon="gtk-go-forward" />
                 <button name="case_close" string="Won"
-                	states="open,draft,pending" type="object"
-                	icon="gtk-close" />
+                    states="open,draft,pending" type="object"
+                    icon="gtk-close" />
                 <button name="case_pending" string="Pending"
-                	states="open,draft" type="object"
-                	icon="gtk-media-pause" />
+                    states="open,draft" type="object"
+                    icon="gtk-media-pause" />
                 <button name="case_cancel" string="Lost"
-                	states="draft,open,pending" type="object"
-                	icon="gtk-cancel" />
+                    states="draft,open,pending" type="object"
+                    icon="gtk-cancel" />
             </tree>
         </field>
     </record>
@@ -260,14 +260,24 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Opportunities">
+                <filter icon="terp-project"
+                    string="Current"
+                    default="1"
+                    domain="[('state','in',('draft','open'))]"/>
+                <filter icon="terp-project"
+                    string="Open"
+                    domain="[('state','=','open')]"/>
+                <filter icon="terp-project"
+                    string="Pending"
+                    domain="[('state','=','pending')]"/>
+                <separator orientation="vertical"/>
                 <filter icon="gtk-home" string="Today"
                     domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','&gt;=', time.strftime('%%Y-%%m-%%d 23:59:59'))]"
                     help="Todays' Opportunities" />
-
                 <filter icon="gtk-media-rewind" string="7 Days"
                     help="Opportunities during last 7 days"
                     domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d')),\
-                    	 ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                         ('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                 />
                 <separator orientation="vertical"/>
                 <field name="name" string="Opportunity"/>
@@ -277,44 +287,41 @@
                         domain="[('user_id','=',uid)]"
                         help="My Opportunities" default="1"
                     />
+                    <filter icon="terp-partner"
+                        domain="[('user_id','=', False)]"
+                        help="Unassigned Opportunities" />
                 </field>
                 <field name="section_id"
-                	default="context.get('section_id', False)" select="1"
-                	widget="selection">
-                	<filter icon="terp-crm"
-                		domain="[('section_id','=',context.get('section_id',False))]"
-                		help="My section" />
-                </field>
-                <field name="state">
-                    <filter icon="gtk-media-rewind"
-                        help="New and open opportunities"
-                        default="1"
-                        domain="[('state','in',('draft','open'))]" />
+                    default="context.get('section_id', False)" select="1"
+                    widget="selection">
+                    <filter icon="terp-crm"
+                        domain="[('section_id','=',context.get('section_id',False))]"
+                        help="My section" />
                 </field>
                 <newline/>
-                <group expand="1" string="Group By..." colspan="4">
+                <group expand="1" string="Group By..." colspan="16">
                     <filter string="Stage" icon="terp-crm" domain="[]"
-                    	context="{'group_by':'stage_id'}" />
+                        context="{'group_by':'stage_id'}" />
 
                     <filter string="Category" icon="terp-crm"
-                    	domain="[]" context="{'group_by':'categ_id'}" />
+                        domain="[]" context="{'group_by':'categ_id'}" />
 
                     <filter string="Campaign" icon="terp-crm"
-                    	domain="[]" context="{'group_by':'type_id'}" />
+                        domain="[]" context="{'group_by':'type_id'}" />
 
                     <separator orientation="vertical" />
                     <filter string="Partner" icon="terp-crm" domain="[]"
-                    	context="{'group_by':'partner_id'}" />
+                        context="{'group_by':'partner_id'}" />
 
                     <filter string="Salesman" icon="terp-crm"
-                    	domain="[]" context="{'group_by':'user_id'}" />
+                        domain="[]" context="{'group_by':'user_id'}" />
 
                     <separator orientation="vertical" />
                     <filter string="Creation" icon="terp-project"
-                    	domain="[]" context="{'group_by':'create_date'}" />
+                        domain="[]" context="{'group_by':'create_date'}" />
 
                     <filter string="Exp.Closing" icon="terp-project"
-                    	domain="[]" context="{'group_by':'date_deadline'}" />
+                        domain="[]" context="{'group_by':'date_deadline'}" />
                 </group>
            </search>
         </field>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 42692eee9ce..ec773cf78ef 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -14,7 +14,7 @@
     </record>
 
     <menuitem action="crm_phonecall_categ_action"
-    	id="menu_crm_case_phonecall-act" parent="crm.menu_crm_case_categ" />
+        id="menu_crm_case_phonecall-act" parent="crm.menu_crm_case_categ" />
 
 <!-- ResourceType Form View -->
 
@@ -23,13 +23,13 @@
             <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.phonecall')]</field>
-	        <field name="context">{'object_id':'crm.phonecall'}</field>
+            <field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>
+            <field name="context">{'object_id':'crm.phonecall'}</field>
         </record>
 
     <menuitem action="crm_phonecall_resource_act"
-    	id="menu_crm_phonecall_resource_act"
-    	parent="crm.menu_crm_case_resource_type" />
+        id="menu_crm_phonecall_resource_act"
+        parent="crm.menu_crm_case_resource_type" />
 
 
 <!--  PhoneCalls Tree View -->
@@ -87,9 +87,9 @@
                         name="%(phonecall2opportunity_act)d"
                         icon="gtk-index" type="action"
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-					<label colspan="6"  string=""/>
-	                <button string="Schedule Other Call"
-	                 icon="gtk-redo"
+                    <label colspan="6"  string=""/>
+                    <button string="Schedule Other Call"
+                     icon="gtk-redo"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
 
@@ -97,7 +97,7 @@
                 <group col="3" colspan="2">
                     <separator colspan="3" string="Contacts" />
                     <field name="partner_id"
-                    	on_change="onchange_partner_id(partner_id, email_from)" />
+                        on_change="onchange_partner_id(partner_id, email_from)" />
                     <button string="Create a Partner"
                         icon="terp-crm"
                         name="%(action_crm_phonecall2partner)d"
@@ -105,7 +105,7 @@
                         attrs="{'invisible':[('partner_id','!=',False)]}" />
                     <newline/>
                     <field name="partner_address_id" string="Contact"
-                    	on_change="onchange_partner_address_id(partner_address_id, email_from)" />
+                        on_change="onchange_partner_address_id(partner_address_id, email_from)" />
                     <newline/>
                     <field name="partner_mobile" />
                 </group>
@@ -120,19 +120,19 @@
                 <group col="8" colspan="4">
                     <field name="state" select="1" />
                     <button name="case_cancel" string="Cancel"
-                    	states="draft,open,pending" type="object"
-                    	icon="gtk-cancel" />
+                        states="draft,open,pending" type="object"
+                        icon="gtk-cancel" />
                     <button name="case_open" string="Open"
-                    	states="draft,pending" type="object"
-                    	icon="gtk-go-forward" />
+                        states="draft,pending" type="object"
+                        icon="gtk-go-forward" />
                     <button name="case_pending" string="Not Held"
-                    	states="open" type="object" icon="gtk-undo" />
+                        states="open" type="object" icon="gtk-undo" />
                     <button name="case_close" string="Held"
-                    	states="open,draft,pending" type="object"
-                    	icon="gtk-jump-to" />
+                        states="open,draft,pending" type="object"
+                        icon="gtk-jump-to" />
                     <button name="case_reset" string="Reset to Draft"
-                    	states="done,cancel" type="object"
-                    	icon="gtk-convert" />
+                        states="done,cancel" type="object"
+                        icon="gtk-convert" />
                 </group>
             </form>
         </field>
@@ -177,35 +177,30 @@
                <field name="partner_id"/>
                <field name="user_id" widget="selection">
                    <filter icon="terp-partner"
-                   	domain="[('user_id','=',uid)]" help="My Phonecalls"
-                   	default="1" />
+                       domain="[('user_id','=',uid)]" help="My Phonecalls"
+                       default="1" />
                    <filter icon="terp-partner"
-                   	domain="[('user_id','=',False)]"
-                   	help="Unassigned Phonecalls" />
-               </field>
-               <field name="state">
-                   <filter icon="gtk-index"
-                   	domain="[('state','in',('open','draft' ))]"
-                   	help="Current" default="1" />
+                       domain="[('user_id','=',False)]"
+                       help="Unassigned Phonecalls" />
                </field>
                <field name="section_id"
-               	default="context.get('section_id', False)" select="1"
-               	widget="selection" string="Section">
-               	<filter icon="terp-crm"
-               		domain="[('section_id','=',context.get('section_id',False))]"
-               		help="My section" />
+                   default="context.get('section_id', False)" select="1"
+                   widget="selection" string="Section">
+                   <filter icon="terp-crm"
+                       domain="[('section_id','=',context.get('section_id',False))]"
+                       help="My section" />
                </field>
                <newline/>
                <group expand="1" string="Group By..." colspan="4">
                    <filter string="Partner" icon="terp-crm" domain="[]"
-                   	context="{'group_by':'partner_id'}" />
+                       context="{'group_by':'partner_id'}" />
                    <filter string="Responsible" icon="terp-crm"
-                   	domain="[]" context="{'group_by':'user_id'}" />
+                       domain="[]" context="{'group_by':'user_id'}" />
                    <separator orientation="vertical" />
                    <filter string="Creation" icon="terp-project"
-                   	domain="[]" context="{'group_by':'create_date'}" />
+                       domain="[]" context="{'group_by':'create_date'}" />
                    <filter string="Date" icon="terp-project" domain="[]"
-                   	context="{'group_by':'date'}" />
+                       context="{'group_by':'date'}" />
                </group>
            </search>
         </field>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index a87a67e3e1c..f0a44c56c8c 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -141,8 +141,8 @@
         <menuitem id="menu_crm_case_categ"   name="Categories"  parent="crm.menu_crm_configuration"/>
 
         <menuitem action="crm_case_section_act"
-        	id="menu_crm_case_section_act"
-        	parent="crm.menu_crm_configuration" />
+            id="menu_crm_case_section_act"
+            parent="crm.menu_crm_configuration" />
 
 
 <!-- Resource Type of case Tree View -->
@@ -184,7 +184,7 @@
             <field name="view_id" ref="crm_case_resource_type_tree"/>
         </record>
         <menuitem id="menu_crm_case_resource_type" name="Resource Type"
-        	parent="crm.menu_crm_configuration" />
+            parent="crm.menu_crm_configuration" />
 
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
             <field name="name">Cases by section</field>
@@ -241,11 +241,11 @@
             <field name="type">calendar</field>
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="create_date"
-                	date_stop="date_deadline" day_length="12"
-                	string="Cases">
-                	<field name="name" />
-                	<field name="partner_id" />
-                	<field name="state" />
+                    date_stop="date_deadline" day_length="12"
+                    string="Cases">
+                    <field name="name" />
+                    <field name="partner_id" />
+                    <field name="state" />
                 </calendar>
             </field>
         </record>
@@ -267,22 +267,22 @@
                     <field name="user_id"/>
                     <field name="state"/>
                     <button name="case_close"
-                    	states="open,draft,pending" string="Close"
-                    	type="object" icon="gtk-close" />
+                        states="open,draft,pending" string="Close"
+                        type="object" icon="gtk-close" />
                     <button name="case_open" states="draft,pending"
-                    	string="Open" type="object" icon="gtk-go-forward" />
+                        string="Open" type="object" icon="gtk-go-forward" />
                     <button name="case_cancel"
-                    	states="draft,open,pending" string="Cancel"
-                    	type="object" icon="gtk-cancel" />
+                        states="draft,open,pending" string="Cancel"
+                        type="object" icon="gtk-cancel" />
                     <button name="case_pending" states="draft,open"
-                    	string="Pending" type="object"
-                    	icon="gtk-media-pause" />
+                        string="Pending" type="object"
+                        icon="gtk-media-pause" />
                     <button name="case_escalate"
-                    	states="open,draft,pending" string="Escalate"
-                    	type="object" icon="gtk-go-up" />
+                        states="open,draft,pending" string="Escalate"
+                        type="object" icon="gtk-go-up" />
                     <button name="case_reset" states="done,cancel"
-                    	string="Reset to Draft" type="object"
-                    	icon="gtk-convert" />
+                        string="Reset to Draft" type="object"
+                        icon="gtk-convert" />
                 </tree>
             </field>
         </record>
@@ -305,24 +305,24 @@
                         <page string="General">
                             <group col="8" colspan="4">
                                 <field colspan="4" name="partner_id"
-                                	on_change="onchange_partner_id(partner_id, email_from)"
-                                	select="1" />
+                                    on_change="onchange_partner_id(partner_id, email_from)"
+                                    select="1" />
                                 <field colspan="3"
-                                	name="partner_address_id"
-                                	on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                                	select="2" />
+                                    name="partner_address_id"
+                                    on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                                    select="2" />
                                 <newline />
                                 <field colspan="3" name="email_from"
-                                	select="2" />
+                                    select="2" />
                                 <button name="remind_partner"
-                                	states="open,pending"
-                                	string="Send Reminder" type="object"
-                                	icon="gtk-go-forward" />
+                                    states="open,pending"
+                                    string="Send Reminder" type="object"
+                                    icon="gtk-go-forward" />
                                 <field name="user_id" select="1" />
                                 <button name="remind_user"
-                                	states="open,pending"
-                                	string="Send Reminder" type="object"
-                                	icon="gtk-go-forward" />
+                                    states="open,pending"
+                                    string="Send Reminder" type="object"
+                                    icon="gtk-go-forward" />
                             </group>
                             <separator colspan="4" string="Description"/>
                             <field name="description" colspan="4" nolabel="1"/>
@@ -330,27 +330,27 @@
                             <group col="8" colspan="4">
                                 <field name="state" select="1"/>
                                 <button name="case_close"
-                                	states="open,draft,pending"
-                                	string="Close" type="object"
-                                	icon="gtk-close" />
+                                    states="open,draft,pending"
+                                    string="Close" type="object"
+                                    icon="gtk-close" />
                                 <button name="case_open"
-                                	states="draft,pending" string="Open"
-                                	type="object" icon="gtk-go-forward" />
+                                    states="draft,pending" string="Open"
+                                    type="object" icon="gtk-go-forward" />
                                 <button name="case_cancel"
-                                	states="draft,open,pending"
-                                	string="Cancel" type="object"
-                                	icon="gtk-cancel" />
+                                    states="draft,open,pending"
+                                    string="Cancel" type="object"
+                                    icon="gtk-cancel" />
                                 <button name="case_pending"
-                                	states="draft,open" string="Pending"
-                                	type="object" icon="gtk-media-pause" />
+                                    states="draft,open" string="Pending"
+                                    type="object" icon="gtk-media-pause" />
                                 <button name="case_escalate"
-                                	states="open,draft,pending"
-                                	string="Escalate" type="object"
-                                	icon="gtk-go-up" />
+                                    states="open,draft,pending"
+                                    string="Escalate" type="object"
+                                    icon="gtk-go-up" />
                                 <button name="case_reset"
-                                	states="done,cancel"
-                                	string="Reset to Draft" type="object"
-                                	icon="gtk-convert" />
+                                    states="done,cancel"
+                                    string="Reset to Draft" type="object"
+                                    icon="gtk-convert" />
                             </group>
                         </page>
                         <page string="History" groups="base.group_extended">
@@ -385,10 +385,10 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                   	string="Reply to Last Email"
-                                   	name="%(action_crm_send_mail)d"
-                                   	context="{'mail':'reply', 'model': 'crm.case'}"
-                                   	icon="gtk-undo" type="action" />
+                                       string="Reply to Last Email"
+                                       name="%(action_crm_send_mail)d"
+                                       context="{'mail':'reply', 'model': 'crm.case'}"
+                                       icon="gtk-undo" type="action" />
                                </form>
                                <tree string="Communication history">
                                    <field name="description"/>
@@ -397,9 +397,9 @@
                                </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'crm.case'}"
-                           	icon="gtk-go-forward" type="action" />
+                               name="%(action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'crm.case'}"
+                               icon="gtk-go-forward" type="action" />
                         </page>
                     </notebook>
                 </form>
@@ -414,28 +414,28 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Case">
-                	<group col='6' colspan='4'>
-                		<filter icon="terp-partner" string="My Cases"
-                			domain="[('user_id','=',uid)]" separator="1"
-                			default="1" help="Cases Related to Current User" />
-                		<field name="state" select="1">
-                			<filter icon="gtk-new"
-                				domain="[('state','in',('draft', 'open'))]"
-                				help="Current Cases" />
-                			<filter icon="gtk-yes"
-                				domain="[('state','=','open')]" help="Open Cases" />
-                			<filter icon="gtk-media-pause"
-                				domain="[('state','=','pending')]"
-                				help="Pending Cases" />
-                		</field>
-                		<separator orientation="vertical" />
-                		<field name="name" select='1' />
-                		<field name="user_id" select="1"
-                			widget="selection" />
-                	</group>
-                	<field name="section_id"
-                		default="context.get('section_id', False)" select="1"
-                		widget="selection" string="Section" />
+                    <group col='6' colspan='4'>
+                        <filter icon="terp-partner" string="My Cases"
+                            domain="[('user_id','=',uid)]" separator="1"
+                            default="1" help="Cases Related to Current User" />
+                        <field name="state" select="1">
+                            <filter icon="gtk-new"
+                                domain="[('state','in',('draft', 'open'))]"
+                                help="Current Cases" />
+                            <filter icon="gtk-yes"
+                                domain="[('state','=','open')]" help="Open Cases" />
+                            <filter icon="gtk-media-pause"
+                                domain="[('state','=','pending')]"
+                                help="Pending Cases" />
+                        </field>
+                        <separator orientation="vertical" />
+                        <field name="name" select='1' />
+                        <field name="user_id" select="1"
+                            widget="selection" />
+                    </group>
+                    <field name="section_id"
+                        default="context.get('section_id', False)" select="1"
+                        widget="selection"/>
                 </search>
             </field>
         </record>
@@ -453,7 +453,7 @@
             <field name="res_model">crm.case</field>
             <field name="view_type">form</field>
             <field name="domain">
-            	[('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]
+                [('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]
             </field>
             <field name="search_view_id" ref="view_crm_case_filter"/>
         </record>
@@ -503,15 +503,15 @@
         <field name="arch" type="xml">
                 <search string="Search Histories">
                        <filter icon="terp-crm" string="My Histories"
-                       	domain="[('user_id','=',uid)]"
-                       	help="My Histories" />
+                           domain="[('user_id','=',uid)]"
+                           help="My Histories" />
                        <separator orientation="vertical"/>
                      <group col="6" colspan="2">
                        <field name="date" select="1"/>
                     <field name="user_id" select="1" widget="selection"/>
                     <field name="section_id"
-                    	default="context.get('section_id', False)"
-                    	select="1" widget="selection" string="Section" />
+                        default="context.get('section_id', False)"
+                        select="1" widget="selection"/>
                      </group>
                 </search>
             </field>
@@ -573,11 +573,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Partner Segmentation">
-                	<group col="6" colspan="4">
-	                    <field name="name" select="1"/>
-	                    <field name="categ_id" select="2"/>
-	                    <field name="exclusif"/>
-	                </group>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="categ_id" select="2"/>
+                        <field name="exclusif"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Sales Purchase">
                             <field name="sales_purchase_active"/>
@@ -590,21 +590,21 @@
                             <field colspan="4" name="segmentation_line" widget="one2many_list" nolabel="1"/>
                         </page>
                         <page string="Description">
-       	                    <field colspan="4" name="description" select="2" nolabel="1"/>
-       	                </page>
+                               <field colspan="4" name="description" select="2" nolabel="1"/>
+                           </page>
                     </notebook>
                     <field name="state"/>
                     <group col="3" colspan="2">
                         <button name="process_start"
-                        	states="not running"
-                        	string="Compute Segmentation" type="object"
-                        	icon="gtk-execute" />
+                            states="not running"
+                            string="Compute Segmentation" type="object"
+                            icon="gtk-execute" />
                         <button name="process_stop" states="running"
-                        	string="Stop Process" type="object"
-                        	icon="gtk-cancel" />
+                            string="Stop Process" type="object"
+                            icon="gtk-cancel" />
                         <button name="process_continue" states="running"
-                        	string="Continue Process" type="object"
-                        	icon="gtk-go-forward" />
+                            string="Continue Process" type="object"
+                            icon="gtk-go-forward" />
                     </group>
                 </form>
             </field>
@@ -639,8 +639,8 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="crm_segmentation_tree-act"
-        	id="menu_crm_segmentation-act"
-        	parent="crm.menu_crm_configuration" />
+            id="menu_crm_segmentation-act"
+            parent="crm.menu_crm_configuration" />
 
         <record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
             <field name="name">view.users.form.crm.modif.inherited1</field>
@@ -650,8 +650,8 @@
             <field name="arch" type="xml">
                 <page string="Current Activity" position="inside">
                     <field name="context_section_id" completion="1"
-                    	widget="selection"
-                    	context="{'user_prefence':True}" />
+                        widget="selection"
+                        context="{'user_prefence':True}" />
                 </page>
             </field>
         </record>
@@ -671,7 +671,7 @@
 
 <!-- Inherit View From Partner  -->
 
-		<record id="view_partners_form_crm1" model="ir.ui.view">
+        <record id="view_partners_form_crm1" model="ir.ui.view">
                 <field name="name">view.res.partner.form.crm.inherited1</field>
                 <field name="model">res.partner</field>
                 <field name="type">form</field>
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index e4729b78cad..53d4f1b5476 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -1,53 +1,53 @@
 <openerp>
-  	<data>
+      <data>
 
-		<!-- Lead to partner confirmation form -->
+        <!-- Lead to partner confirmation form -->
 
-  		<record id="view_crm_lead2partner_create" model="ir.ui.view">
-	      <field name="name">crm.lead2partner.view.create</field>
-	      <field name="model">crm.lead2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner?">
-	      		<label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
-        		<label string="You may have to verify that this partner does not exist already." colspan="4"/>
-        		<separator string="" colspan="4" />
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-	      			<button name="open_create_partner" string="Create _Partner" type="object" icon="gtk-ok"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
+          <record id="view_crm_lead2partner_create" model="ir.ui.view">
+          <field name="name">crm.lead2partner.view.create</field>
+          <field name="model">crm.lead2partner</field>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+              <form string="Create a Partner?">
+                  <label string="Are you sure you want to create a partner based on this lead ?" colspan="4"/>
+                <label string="You may have to verify that this partner does not exist already." colspan="4"/>
+                <separator string="" colspan="4" />
+                  <group col="4" colspan="4">
+                      <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                      <button name="open_create_partner" string="Create _Partner" type="object" icon="gtk-ok"/>
+                  </group>
+              </form>
+          </field>
+       </record>
 
-	   <!-- Lead to Partner form view -->
+       <!-- Lead to Partner form view -->
 
-	   <record id="view_crm_lead2partner" model="ir.ui.view">
-	      <field name="name">crm.lead2partner.view</field>
-	      <field name="model">crm.lead2partner</field>
-	      <field name="type">form</field>
-	      <field name="arch" type="xml">
-	      	<form string="Create a Partner">
-	      		<field name="action"/>
-	      		<group attrs="{'invisible':[('action','!=','exist')]}">
-		            <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
-		        </group>
-		        <separator string="" colspan="4" />
-	      		<group col="4" colspan="4">
-	      			<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-	      			<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
-	      		</group>
-	      	</form>
-	      </field>
-	   </record>
+       <record id="view_crm_lead2partner" model="ir.ui.view">
+          <field name="name">crm.lead2partner.view</field>
+          <field name="model">crm.lead2partner</field>
+          <field name="type">form</field>
+          <field name="arch" type="xml">
+              <form string="Create a Partner">
+                  <field name="action"/>
+                  <group attrs="{'invisible':[('action','!=','exist')]}">
+                    <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
+                </group>
+                <separator string="" colspan="4" />
+                  <group col="4" colspan="4">
+                      <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                      <button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
+                  </group>
+              </form>
+          </field>
+       </record>
 
-	   <!-- Lead to Partner wizard -->
+       <!-- Lead to Partner wizard -->
 
-	   <act_window id="action_crm_lead2partner"
-    		key2="client_action_multi" name="Create a Partner"
-    		res_model="crm.lead2partner" src_model="crm.lead"
-    		view_id="view_crm_lead2partner_create"
-    		view_mode="form" target="new" view_type="form" />
+       <act_window id="action_crm_lead2partner"
+            key2="client_action_multi" name="Create a Partner"
+            res_model="crm.lead2partner" src_model="crm.lead"
+            view_id="view_crm_lead2partner_create"
+            view_mode="form" target="new" view_type="form" />
 
- 	</data>
+     </data>
 </openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 3df61afbcab..057d049af9c 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -88,7 +88,6 @@
             <field name="arch" type="xml">
                 <tree string="Employees">
                     <field name="name"/>
-                    <field name="ssnid"/>
                     <field name="work_phone"/>
                     <field name="work_email"/>
                     <field name="department_id"/>
@@ -106,7 +105,6 @@
                     <filter icon="terp-partner" domain="[('parent_id','child_of',uid),('id', '!=', uid)]" string ="My Employees"/>
                     <separator orientation="vertical" />
                     <field name="name"/>
-                    <field name="ssnid"/>
                     <field name="department_id" widget="selection"/>
                     <field name="job_id" widget="selection"/>
                     <field name="parent_id" widget="selection" />
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index aef696dc676..49a7d83d239 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -156,32 +156,16 @@
                         <filter icon="terp-hr"
                             domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
-                        <separator orientation="vertical" />
-                        <filter
-                            icon="terp-hr"
-                            domain="[('state','=','draft')]"
-                            string="Draft"
-                            help="Draft Expense"/>
-                        <filter
-                            icon="terp-hr"
-                            domain="[('state','=','confirm')]"
-                            string="To Validate"
-                            help="Confirmed Expense"/>
-                        <filter
-                            icon="terp-hr"
-                            domain="[('state','=','accepted')]"
-                            string="To Pay"
-                            help="Expenses to Invoice"/>
-                        <separator orientation="vertical"/>
-                        <field name="user_id" select="1" widget="selection" />
-                        <field name="name" select='1'/>
-                        <field name="department_id" widget="selection" />
-                        <field name="state" select="1"/>
-                    </group>
-                    <newline />
-                    <group expand="1" string="Group By..." colspan="11" col="11">
-                        <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
-                    </group>
+                      </field>
+                      <field name="department_id" widget="selection" />
+                </group>
+                <newline />
+                <group expand="1" string="Group By..." colspan="11" col="11">
+                    <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/>
+                    <filter string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Date" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/>
+                </group>
                 </search>
             </field>
         </record>
diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py
index 472061e2789..bdd902923eb 100644
--- a/addons/hr_holidays/__terp__.py
+++ b/addons/hr_holidays/__terp__.py
@@ -47,7 +47,7 @@
 """,
     'author': 'Tiny & Axelor',
     'website': 'http://www.openerp.com',
-    'depends': ['hr', 'crm', 'process'],
+    'depends': ['hr', 'crm', 'process', 'resource'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index efd0e8438a0..6c11cbdf7a6 100755
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -224,6 +224,16 @@ class hr_holidays(osv.osv):
         else:
             raise osv.except_osv(_('Warning !'),_('Either there is no Employee defined, or no User attached with it.'))
         self.write(cr, uid, ids, vals)
+
+        vals= {
+               'name':record.name,
+               'date_from':record.date_from,
+               'date_to':record.date_to,
+               'calendar_id':record.employee_id.calendar_id.id,
+               'company_id':record.employee_id.company_id.id,
+               'resource_id':record.employee_id.resource_id.id
+             }
+        self.pool.get('resource.calendar.leaves').create(cr,uid,vals)
         return True
 
     def holidays_confirm(self, cr, uid, ids, *args):
@@ -246,17 +256,7 @@ class hr_holidays(osv.osv):
                 'number_of_days': nb,
                 'user_id': user_id
             })
-            #vals= {
-            #       'name':record.name,
-            #       'date_from':record.date_from,
-            #       'date_to':record.date_to,
-            #       'calendar_id':record.employee_id.calendar_id.id,
-            #       'company_id':record.employee_id.company_id.id,
-            #       'resource_id':record.employee_id.resource_id.id
-            #     }
-            #self.pool.get('resource.calendar.leaves').create(cr,uid,vals)
-
-        return True
+       return True
 
     def holidays_refuse(self, cr, uid, ids, *args):
         vals = {
diff --git a/addons/hr_holidays/wizard/holidays_summary_employees.py b/addons/hr_holidays/wizard/holidays_summary_employees.py
index f5a84a5b649..bdc5664abfb 100644
--- a/addons/hr_holidays/wizard/holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/holidays_summary_employees.py
@@ -67,11 +67,7 @@ class wizard_report(wizard.interface):
     states={
         'init':{
             'actions':[_check],
-<<<<<<< TREE
-            'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel', 'gtk-cancel'), ('checkemp', 'Print', 'gtk-ok')]}
-=======
             'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel','gtk-cancel'), ('checkemp', 'Print', 'gtk-print')]}
->>>>>>> MERGE-SOURCE
         },
         'checkemp': {
             'actions': [],
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 9144d3b0ca3..d8f318d148b 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -7,7 +7,7 @@
             <field name="model">hr.analytic.timesheet</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree editable="bottom" string="Timesheet Line">
+                <tree editable="bottom" string="Timesheet Lines">
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
                     <field name="date" on_change="on_change_date(date)"/>
                     <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id"/>
@@ -50,12 +50,12 @@
             <field name="arch" type="xml">
                 <search string="Timesheet">
                     <group col='8' colspan='4'>
-	                    <filter icon="terp-hr" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
-	                    <filter icon="terp-hr" domain="[('user_id','=',uid)]" string="My Work" help="My Work"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="user_id" select="1" widget="selection"/>
-	                    <field name="account_id" select="1" widget="selection"/>
-	                    <field name="date" select="1"/>
+                        <filter icon="terp-hr" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
+                        <filter icon="terp-hr" domain="[('user_id','=',uid)]" string="My Work" help="My Work"/>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="account_id" select="1" widget="selection"/>
+                        <field name="date" select="1"/>
                     </group>
                 </search>
             </field>
@@ -83,11 +83,6 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
         </record>
-      <!--  <menuitem
-            action="act_hr_timesheet_line_evry1_all_form"
-            id="menu_act_hr_timesheet_line_evry1_all_form"
-            parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"
-            groups="hr.group_hr_manager"/>-->
 
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 79086640262..c895250284e 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -68,16 +68,16 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by user">
-                	<group col="10" colspan="4">
-                		<filter icon="terp-hr" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheets"/>
-						<separator orientation="vertical"/>
-	                	<filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
-		            	<filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
-						<separator orientation="vertical"/>
-	                    <field name="name" select="1"/>
-	                    <field name="month" select="1"/>
-	                    <field name="user_id" select="1"/>
-                	</group>
+                    <group col="10" colspan="4">
+                        <filter icon="terp-hr" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheets"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
+                        <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="month" select="1"/>
+                        <field name="user_id" select="1"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -124,8 +124,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Timesheet by invoice">
-                	<filter icon="terp-hr" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheets to invoice"/>
-					<separator orientation="vertical"/>
+                    <filter icon="terp-hr" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheets to invoice"/>
+                    <separator orientation="vertical"/>
                     <field name="account_id" select="1"/>
                     <field name="manager_id" select="1"/>
                     <field name="user_id" select="1"/>
@@ -207,17 +207,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Daily timesheet by account">
-                	<group col="10" colspan="4">
-                		<filter icon="terp-hr" string="My Daily Timesheets" domain="[('user_id','=',uid)]" help="My Daily Timesheets by account"/>
-						<separator orientation="vertical"/>
-	                	<filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
-		            	<filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="name" select="1"/>
-	                    <field name="month" select="1"/>
-	                    <field name="account_id" select="1"/>
-	                    <field name="user_id" select="1"/>
-					</group>
+                    <group col="10" colspan="4">
+                        <filter icon="terp-hr" string="My Daily Timesheets" domain="[('user_id','=',uid)]" help="My Daily Timesheets by account"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Daily Timesheets for this year"/>
+                        <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Daily Timesheets of this month"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="month" select="1"/>
+                        <field name="account_id" select="1"/>
+                        <field name="user_id" select="1"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -281,17 +281,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <form string="Timesheet by account">
-                	<group col="10" colspan="4">
-                		<filter icon="terp-hr" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheets by account"/>
-						<separator orientation="vertical"/>
-	                	<filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
-		            	<filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="name" select="1"/>
-	                    <field name="month" select="1"/>
-	                    <field name="account_id" select="1"/>
-	                    <field name="user_id" select="1"/>
-					</group>
+                    <group col="10" colspan="4">
+                        <filter icon="terp-hr" string="My Timesheets" domain="[('user_id','=',uid)]" help="My Timesheets by account"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-hr" string="This Year" domain="[('name','=',time.strftime('%%Y'))]"/>
+                        <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="month" select="1"/>
+                        <field name="account_id" select="1"/>
+                        <field name="user_id" select="1"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -323,15 +323,15 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Random Timesheets">
-                	<field name="analytic_account_id" select="1"/>
-                	<field name="name" select="1"/>
-                	<field name="quantity" select="2" />
-                	<field name="date" select="1"/>
+                    <field name="analytic_account_id" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="quantity" select="2" />
+                    <field name="date" select="1"/>
                 </tree>
             </field>
-    	</record>
+        </record>
 
-		<record model="ir.actions.act_window" id="action_random_timesheet_board">
+        <record model="ir.actions.act_window" id="action_random_timesheet_board">
             <field name="name">Random Timesheet</field>
             <field name="res_model">report.random.timesheet</field>
             <field name="view_type">form</field>
@@ -347,21 +347,21 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Random Timesheets Lines">
-                	<field name="date" select="1"/>
-                	<field name="user_id" />
-                	<field name="name" select="1"/>
-                	<field name="quantity" />
-                	<field name="product_id" select="1"/>
-                	<field name="analytic_account_id" select="1"/>
-                	<field name="uom_id" />
-                	<field name="amount" />
-                	<field name="to_invoice" select="1"/>
-                	<field name="general_account_id" />
+                    <field name="date" select="1"/>
+                    <field name="user_id" />
+                    <field name="name" select="1"/>
+                    <field name="quantity" />
+                    <field name="product_id" select="1"/>
+                    <field name="analytic_account_id" select="1"/>
+                    <field name="uom_id" />
+                    <field name="amount" />
+                    <field name="to_invoice" select="1"/>
+                    <field name="general_account_id" />
                 </tree>
             </field>
-    	</record>
+        </record>
 
-		<record model="ir.actions.act_window" id="action_random_timesheet_lines_board">
+        <record model="ir.actions.act_window" id="action_random_timesheet_lines_board">
             <field name="type">ir.actions.act_window</field>
             <field name="name">Timesheet Lines</field>
             <field name="res_model">random.timesheet.lines</field>
@@ -376,7 +376,7 @@
              name="Time Tracking"
              parent="base.menu_main_pm" sequence="3"/>
         <menuitem action="action_random_timesheet_lines_board" id="menu_project_management_timesheet_lines_board" parent="base.menu_project_management_time_tracking" sequence="7"/>
-	  <!--<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board"
+      <!--<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board"
             parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>-->
        <menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board" name="Timesheets Lines"
             parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 21f4775386a..580fc64638f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- Editable current timesheet used  in dashboard-->
         <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.tree</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
@@ -10,10 +9,10 @@
                 <tree string="Timesheets"
                     colors="blue:state == 'draft';grey:state == 'done'">
                     <field name="user_id"/>
-                    <field name="department_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="name"/>
+                    <field name="department_id"/>
                     <field name="total_attendance" groups="hr_attendance.group_hr_attendance"/>
                     <field name="total_timesheet"/>
                     <field name="total_difference" groups="hr_attendance.group_hr_attendance"/>
@@ -182,14 +181,13 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                     <group col="10" colspan="4">
-                        <filter icon="terp-crm" string="Unvalidated" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
-                        <filter icon="terp-crm" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Timesheets"/>
+                        <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My" default="1"/>
                         <separator orientation="vertical"/>
-                        <field name="state" />
-                        <field name="name" select="1"/>
-                        <field name="user_id" select="1" widget="selection">
-                            <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Timesheet"/>
-                        </field>
+                        <filter icon="terp-crm" string="In Progress" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
+                        <filter icon="terp-crm" string="To Validate" domain="[('state','=','confirmed')]" help="Confirmed Timesheets"/>
+                        <separator orientation="vertical"/>
+                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="date_from"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-crm"
                                 domain="[('department_id','=',context.get('department_id',False))]"
@@ -197,10 +195,10 @@
                         </field>
                     </group>
                     <newline/>
-                   	<group expand="1" string="Group By..." colspan="4" col="20">
+                    <group expand="1" string="Group By..." colspan="4" col="20">
                         <filter string="Users" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
-                   	</group>
+                    </group>
                 </search>
             </field>
         </record>
@@ -308,17 +306,6 @@
                 </field>
             </field>
         </record>
-        <record id="view_attendance_tree_who" model="ir.ui.view">
-            <field name="name">hr.attendance.tree</field>
-            <field name="model">hr.attendance</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="hr_attendance.view_attendance_who"/>
-            <field name="arch" type="xml">
-                <field name="action_desc" position="after">
-                    <field name="sheet_id"/>
-                </field>
-            </field>
-        </record>
 
         <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_day" name="Timesheet by Account" res_model="hr_timesheet_sheet.sheet.account" src_model="hr_timesheet_sheet.sheet"/>
 <!--         <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_account" name="Timesheet by Day" res_model="hr_timesheet_sheet.sheet.day" src_model="hr_timesheet_sheet.sheet"/>  -->
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index a238658302c..eb80bb512f6 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -198,7 +198,6 @@ class mrp_bom(osv.osv):
         'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id','property_id', 'Properties'),
         'revision_ids': fields.one2many('mrp.bom.revision', 'bom_id', 'BoM Revisions'),
         'revision_type': fields.selection([('numeric','numeric indices'),('alpha','alphabetical indices')], 'Index type'),
-        'child_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
         'child_complete_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
         'company_id': fields.many2one('res.company','Company',required=True),
         'multi_level_bom': fields.boolean('Multi-level BoM'),
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 15729a8c985..3614ebf67bb 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -242,21 +242,21 @@
             <field name="arch" type="xml">
                 <form string="Bill of Material">
                     <group colspan="4" col="6">
-	                    <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
-	                    <field name="name" select="1"/>
-	                    <field name="code" select="1"/>
-	                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <newline/>
+                        <field name="product_uom"/>
+                        <field name="product_qty"/>
+                        <field name="routing_id" select="2" groups="base.group_extended"/>
+                        <newline/>
+                        <field name="product_uos" groups="product.group_uos"/>
+                        <field name="product_uos_qty" groups="product.group_uos"/>
+                        <newline/>
+                        <field name="multi_level_bom" invisible="1"/>
+                        <field name="type" groups="base.group_extended"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                     </group>
-                    <newline/>
-                    <field name="product_uos" groups="product.group_uos"/>
-                    <field name="product_uos_qty" groups="product.group_uos"/>
-                    <field name="routing_id" select="2" groups="base.group_extended"/>
-                    <field name="type" groups="base.group_extended"/>
-                    <group colspan="4" col="6">
-	                    <field name="product_uom"/>
-	                   	<field name="product_qty"/>
-	                    <field name="multi_level_bom"/>
-	                </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="bom_lines" nolabel="1" widget="one2many_list"/>
@@ -276,9 +276,6 @@
                             <field name="product_efficiency"/>
                             <field colspan="4" name="property_ids" nolabel="2" groups="base.group_extended"/>
                         </page>
-                        <page string="Multi-Level BoM" attrs="{'invisible':[('multi_level_bom','=',False)]}">
-                        	<field colspan="4" name="child_ids" nolabel="1" string="BoM Hierarchy"/>
-                        </page>
                     </notebook>
                 </form>
             </field>
@@ -291,7 +288,7 @@
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
                 <tree string="BoM Structure" colors="blue:method">
-					<field name="sequence" invisible="1"/>
+                    <field name="sequence" invisible="1"/>
                     <field name="name"/>
                     <field name="code"/>
                     <field name="product_id"/>
@@ -461,8 +458,8 @@
                         <group colspan="2" col="3">
                         <field name="product_uom"/>
                         <button type="action"
-                        	name="%(mrp.action_change_production_qty)d"
-                        	string="Change Qty" states="ready,confirmed" />
+                            name="%(mrp.action_change_production_qty)d"
+                            string="Change Qty" states="ready,confirmed" />
                         </group>
                         <label string="" colspan="2"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
@@ -484,45 +481,45 @@
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                 <tree string="Products to Consume">
                                     <field name="product_id" />
-				                    <field name="product_qty"  string="Qty"/>
-				                    <field name="product_uom"  string="UOM"/>
+                                    <field name="product_qty"  string="Qty"/>
+                                    <field name="product_uom"  string="UOM"/>
                                     <field name="location_id"  string="Source Loc."/>
 
                                     <field name="state" invisible="1"/>
-				                    <button name="%(stock.move_consume)d"
-				                    	string="Consume Products" type="action"
-				                    	icon="gtk-go-forward" context="{'consume': True}"
-				                    	states="draft,waiting,confirmed,assigned" />
-				                    <button name="%(stock.move_scrap)d"
-				                    	string="Scrap Products" type="action"
-				                    	icon="gtk-convert" context="{'scrap': True}"
-				                    	states="draft,waiting,confirmed,assigned" />				                    
+                                    <button name="%(stock.move_consume)d"
+                                        string="Consume Products" type="action"
+                                        icon="gtk-go-forward" context="{'consume': True}"
+                                        states="draft,waiting,confirmed,assigned" />
+                                    <button name="%(stock.move_scrap)d"
+                                        string="Scrap Products" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned" />                                    
                                 </tree>
                             </field>
 
                             <field colspan="2" name="move_lines2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
-                           			widget="one2many_list" mode="tree,form" height="275">
-                           		<tree string="Consumed Products" editable="bottom" colors="red:scraped==True">
-                           			<field name="product_id" readonly="1"/>
-                           			<field name="product_qty" readonly="1" string="Qty"/>
-				                    <field name="product_uom" readonly="1" string="UOM"/>                                    
+                                       widget="one2many_list" mode="tree,form" height="275">
+                                   <tree string="Consumed Products" editable="bottom" colors="red:scraped==True">
+                                       <field name="product_id" readonly="1"/>
+                                       <field name="product_qty" readonly="1" string="Qty"/>
+                                    <field name="product_uom" readonly="1" string="UOM"/>                                    
                                     <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
-				                    <field name="prodlot_id" />
+                                    <field name="prodlot_id" />
                                     <field name="state" invisible="1"/>
                                     <field name="scraped" invisible="1"/>
-                           			<button
-                           				name="%(stock.track_line)d"
-                           				string="Split in production lots"
-                           				type="action" icon="gtk-justify-fill"
-                           				states="done,cancel" />
-                           			<button
-                           				name="%(stock.move_scrap)d"
-                           				string="Scrap Products" type="action"
-                           				icon="gtk-convert"
-                           				states="done,cancel" />                          			
-				                    
-                           		</tree>
-                           	</field>
+                                       <button
+                                           name="%(stock.track_line)d"
+                                           string="Split in production lots"
+                                           type="action" icon="gtk-justify-fill"
+                                           states="done,cancel" />
+                                       <button
+                                           name="%(stock.move_scrap)d"
+                                           string="Scrap Products" type="action"
+                                           icon="gtk-convert"
+                                           states="done,cancel" />                                      
+                                    
+                                   </tree>
+                               </field>
 
                             <group col="9" colspan="4">
                                 <field name="state" select="2"/>
@@ -540,38 +537,38 @@
                                 mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
                                 <tree string="Products to Finish">
                                     <field name="product_id" />
-				                    <field name="product_qty"  string="Qty"/>
-				                    <field name="product_uom"  string="UOM"/>
+                                    <field name="product_qty"  string="Qty"/>
+                                    <field name="product_uom"  string="UOM"/>
                                     <field name="location_id"  string="Source Loc."/>
                                     <field name="state" invisible="1"/>
-				                    <button name="%(stock.move_consume)d"
-				                    	string="Consume Products" type="action"
-				                    	icon="gtk-go-forward" context="{'consume': True}"
-				                    	states="draft,waiting,confirmed,assigned" />
-				                    <button name="%(stock.move_scrap)d"
-				                    	string="Scrap Products" type="action"
-				                    	icon="gtk-convert" context="{'scrap': True}"
-				                    	states="draft,waiting,confirmed,assigned" />				                    
+                                    <button name="%(stock.move_consume)d"
+                                        string="Consume Products" type="action"
+                                        icon="gtk-go-forward" context="{'consume': True}"
+                                        states="draft,waiting,confirmed,assigned" />
+                                    <button name="%(stock.move_scrap)d"
+                                        string="Scrap Products" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned" />                                    
                                 </tree>
                             </field>
 
                             <field colspan="2" name="move_created_ids2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
-                           			widget="one2many_list" mode="tree,form" height="275">
-                           		<tree string="Finished Products" editable="bottom" colors="red:scraped==True">
-                           			<field name="product_id" readonly="1"/>
-                           			<field name="product_qty" readonly="1" string="Qty"/>
-				                    <field name="product_uom" readonly="1" string="UOM"/>
+                                       widget="one2many_list" mode="tree,form" height="275">
+                                   <tree string="Finished Products" editable="bottom" colors="red:scraped==True">
+                                       <field name="product_id" readonly="1"/>
+                                       <field name="product_qty" readonly="1" string="Qty"/>
+                                    <field name="product_uom" readonly="1" string="UOM"/>
                                     <field name="location_dest_id"  readonly="1" string="Destination Loc."/>
-                           			<field name="prodlot_id" />
+                                       <field name="prodlot_id" />
                                     <field name="state" invisible="1"/>
                                     <field name="scraped" invisible="1"/>
-                           			<button name="%(stock.track_line)d"
+                                       <button name="%(stock.track_line)d"
                                             string="Split in production lots" type="action" icon="gtk-justify-fill" states="done,cancel"/>
-                           			<button name="%(stock.move_scrap)d"
-                           				string="Scrap Products" type="action" icon="gtk-convert"
-                           				states="done,cancel" />
-                           		</tree>
-                           	</field>
+                                       <button name="%(stock.move_scrap)d"
+                                           string="Scrap Products" type="action" icon="gtk-convert"
+                                           states="done,cancel" />
+                                   </tree>
+                               </field>
                         </page>
                         <page string="Work Orders">
                             <field colspan="4" name="workcenter_lines" nolabel="1">
@@ -1039,12 +1036,12 @@
             res_model="mrp.bom"
             src_model="product.product"/>
 
-		<!-- Menu for Resource for MRP-->
-		<menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" sequence="3"/>
+        <!-- Menu for Resource for MRP-->
+        <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" sequence="3"/>
         <menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root" sequence="2"/>
-		<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
-		<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
-    	<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
+        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/product/product.py b/addons/product/product.py
index d51d0733e81..72fcfa5afd2 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -444,7 +444,7 @@ class product_product(osv.osv):
         'virtual_available': fields.function(_product_virtual_available, method=True, type='float', string='Virtual Stock'),
         'incoming_qty': fields.function(_product_incoming_qty, method=True, type='float', string='Incoming'),
         'outgoing_qty': fields.function(_product_outgoing_qty, method=True, type='float', string='Outgoing'),
-        'price': fields.function(_product_price, method=True, type='float', string='Customer Price', digits_compute=dp.get_precision('Sale Price')),
+        'price': fields.function(_product_price, method=True, type='float', string='Pricelist', digits_compute=dp.get_precision('Sale Price')),
         'lst_price' : fields.function(_product_lst_price, method=True, type='float', string='List Price', digits_compute=dp.get_precision('Sale Price')),
         'code': fields.function(_product_code, method=True, type='char', string='Code'),
         'partner_ref' : fields.function(_product_partner_ref, method=True, type='char', string='Customer ref'),
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b910515c950..e7191045118 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -110,7 +110,7 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group col='15' colspan='4'>
-                       <filter icon="terp-project" string="Open" domain="[('state', '=', 'open')]" help="Open Projects" default="1"/>
+                       <filter icon="terp-project" string="Current" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects" default="1"/>
                        <filter icon="terp-project" string="Pending" domain="[('state', '=', 'pending')]" help="Pending Projects"/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-project" string="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
@@ -121,7 +121,6 @@
                        <field name="name" string="Project Name"/>
                        <field name="user_id" string="Project Manager"/>
                        <field name="partner_id" string="Partner"/>
-                       <field name="state"/>
                    </group>
                </search>
             </field>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 20d65aec356..5c28d106c22 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -41,11 +41,11 @@ class report_project_task_user(osv.osv):
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                           ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
         'state': fields.selection([('draft', 'Draft'),
-                                   ('open', 'In Progress'),
-                                   ('pending', 'Pending'),
-                                   ('cancelled', 'Cancelled'),
-                                   ('done', 'Done')],
-                                'State', readonly=True),
+               ('open', 'In Progress'),
+               ('pending', 'Pending'),
+               ('cancelled', 'Cancelled'),
+               ('done', 'Done')],
+            'State', readonly=True),
 
     }
     _order = 'name desc, project_id'
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index dd271ee97da..deb89d3c747 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-	    <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
+        <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
 
         <record id="view_task_project_user_tree" model="ir.ui.view">
             <field name="name">report.project.task.user.tree</field>
@@ -31,30 +31,29 @@
             <field name="model">report.project.task.user</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Tasks">
-	            		<filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
-	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
-	            		<separator orientation="vertical"/>
-	            		<filter string="Start" icon="terp-project" domain="[('date_start','=',time.strftime('%%Y/%%m/%%d'))]"/>
-                 		<filter string="End" icon="terp-project" domain="[('date_end','=',time.strftime('%%Y/%%m/%%d'))]"/>
-                 	    <filter string="Deadline" icon="terp-project" domain="[('date_deadline','=',time.strftime('%%Y/%%m/%%d'))]"/>
-                 	    <filter string="Closed" icon="terp-project" domain="[('state','=','done')]"/>
-	            		<separator orientation="vertical"/>
-	            		<field name="project_id"/>
-	                    <field name="user_id" widget="selection">
-	            			<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" default="1"/>
-                		</field>
-	                    <newline/>
-                		<group expand="1" string="Group By..." colspan="10" col="11">
-                    		<filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
-                    		<filter string="Project" icon="terp-project" context="{'group_by':'project_id'}" />
-                 			<separator orientation="vertical"/>
-                 			<filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
-   							<separator orientation="vertical"/>
-                    		<filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
-                    		<filter string="Year" icon="terp-project" context="{'group_by':'name'}"/>
-                		</group>
-            	</search>
+                <search string="Tasks">
+                    <filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
+                    <filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
+                    <separator orientation="vertical"/>
+                    <filter string="In Progress" icon="terp-project" domain="[('state','=','open')]"/>
+                    <filter string="Pending" icon="terp-project" domain="[('state','=','pending')]"/>
+                    <filter string="Closed" icon="terp-project" domain="[('state','=','done')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="project_id"/>
+                    <field name="user_id" widget="selection">
+                        <filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" default="1"/>
+                    </field>
+                    <newline/>
+                    <group expand="1" string="Group By..." colspan="10" col="11">
+                        <filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
+                        <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
+                        <filter string="Year" icon="terp-project" context="{'group_by':'name'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
diff --git a/addons/project_issue/project_feature_menu.xml b/addons/project_issue/project_feature_menu.xml
index caf533efb7d..1c757a73909 100644
--- a/addons/project_issue/project_feature_menu.xml
+++ b/addons/project_issue/project_feature_menu.xml
@@ -3,36 +3,5 @@
 <data noupdate="1">
 
 
-    ######################## Feature Request (menu) ###########################
-
-    <record model="ir.actions.act_window" id="action_project_feature">
-        <field name="name">Feature Requests</field>
-        <field name="res_model">project.issue</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,calendar</field>
-        <field name="view_id" ref="project_feature_tree_view"/>
-        <field name="domain" eval="[('categ_id','=',ref('feature_request_categ'))]"/>
-        <field name="search_view_id" ref="view_project_feature_filter"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_project_feature_tree_view0">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="project_feature_tree_view"/>
-        <field name="act_window_id" ref="action_project_feature"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_project_feature_calendar_view0">
-        <field name="sequence" eval="2"/>
-        <field name="view_mode">calendar</field>
-        <field name="view_id" ref="project_issue_calendar_view"/>
-        <field name="act_window_id" ref="action_project_feature"/>
-    </record>
-    <record model="ir.actions.act_window.view" id="action_project_feature_form_view0">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="project_issue_form_view"/>
-        <field name="act_window_id" ref="action_project_feature"/>
-    </record>
-
-    <menuitem name="Feature Requests" id="menu_project_issue_feature_request"  parent="project.menu_project_management" action="action_project_feature"/>
 </data>
 </openerp>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 03ecfdcc778..8e3c891657b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -91,8 +91,7 @@ class project_issue(osv.osv):
         'assigned_to' : fields.many2one('res.users', 'Assigned to'),
         'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
         'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account',
-                                                domain="[('partner_id', '=', partner_id)]",
-                                                required=True),
+                                                domain="[('partner_id', '=', partner_id)]"),
     }
 
     def _get_project(self, cr, uid, context):
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index f09643c2590..579a426bdff 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -27,7 +27,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Issue Tracker Form">
-                    <group colspan="4" col="8">
+                    <group colspan="4" col="6">
                         <field name="name"/>
                         <field name="user_id"/>
                         <field name="assigned_to" />
@@ -38,8 +38,6 @@
                         </group>
                         <field name="project_id" required="True"/>
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                        <field name="create_date"/>
-                        <field name="write_date" />
                     </group>
                     <notebook colspan="4">
                         <page string="General">
@@ -76,6 +74,8 @@
                         <page string="History" groups="base.group_extended">
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Date"/>
+                                <field name="create_date"/>
+                                <field name="write_date" />
                                 <field name="date_closed"/>
                             </group>
                             <group col="2" colspan="2">
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 0ac0f902220..deff634aa68 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -66,9 +66,9 @@ class project_phase(osv.osv):
          return True
 
     def _check_dates(self, cr, uid, ids, context={}):
-         phase = self.read(cr, uid, ids[0], ['date_start', 'date_end'], context=context)
-         if phase['date_start'] and phase['date_end'] and phase['date_start'] > phase['date_end']:
-             return False
+         for phase in self.read(cr, uid, ids, ['date_start', 'date_end'], context=context):
+             if phase['date_start'] and phase['date_end'] and phase['date_start'] > phase['date_end']:
+                 return False
          return True
 
     def _check_constraint_start(self, cr, uid, ids, context={}):
@@ -104,16 +104,15 @@ class project_phase(osv.osv):
      }
     _defaults = {
         'responsible_id': lambda obj,cr,uid,context: uid,
-        'date_start': lambda *a: time.strftime('%Y-%m-%d'),
         'state': lambda *a: 'draft',
         'sequence': lambda *a: 10,
     }
     _order = "name"
     _constraints = [
-        (_check_recursion,'Error ! Loops In Phases Not Allowed',['next_phase_ids', 'previous_phase_ids']),
-        (_check_dates, 'Error! Phase start-date must be lower then Phase end-date.', ['date_start', 'date_end']),
-        (_check_constraint_start, 'Error! Phase must start-after Constraint Start Date.', ['date_start', 'constraint_date_start']),
-        (_check_constraint_end, 'Error! Phase must end-before Constraint End Date.', ['date_end', 'constraint_date_end']),
+        (_check_recursion,'Loops in phases not allowed',['next_phase_ids', 'previous_phase_ids']),
+        (_check_dates, 'Phase start-date must be lower than phase end-date.', ['date_start', 'date_end']),
+        #(_check_constraint_start, 'Phase must start-after constraint start Date.', ['date_start', 'constraint_date_start']),
+        #(_check_constraint_end, 'Phase must end-before constraint end Date.', ['date_end', 'constraint_date_end']),
     ]
 
     def onchange_project(self, cr, uid, ids, project, context={}):
@@ -369,4 +368,4 @@ class task(osv.osv):
         return super(task, self).write(cr, uid, ids, vals, context=context)
 
 task()
-# 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/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 53eaba2e4a9..af4bc26ba88 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -32,7 +32,7 @@
             </field>
         </record>
 
-	# ------------------------------------------------------
+    # ------------------------------------------------------
     # Project Phase
     # ------------------------------------------------------
 
@@ -46,38 +46,43 @@
                         <field name="name" select="1"/>
                         <field name="project_id" on_change="onchange_project(project_id)"/>
                         <field name="responsible_id"/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <field name="duration" widget="float_time"/>
-                        <field name="product_uom"/>
                     </group>
                     <notebook colspan="4">
-                    	<page string="Resource Allocation Detail">
-                            <separator colspan="4" string="Resource Allocation"/>
+                        <page string="Resource Allocation Detail">
+                            <group colspan="2" col="2">
+                                <separator colspan="2" string="Duration"/>
+                                <field name="duration" widget="float_time"/>
+                                <field name="product_uom"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator colspan="2" string="Dates"/>
+                                <field name="date_start"/>
+                                <field name="date_end"/>
+                            </group>
                             <field colspan="4" name="resource_ids" nolabel="1">
-                            	 <tree editable="bottom" string="Project Resource Allocation">
+                                 <tree editable="bottom" string="Project Resource Allocation">
                                     <field name="resource_id" context="{'project_id':parent.project_id}"/>
-                    				<field name="useability"/>
+                                    <field name="useability"/>
                                   </tree>
                                   <form string="Project Resource Allocation">
                                     <field name="resource_id" context="{'project_id':parent.project_id}"/>
-                    				<field name="useability"/>
+                                    <field name="useability"/>
                                   </form>
                              </field>
                             <group col="12" colspan="4">
-                            	<field name="state" select="1"/>
-                            	<button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
-                            	<button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
+                                <field name="state" select="1"/>
+                                <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
+                                <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
                                 <button string="Done" name="set_done" states="draft,pending,open" icon="gtk-jump-to"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
-								<button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
+                                <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Other Info">
                            <group colspan="2" col="2">
                                 <separator string="Constraints" colspan="2"/>
                                 <field name="constraint_date_start"/>
-                        		<field name="constraint_date_end"/>
+                                <field name="constraint_date_end"/>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Scheduling" colspan="2"/>
@@ -91,46 +96,46 @@
                         <page string="Task Detail">
                             <separator colspan="4" string="Project's Tasks"/>
                             <field colspan="4" name="task_ids" context="{'default_project_id' :project_id}" nolabel="1">
-                            	 <tree editable="bottom" string="Project's Tasks">
+                                 <tree editable="bottom" string="Project's Tasks">
                                     <field name="name"/>
                                     <field name="project_id"/>
                                     <field name="user_id"/>
-                    				<field name="date_start"/>
-                                  	<field name="date_deadline"/>
-                                  	<field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
-									<field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
-									<field name="effective_hours" invisible="1"/>
-									<field name="state"/>
-									<field name="occupation_rate"/>
+                                    <field name="date_start"/>
+                                      <field name="date_deadline"/>
+                                      <field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
+                                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
+                                    <field name="effective_hours" invisible="1"/>
+                                    <field name="state"/>
+                                    <field name="occupation_rate"/>
                                   </tree>
                                   <form string="Project's Tasks">
-                                  	<notebook colspan="4">
-                                  		<page string="Task Detail">
-                                  			<group colspan="4" col="4">
-		                                    	<field name="name"/>
-		                                    	<field name="project_id"/>
-		                                    	<field name="user_id"/>
-		                                    </group>
-		                    				<group colspan="2" col="2">
-		                                  		<separator string="Dates" colspan="2"/>
-		                                  		<field name="date_start"/>
-		                                  		<field name="date_deadline"/>
-		                                  		<field name="occupation_rate"/>
-		                                    </group>
-		                                    <group colspan="2" col="2">
-		                                  		<separator string="Planning" colspan="2"/>
-		                                  		<field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
-												<field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
-												<field name="effective_hours" invisible="1"/>
-		                                    </group>
-		                                    <group colspan="6" col="4">
-												<field name="state"/>
-											</group>
-										</page>
-									</notebook>
+                                      <notebook colspan="4">
+                                          <page string="Task Detail">
+                                              <group colspan="4" col="4">
+                                                <field name="name"/>
+                                                <field name="project_id"/>
+                                                <field name="user_id"/>
+                                            </group>
+                                            <group colspan="2" col="2">
+                                                  <separator string="Dates" colspan="2"/>
+                                                  <field name="date_start"/>
+                                                  <field name="date_deadline"/>
+                                                  <field name="occupation_rate"/>
+                                            </group>
+                                            <group colspan="2" col="2">
+                                                  <separator string="Planning" colspan="2"/>
+                                                  <field name="planned_hours" widget="float_time" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours)"/>
+                                                <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
+                                                <field name="effective_hours" invisible="1"/>
+                                            </group>
+                                            <group colspan="6" col="4">
+                                                <field name="state"/>
+                                            </group>
+                                        </page>
+                                    </notebook>
                                   </form>
                              </field>
-                           	<button name="%(wizard_schedule_task)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
+                               <button name="%(wizard_schedule_task)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
                         </page>
                     </notebook>
                     <newline/>
@@ -194,15 +199,15 @@
                         <filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Phases" icon="terp-project" default="1"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-project"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-project"/>
-	                    <field name="name"/>
-	                    <field name="project_id" widget="selection">
-		                    <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
-						</field>
-	                    <field name="responsible_id" widget="selection">
+                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="project_id" widget="selection">
+                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
+                        </field>
+                        <field name="responsible_id" widget="selection">
                             <filter domain="[('responsible_id','=',uid)]" help="My Phase" icon="gtk-execute" default="1"/>
                         </field>
-	                    <field name="date_start"/>
-	                    <!--<field name="date_end"/>-->
+                        <field name="date_start"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20">
@@ -223,51 +228,51 @@
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
-	# ------------------------------------------------------
+    # ------------------------------------------------------
     # Project
     # ------------------------------------------------------
 
         <record id="view_phase_project_form1" model="ir.ui.view">
-			<field name="name">phase.project.form1</field>
-			<field name="model">project.project</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="project.edit_project"/>
-			<field name="arch" type="xml">
-				<field name="priority" position="before">
-					<field name="resource_calendar_id"/>
-				</field>
+            <field name="name">phase.project.form1</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+                <field name="priority" position="before">
+                    <field name="resource_calendar_id"/>
+                </field>
 
-			</field>
-	   </record>
+            </field>
+       </record>
 
-	# ------------------------------------------------------
+    # ------------------------------------------------------
     # Project Task
     # ------------------------------------------------------
 
-    	<record id="view_project_phase_task_form1" model="ir.ui.view">
-			<field name="name">project.phase.task.form1</field>
-			<field name="model">project.task</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="project.view_task_form2"/>
-			<field name="arch" type="xml">
-				<field name="planned_hours" position="replace">
-					<field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours, date_start, occupation_rate)"/>
-				</field>
+        <record id="view_project_phase_task_form1" model="ir.ui.view">
+            <field name="name">project.phase.task.form1</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <field name="planned_hours" position="replace">
+                    <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" on_change="onchange_planned(project_id, user_id, planned_hours, effective_hours, date_start, occupation_rate)"/>
+                </field>
 
-			</field>
-	   </record>
+            </field>
+       </record>
 
-		<record id="view_project_phase_task_form2" model="ir.ui.view">
-			<field name="name">project.phase.task.form2</field>
-			<field name="model">project.task</field>
-			<field name="type">form</field>
-			<field name="inherit_id" ref="project.view_task_form2"/>
-			<field name="arch" type="xml">
-				<field name="date_end" position = "after">
-		  			<field name="occupation_rate"/>
-				</field>
-			</field>
-	   </record>
+        <record id="view_project_phase_task_form2" model="ir.ui.view">
+            <field name="name">project.phase.task.form2</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <field name="date_end" position = "after">
+                      <field name="occupation_rate"/>
+                </field>
+            </field>
+       </record>
 
         <act_window
         id="project_phase_task_list"
@@ -286,16 +291,16 @@
         view_mode="tree,form"
         view_type="form" />
 
-	# ------------------------------------------------------
+    # ------------------------------------------------------
     # Menu Items
     # ------------------------------------------------------
 
         <menuitem action="act_project_phase" id="menu_project_phase" parent="project.menu_project_management" sequence="4"/>
-		<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
         <menuitem id="menu_pm_resources_project1" name="Resources" parent="base.menu_main_pm" sequence="2"/>
-		<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="1"/>
-		<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
-		<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
+        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
+        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index f08b03600f8..4fbcdd1c284 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -2,27 +2,26 @@
 <openerp>
     <data>
 
-    	<!-- Search Views -->
+        <!-- Search Views -->
 
-	<record id="view_resource_resource_search" model="ir.ui.view">
+        <record id="view_resource_resource_search" model="ir.ui.view">
             <field name="name">resource.resource.search</field>
             <field name="model">resource.resource</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Resource">
                    <group col='15' colspan='4'>
-                       <field name="name" string="Resource Name"/>
-                       <field name="code" string="Code"/>
+                       <field name="name"/>
                        <field name="user_id" string="User" widget="selection">
-	                       <filter domain="[('user_id','=',uid)]" help="My Resouces" icon="gtk-execute" default="1"/>
-	                   </field>
-                       <field name="calendar_id" string="Working Calendar" widget="selection"/>
-                       <field name="resource_type" string="Resource Type"/>
-                       <field name="company_id" string="Company" widget="selection"/>
+                           <filter domain="[('user_id','=',uid)]" help="My Resouces" icon="gtk-execute" default="1"/>
+                       </field>
+                       <field name="resource_type"/>
+                       <field name="company_id" widget="selection"/>
                    </group>
                    <newline/>
                    <group expand="1" string="Group By..." colspan="4" col="20">
-                        <filter string="Resouce Type" icon="terp-project" domain="[]" context="{'group_by':'resource_type'}"/>
+                        <filter string="Type" icon="terp-project" domain="[]" context="{'group_by':'resource_type'}"/>
+                        <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}"/>
                         <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
                     </group>
                </search>
@@ -37,10 +36,9 @@
             <field name="arch" type="xml">
                 <search string="Search Working Period">
                    <group col='15' colspan='4'>
-                   	   <field name="name" string="Name"/>
-               <!--     <field name="name" string="Working Calendar"/> -->
-                       <field name="manager" string="Workgroup Manager" widget="selection"/>
-                       <field name="company_id" string="Company" widget="selection"/>
+                       <field name="name" string="Name"/>
+                       <field name="manager" widget="selection"/>
+                       <field name="company_id" widget="selection"/>
                    </group>
                </search>
             </field>
@@ -71,7 +69,7 @@
             <field name="model">resource.calendar</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            	<form string="Working Period">
+                <form string="Working Period">
                     <field name="name" select="1"/>
                     <field name="manager" select="1"/>
                     <field name="company_id" select="1"/>
@@ -86,7 +84,7 @@
             <field name="model">resource.calendar</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree string="Working Period">
+                <tree string="Working Period">
                     <field name="name"/>
                     <field name="manager" select="1"/>
                     <field name="company_id" select="1"/>
@@ -131,7 +129,7 @@
             </field>
         </record>
 
-		<record id="view_resource_calendar" model="ir.ui.view">
+        <record id="view_resource_calendar" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.calendar</field>
             <field name="model">resource.calendar.leaves</field>
             <field name="type">calendar</field>
@@ -143,20 +141,20 @@
         </record>
 
         <act_window
-        id="resource_calendar_closing_days"
-        name="Closing Days"
-        res_model="resource.calendar.leaves"
-        src_model="resource.calendar"
-        view_mode="calendar,tree,form"
-        domain="[('calendar_id','=',active_id), ('resource_id','=',False)]"/>
+            id="resource_calendar_closing_days"
+            name="Closing Days"
+            res_model="resource.calendar.leaves"
+            src_model="resource.calendar"
+            view_mode="calendar,tree,form"
+            domain="[('calendar_id','=',active_id), ('resource_id','=',False)]"/>
 
         <act_window
-        id="resource_calendar_resources_leaves"
-        name="Resources Leaves"
-        res_model="resource.calendar.leaves"
-        src_model="resource.calendar"
-        view_mode="calendar,tree,form"
-        domain="[('calendar_id','=',active_id), ('resource_id','!=',False)]"/>
+            id="resource_calendar_resources_leaves"
+            name="Resources Leaves"
+            res_model="resource.calendar.leaves"
+            src_model="resource.calendar"
+            view_mode="calendar,tree,form"
+            domain="[('calendar_id','=',active_id), ('resource_id','!=',False)]"/>
 
         <record id="resource_resource_form" model="ir.ui.view">
             <field name="name">resource.resource.form</field>
@@ -166,7 +164,7 @@
                 <form string="Resource">
                     <field name="name" />
                     <field name="active"/>
-                    <field name="company_id" />
+                    <field name="company_id" widget="selection"/>
                     <field name="calendar_id" />
                     <field name="resource_type" />
                     <field name="user_id" attrs="{'required':[('resource_type','=','user')]}"/>
@@ -203,7 +201,7 @@
             <field name="arch" type="xml">
                 <form string="Leave Detail">
                     <field name="name" />
-                    <field name="company_id" />
+                    <field name="company_id"  widget="selection"/>
                     <field name="calendar_id" />
                     <field name="date_from" />
                     <field name="date_to" />
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 073d95dac27..0dea85ae81b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -448,15 +448,15 @@
                         domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"  default="1"
                         separator="1" />
                     <separator orientation="vertical"/>
-                    <field name="product_id" select="1"/>
                     <field name="order_id" select="1"/>
                     <field name="order_partner_id" select="1"/>
+                    <field name="product_id" select="1"/>
                     <field name="state" select="1"/>
                     <newline />
                     <group expand="1" string="Group By..." colspan="9" col="8">
                         <filter string="Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
-<!--                        <filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'order_partner_id'}"/>-->
                         <filter string="Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index b5b66f8f758..e812f7a65d8 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -159,27 +159,8 @@ class change_standard_price(osv.osv_memory):
             else:
                 raise osv.except_osv(_('Warning!'),_('No Change in Price.'))
         else:
-            raise osv.except_osv(_('Warning!'),_('No Accounts are defined for ' 
-                        'this product on its location.\nCan\'t create Move.'))
-        
-        id2 = data_obj._get_id(cr, uid, 'account', 'view_move_tree')
-        id3 = data_obj._get_id(cr, uid, 'account', 'view_move_form')
-        
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-        
-        return {
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'account.move',
-                'res_id' : move_id,
-                'views': [(id3,'form'),(id2,'tree')],
-                'type': 'ir.actions.act_window',
-        }
-        prod_obj.do_change_standard_price(cr, uid, [rec_id], datas, context)
-        return {}        
+            pass
+        return {}
 
 change_standard_price()
 
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 1e7f7fc5080..3eca378f150 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -2,29 +2,29 @@
 <openerp>
     <data noupdate="1">
 
-		<record model="survey.type" id="survey_type1">
-		    <field name="name">Human Resources</field>
-		    <field name="code">Human Resources</field>
-		</record>
-		<record model="survey.type" id="survey_type2">
-		    <field name="name">Customer Feeback</field>
-		    <field name="code">Customer Feeback</field>
-		</record>
-		<record model="survey.type" id="survey_type3">
-		    <field name="name">Supplier Selection</field>
-		    <field name="code">Supplier Selection</field>
-		</record>
+        <record model="survey.type" id="survey_type1">
+            <field name="name">Human Resources</field>
+            <field name="code">Human Resources</field>
+        </record>
+        <record model="survey.type" id="survey_type2">
+            <field name="name">Customer Feeback</field>
+            <field name="code">Customer Feeback</field>
+        </record>
+        <record model="survey.type" id="survey_type3">
+            <field name="name">Supplier Selection</field>
+            <field name="code">Supplier Selection</field>
+        </record>
 
-    	<!--  Partner Feedback Demo data -->
+        <!--  Partner Feedback Demo data -->
         <record model="survey" id="survey_partner_feedback">
-	        <field name="title">Open ERP Partner Feedback</field>
-	        <field name="responsible_id" ref="base.user_root"/>
-	        <field name="max_response_limit">20</field>
-	        <field name="type" ref="survey_type2"/>
-	        <field name="state">open</field>
-	        <field name="tot_comp_survey">1</field>
-	        <field name="tot_start_survey">1</field>
-   		</record>
+            <field name="title">Open ERP Partner Feedback</field>
+            <field name="responsible_id" ref="base.user_root"/>
+            <field name="max_response_limit">20</field>
+            <field name="type" ref="survey_type2"/>
+            <field name="state">open</field>
+            <field name="tot_comp_survey">1</field>
+            <field name="tot_start_survey">1</field>
+           </record>
 
         <record id="survey_page_who_are_you" model="survey.page">
             <field name="title">Who are you?</field>
@@ -94,11 +94,11 @@
             <field name="sequence" eval="7"/>
         </record>
         <record id="survey_question_company_size" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_question_located" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Where are you located?</field>
             <field name="page_id" ref="survey_page_who_are_you" />
             <field name="type">multiple_choice_multiple_ans</field>
@@ -135,14 +135,14 @@
             <field name="question_id" ref="survey_question_located" />
             <field name="sequence" eval="5"/>
         </record>
-       	<record id="survey_question_located" model="survey.question">
+           <record id="survey_question_located" model="survey.question">
             <field name="required_type">at least</field>
             <field eval="1" name="req_ans"/>
             <field name="req_error_msg">This question requires an answer.</field>
         </record>
 
         <record id="survey_question_offical_partner" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">When did you become an OpenERP official partner?</field>
             <field name="page_id" ref="survey_page_who_are_you" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -180,11 +180,11 @@
             <field name="sequence" eval="5"/>
         </record>
         <record id="survey_question_offical_partner" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_question_your_customers" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">What kind of solutions do you sell to your customers? </field>
             <field name="page_id" ref="survey_page_who_are_you" />
             <field name="type">multiple_choice_multiple_ans</field>
@@ -218,7 +218,7 @@
         </record>
 
         <record id="survey_question_partnership_contract" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">What do you think about the partnership contract?</field>
             <field name="page_id" ref="survey_page_Contracts" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -250,11 +250,11 @@
             <field name="sequence" eval="4"/>
         </record>
         <record id="survey_question_partnership_contract" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_question_contract_customers" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">When do you propose a maintenance contract to your customers?</field>
             <field name="page_id" ref="survey_page_Contracts" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -283,11 +283,11 @@
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_question_contract_customers" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_question_sell_to_your_customers" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Which maintenance contract do you sell to your customers.</field>
             <field name="page_id" ref="survey_page_Contracts" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -313,7 +313,7 @@
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_question_sell_to_your_customers" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_page_communication" model="survey.page">
@@ -323,7 +323,7 @@
         </record>
 
         <record id="survey_question_launchpad_reporting" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Give your opinion about Launchpad reporting :</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -372,8 +372,8 @@
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
         </record>
- 		<record id="survey_question_Leads" model="survey.question">
- 			<field name="in_visible_answer_type">1</field>
+         <record id="survey_question_Leads" model="survey.question">
+             <field name="in_visible_answer_type">1</field>
             <field name="question">Leads</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -423,7 +423,7 @@
         </record>
 
         <record id="survey_question_partners_about" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">How is Tiny's communication with partners about...</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -473,14 +473,14 @@
             <field name="in_visible_menu_choice">1</field>
         </record>
         <record id="survey_question_partners_about" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="required_type">at least</field>
             <field eval="1" name="req_ans"/>
             <field name="req_error_msg">This question requires an answer.</field>
         </record>
 
         <record id="survey_question_partners_on_which_subjects" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">In your opinion, how could Tiny better communicate with partners and on which subjects?</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">comment</field>
@@ -489,16 +489,16 @@
             <field eval="4" name="sequence"/>
         </record>
 
-    	<!--  Partner Feedback Demo data -->
+        <!--  Partner Feedback Demo data -->
         <record model="survey" id="survey_odoo_feedback">
-	        <field name="title">Odoo Feedback</field>
-	        <field name="responsible_id" ref="base.user_demo"/>
-	        <field name="max_response_limit">20</field>
-	        <field name="type" ref="survey_type2"/>
-	        <field name="state">open</field>
-	        <field name="tot_comp_survey">1</field>
-	        <field name="tot_start_survey">1</field>
-   		</record>
+            <field name="title">Odoo Feedback</field>
+            <field name="responsible_id" ref="base.user_demo"/>
+            <field name="max_response_limit">20</field>
+            <field name="type" ref="survey_type2"/>
+            <field name="state">open</field>
+            <field name="tot_comp_survey">1</field>
+            <field name="tot_start_survey">1</field>
+           </record>
 
         <record id="survey_page_odoo_who_are_you" model="survey.page">
             <field name="title">Who are you?</field>
@@ -507,7 +507,7 @@
         </record>
 
         <record id="survey_question_odoo_company_name" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">What is your company's name?</field>
             <field name="page_id" ref="survey_page_odoo_who_are_you" />
             <field name="type">single_textbox</field>
@@ -517,7 +517,7 @@
         </record>
 
         <record id="survey_question_odoo_company_sector" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">What is your company's sector?</field>
             <field name="page_id" ref="survey_page_odoo_who_are_you" />
             <field name="type">multiple_choice_multiple_ans</field>
@@ -645,7 +645,7 @@
          </record>
 
          <record id="survey_question_odoo_mange_with_odoo" model="survey.question">
-         	<field name="in_visible_answer_type">1</field>
+             <field name="in_visible_answer_type">1</field>
             <field name="question">Which activities do you plan to manage with Odoo ?</field>
             <field name="page_id" ref="survey_page_odoo_who_are_you" />
             <field name="type">multiple_choice_multiple_ans</field>
@@ -707,7 +707,7 @@
         </record>
 
         <record id="survey_question_odoo_discover_odoo" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">How did you discover Odoo ?</field>
             <field name="page_id" ref="survey_page_odoo_who_are_you" />
             <field name="type">multiple_choice_multiple_ans</field>
@@ -763,7 +763,7 @@
         </record>
 
         <record id="survey_question_odoo_subscribe_to_odoo" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Why did you subscribe to Odoo?</field>
             <field name="page_id" ref="survey_page_odoo_Subscription_and_configuration" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -802,7 +802,7 @@
         </record>
 
         <record id="survey_question_odoo_configure_the_application" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">How much time did you spend to configure the application?</field>
             <field name="page_id" ref="survey_page_odoo_Subscription_and_configuration" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -871,7 +871,7 @@
         </record>
 
         <record id="survey_question_odoo_continue_using_odoo" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Do you plan to continue using Odoo?</field>
             <field name="page_id" ref="survey_page_odoo_Subscription_and_configuration" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -894,7 +894,7 @@
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_question_odoo_continue_using_odoo" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_page_odoo_using_odoo" model="survey.page">
@@ -903,7 +903,7 @@
             <field eval="3" name="sequence"/>
         </record>
         <record id="survey_question_odoo_would_you_prefer_use" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Which interface would you prefer to use?</field>
             <field name="page_id" ref="survey_page_odoo_using_odoo" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -929,11 +929,11 @@
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_question_odoo_would_you_prefer_use" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_question_odoo_give_your_opinion" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Give your opinion :</field>
             <field name="page_id" ref="survey_page_odoo_using_odoo" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -1003,7 +1003,7 @@
         </record>
 
         <record id="survey_question_odoo_you_think_about" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">What do you think about ... </field>
             <field name="page_id" ref="survey_page_odoo_using_odoo" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -1073,14 +1073,14 @@
             <field name="in_visible_menu_choice">1</field>
         </record>
         <record id="survey_question_odoo_you_think_about" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="required_type">at least</field>
             <field eval="1" name="req_ans"/>
             <field name="req_error_msg">This question requires an answer.</field>
         </record>
 
         <record id="survey_question_odoo_modules_are_missing_in_odoo" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">In your opinion, which modules are missing in Odoo? Give examples :</field>
             <field name="page_id" ref="survey_page_odoo_using_odoo" />
             <field name="type">single_textbox</field>
@@ -1097,7 +1097,7 @@
         </record>
 
         <record id="survey_question_odoo_would_you_prefer_receive_your_prepaid_bill" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">How often would you prefer to receive your prepaid bill?</field>
             <field name="page_id" ref="survey_page_odoo_the_offer" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -1123,11 +1123,11 @@
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_question_odoo_would_you_prefer_receive_your_prepaid_bill" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_question_odoo_dms" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Do you plan to use the document management system?</field>
             <field name="page_id" ref="survey_page_odoo_the_offer" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -1150,11 +1150,11 @@
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_question_odoo_dms" model="survey.question">
-			<field eval="True" name="is_require_answer"/>
+            <field eval="True" name="is_require_answer"/>
         </record>
 
         <record id="survey_question_odoo_support_services" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">How satisfied are you with Odoo's support services :</field>
             <field name="page_id" ref="survey_page_odoo_the_offer" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -1210,7 +1210,7 @@
         </record>
 
         <record id="survey_question_offer_opinion_about_odoo" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">Give your opinion about Odoo's</field>
             <field name="page_id" ref="survey_page_odoo_the_offer" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -1272,7 +1272,7 @@
         </record>
 
         <record id="survey_question_offer_comments_them_here" model="survey.question">
-        	<field name="in_visible_answer_type">1</field>
+            <field name="in_visible_answer_type">1</field>
             <field name="question">If you have any additional comments, write them here :</field>
             <field name="page_id" ref="survey_page_odoo_the_offer" />
             <field name="type">comment</field>
@@ -1280,2167 +1280,2166 @@
             <field name="sequence" eval="2"/>
         </record>
      </data>
-   	 <data>
-		<record id="survey_0" model="survey">
-			<field eval="&quot;&quot;&quot;OpenERP Feedback&quot;&quot;&quot;" name="title"/>
-			<field name="responsible_id" ref="base.user_demo"/>
-	        <field name="max_response_limit">20</field>
-	        <field name="type" ref="survey_type2"/>
-	        
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_0" model="survey.page">
-			<field eval="&quot;&quot;&quot;About your OpenERP usage&quot;&quot;&quot;" name="title"/>
-			<field name="survey_id" ref="survey_0"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_1" model="survey.page">
-			<field eval="&quot;&quot;&quot;These questions relates to the ergonomy and ease of use of OpenERP. Try to remind your firsts days on OpenERP and what have been your difficulties.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Ergonomy and ease of use - 1&quot;&quot;&quot;" name="title"/>
-			<field name="survey_id" ref="survey_0"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-<!--	<data>-->
-<!--		<record id="survey_page_2" model="survey.page">-->
-<!--			<field eval="&quot;&quot;&quot;Ergonomy and ease of use - 2&quot;&quot;&quot;" name="title"/>-->
-<!--			<field name="survey_id" ref="survey_0"/>-->
-<!--			<field eval="3" name="sequence"/>-->
-<!--		</record>-->
-<!--	</data>-->
-<!--	<data>-->
-<!--		<record id="survey_page_3" model="survey.page">-->
-<!--			<field eval="&quot;&quot;&quot;Ergonomy and ease of use - 3&quot;&quot;&quot;" name="title"/>-->
-<!--			<field name="survey_id" ref="survey_0"/>-->
-<!--			<field eval="4" name="sequence"/>-->
-<!--		</record>-->
-<!--	</data>-->
-	<data>
-		<record id="survey_page_4" model="survey.page">
-			<field eval="&quot;&quot;&quot;Ergonomy of the clients&quot;&quot;&quot;" name="title"/>
-			<field name="survey_id" ref="survey_0"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_5" model="survey.page">
-			<field eval="&quot;&quot;&quot;Features&quot;&quot;&quot;" name="title"/>
-			<field name="survey_id" ref="survey_0"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_6" model="survey.page">
-			<field eval="&quot;&quot;&quot;Community and contributors&quot;&quot;&quot;" name="title"/>
-			<field name="survey_id" ref="survey_0"/>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_7" model="survey.page">
-			<field eval="&quot;&quot;&quot;If you do not contribute and develop in OpenERP, skip this page.&quot;&quot;&quot;" name="note"/>
-			<field eval="&quot;&quot;&quot;Questions for developers&quot;&quot;&quot;" name="title"/>
-			<field name="survey_id" ref="survey_0"/>
-			<field eval="6" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_0" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="1" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;What do you think about the documentation available on doc.openerp.com ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_1"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        <data>
+        <record id="survey_0" model="survey">
+            <field eval="&quot;&quot;&quot;OpenERP Feedback&quot;&quot;&quot;" name="title"/>
+            <field name="responsible_id" ref="base.user_demo"/>
+            <field name="max_response_limit">20</field>
+            <field name="type" ref="survey_type2"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_0" model="survey.page">
+            <field eval="&quot;&quot;&quot;About your OpenERP usage&quot;&quot;&quot;" name="title"/>
+            <field name="survey_id" ref="survey_0"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_1" model="survey.page">
+            <field eval="&quot;&quot;&quot;These questions relates to the ergonomy and ease of use of OpenERP. Try to remind your firsts days on OpenERP and what have been your difficulties.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Ergonomy and ease of use - 1&quot;&quot;&quot;" name="title"/>
+            <field name="survey_id" ref="survey_0"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+<!--    <data>-->
+<!--        <record id="survey_page_2" model="survey.page">-->
+<!--            <field eval="&quot;&quot;&quot;Ergonomy and ease of use - 2&quot;&quot;&quot;" name="title"/>-->
+<!--            <field name="survey_id" ref="survey_0"/>-->
+<!--            <field eval="3" name="sequence"/>-->
+<!--        </record>-->
+<!--    </data>-->
+<!--    <data>-->
+<!--        <record id="survey_page_3" model="survey.page">-->
+<!--            <field eval="&quot;&quot;&quot;Ergonomy and ease of use - 3&quot;&quot;&quot;" name="title"/>-->
+<!--            <field name="survey_id" ref="survey_0"/>-->
+<!--            <field eval="4" name="sequence"/>-->
+<!--        </record>-->
+<!--    </data>-->
+    <data>
+        <record id="survey_page_4" model="survey.page">
+            <field eval="&quot;&quot;&quot;Ergonomy of the clients&quot;&quot;&quot;" name="title"/>
+            <field name="survey_id" ref="survey_0"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_5" model="survey.page">
+            <field eval="&quot;&quot;&quot;Features&quot;&quot;&quot;" name="title"/>
+            <field name="survey_id" ref="survey_0"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_6" model="survey.page">
+            <field eval="&quot;&quot;&quot;Community and contributors&quot;&quot;&quot;" name="title"/>
+            <field name="survey_id" ref="survey_0"/>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_7" model="survey.page">
+            <field eval="&quot;&quot;&quot;If you do not contribute and develop in OpenERP, skip this page.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Questions for developers&quot;&quot;&quot;" name="title"/>
+            <field name="survey_id" ref="survey_0"/>
+            <field eval="6" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_0" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="1" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;What do you think about the documentation available on doc.openerp.com ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_1"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_1" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="2" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;What do you think about the process views of OpenERP, available in the web client ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_1"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_1" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="2" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;What do you think about the process views of OpenERP, available in the web client ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_1"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_2" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="1" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;Are you using OpenERP on a daily basis ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_0"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_2" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="1" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;Are you using OpenERP on a daily basis ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_0"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
+        </record>
+    </data>
 
-	<data>
-		<record id="survey_question_3" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="3" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;Do you have suggestions on how to improve the process view ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;single_textbox&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_1"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+    <data>
+        <record id="survey_question_3" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="3" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;Do you have suggestions on how to improve the process view ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;single_textbox&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_1"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_4" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="4" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;What do you think about the structure of the menus (multiple answers allowed) ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;multiple_choice_multiple_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_1"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_4" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="4" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;What do you think about the structure of the menus (multiple answers allowed) ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;multiple_choice_multiple_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_1"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_5" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="2" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;If yes, which interface are you using ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_0"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_5" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="2" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;If yes, which interface are you using ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_0"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_6" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="3" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;Which modules are you using/testing?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;multiple_choice_multiple_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_0"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_6" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="3" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;Which modules are you using/testing?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;multiple_choice_multiple_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_0"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_7" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="1" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;How do you develop your new features ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_7"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_7" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="1" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;How do you develop your new features ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_7"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_8" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="1" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;How do you contribute or plan to contribute to OpenERP ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;multiple_choice_multiple_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_6"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_8" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="1" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;How do you contribute or plan to contribute to OpenERP ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;multiple_choice_multiple_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_6"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_9" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="5" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;What do you think about the groups of users?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_1"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_9" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="5" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;What do you think about the groups of users?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_1"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_10" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="2" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;Do you have a proposition to help people to contribute ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;single_textbox&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_6"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_10" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="2" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;Do you have a proposition to help people to contribute ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;single_textbox&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_6"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_11" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="3" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;Do you have a proposition to attract new contributors ?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;single_textbox&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_6"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_11" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="3" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;Do you have a proposition to attract new contributors ?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;single_textbox&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_6"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_12" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="6" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;About the groups of users installed by default&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_1"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_12" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="6" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;About the groups of users installed by default&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;multiple_choice_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_1"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_13" model="survey.question">
-			<field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
-			<field eval="7" name="sequence"/>
-			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
-			<field eval="&quot;&quot;&quot;What do you think about configuration wizards?&quot;&quot;&quot;" name="question"/>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
-			<field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
-			<field name="page_id" ref="survey_page_1"/>
-			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
-			<field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
-			<field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_13" model="survey.question">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
+            <field eval="7" name="sequence"/>
+            <field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="validation_valid_err_msg"/>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="&quot;&quot;&quot;This question requires an answer.&quot;&quot;&quot;" name="req_error_msg"/>
+            <field eval="&quot;&quot;&quot;What do you think about configuration wizards?&quot;&quot;&quot;" name="question"/>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="&quot;&quot;&quot;matrix_of_choices_only_one_ans&quot;&quot;&quot;" name="type"/>
+            <field eval="&quot;&quot;&quot;The comment you entered is in an invalid format.&quot;&quot;&quot;" name="comment_valid_err_msg"/>
+            <field name="page_id" ref="survey_page_1"/>
+            <field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="validation_type"/>
+            <field eval="&quot;&quot;&quot;Other&quot;&quot;&quot;" name="comment_label"/>
+            <field eval="0" name="allow_comment"/>
             <field name="in_visible_single_text">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_0" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Disagree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_0"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_0" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Disagree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_0"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_1" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_0"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_1" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_0"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_2" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_0"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_2" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_0"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_3" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_0"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_3" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_0"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_4" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Disagree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_1"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_4" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Disagree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_1"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_5" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_1"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_5" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_1"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_6" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_1"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_6" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_1"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_7" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_1"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_7" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_1"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_8" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Disagree	&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_9"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_8" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Disagree    &quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_9"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_9" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_9"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_9" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_9"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_10" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_9"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_10" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_9"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_11" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_9"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_11" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_9"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_12" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Disagree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_13"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_12" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Disagree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_13"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_13" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_13"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_13" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Disagree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_13"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_14" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_13"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_14" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_13"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_15" model="survey.question.column.heading">
-			<field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
-			<field name="question_id" ref="survey_question_13"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_15" model="survey.question.column.heading">
+            <field eval="&quot;&quot;&quot;Totally Agree&quot;&quot;&quot;" name="title"/>
+            <field name="question_id" ref="survey_question_13"/>
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_0" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I participate to discussion and forums&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_8"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_1" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I'd like to contribute but I don't know how ?&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_8"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_2" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;There is too many groups defined, security is too complex to set&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_12"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_3" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;There is too few groups defined, security isn't accurate enough&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_12"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_4" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The number of groups is good&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_12"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_5" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The GTK client&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_5"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_6" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The web interface&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_5"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_7" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The KDE client&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_5"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_8" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;At least two of them&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_5"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_9" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Yes, I use a version &lt; 5.0&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_2"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_10" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Yes, I use the 5.0 version, installed locally&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_2"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_11" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Yes, I use the latest version on Odoo&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_2"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_12" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;No, I just tested it&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_2"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_13" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Sales Management&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_6"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_14" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Purchases Management&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_6"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_15" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Financial Management&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_6"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_16" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;CRM / SRM&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_6"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_17" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Project Management&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_6"/>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_18" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Human Ressources&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_6"/>
-			<field eval="6" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_19" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Descriptions and help tooltips are clear enough&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_13"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_20" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Configuration wizard exists for each important setting&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_13"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_21" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Extra modules proposed are relevant&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_13"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_22" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The current menu structure is good&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_4"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_23" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;It can be improved&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_4"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_24" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;They are too much menus, it's complex to understand&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_4"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_25" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I develop new features&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_8"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_26" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I help to translate&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_8"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_27" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I write documentations&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_8"/>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_28" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Running the configuration wizards is a good way to spare time&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_13"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_29" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I use Launchpad, like all official OpenERP projects&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_7"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_30" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The security rules defined on groups are helpfull&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_9"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_31" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;They are covering all objects&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_9"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_32" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;Those security rules are standard and can be used out-of-the-box in most cases&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_9"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_33" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The 'Usability/Extended View' group helps in daily work&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_9"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_34" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The 'Usability/Extended View' group hides only optional fields&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_9"/>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_35" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;The groups set on menu items are relevant&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_9"/>
-			<field eval="6" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_36" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;It is up-to-date&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_0"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_37" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;It helps in the beginning&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_0"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_38" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I use the contextual help in OpenERP&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_0"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_39" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;It is complete&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_0"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_40" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;It is clear&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_0"/>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_41" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;They help new users to understand OpenERP&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_1"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_42" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;They are clean and correct&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_1"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_43" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;They are useful on a daily usage&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_1"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_44" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;A process is defined for all enterprise flows&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_1"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_45" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;It's easy to find the process you need&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_1"/>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_46" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I use another repository system (sourceforge, ...)&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_7"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_47" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I host on my own website&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_7"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_48" model="survey.answer">
-		    <field name="in_visible_answer_type">1</field>
-			<field eval="&quot;&quot;&quot;I don't publish my developments&quot;&quot;&quot;" name="answer"/>
-			<field name="question_id" ref="survey_question_7"/>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_0" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I participate to discussion and forums&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_8"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_1" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I'd like to contribute but I don't know how ?&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_8"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_2" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;There is too many groups defined, security is too complex to set&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_12"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_3" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;There is too few groups defined, security isn't accurate enough&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_12"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_4" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The number of groups is good&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_12"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_5" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The GTK client&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_5"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_6" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The web interface&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_5"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_7" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The KDE client&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_5"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_8" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;At least two of them&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_5"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_9" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Yes, I use a version &lt; 5.0&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_2"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_10" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Yes, I use the 5.0 version, installed locally&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_2"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_11" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Yes, I use the latest version on Odoo&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_2"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_12" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;No, I just tested it&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_2"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_13" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Sales Management&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_14" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Purchases Management&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_15" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Financial Management&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_16" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;CRM / SRM&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_17" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Project Management&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_18" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Human Ressources&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_6"/>
+            <field eval="6" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_19" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Descriptions and help tooltips are clear enough&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_13"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_20" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Configuration wizard exists for each important setting&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_13"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_21" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Extra modules proposed are relevant&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_13"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_22" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The current menu structure is good&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_4"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_23" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;It can be improved&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_4"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_24" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;They are too much menus, it's complex to understand&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_4"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_25" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I develop new features&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_8"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_26" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I help to translate&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_8"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_27" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I write documentations&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_8"/>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_28" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Running the configuration wizards is a good way to spare time&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_13"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_29" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I use Launchpad, like all official OpenERP projects&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_7"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_30" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The security rules defined on groups are helpfull&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_9"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_31" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;They are covering all objects&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_9"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_32" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;Those security rules are standard and can be used out-of-the-box in most cases&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_9"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_33" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The 'Usability/Extended View' group helps in daily work&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_9"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_34" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The 'Usability/Extended View' group hides only optional fields&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_9"/>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_35" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;The groups set on menu items are relevant&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_9"/>
+            <field eval="6" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_36" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;It is up-to-date&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_0"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_37" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;It helps in the beginning&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_0"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_38" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I use the contextual help in OpenERP&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_0"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_39" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;It is complete&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_0"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_40" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;It is clear&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_0"/>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_41" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;They help new users to understand OpenERP&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_1"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_42" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;They are clean and correct&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_1"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_43" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;They are useful on a daily usage&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_1"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_44" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;A process is defined for all enterprise flows&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_1"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_45" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;It's easy to find the process you need&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_1"/>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_46" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I use another repository system (sourceforge, ...)&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_7"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_47" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I host on my own website&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_7"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_48" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
+            <field eval="&quot;&quot;&quot;I don't publish my developments&quot;&quot;&quot;" name="answer"/>
+            <field name="question_id" ref="survey_question_7"/>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
 
 
 
-	<data noupdate="1">
-		<record id="survey_0_Community" model="survey">
-			<field name="title">Community Survey</field>
-			<field name="note">Please take a few minutes to complete this survey on the quality of service we provide. We welcome your feedback and appreciate your honesty. With your help, we hope to strengthen the bond between our clients.</field>
-			<field eval="1" name="response_user"/>
-			<field name="state">draft</field>
-			<field name="responsible_id" ref="base.user_root"/>
-			<field eval="1" name="send_response"/>
-			<field eval="[(6,0,[])]" name="users"/>
-			<field name="type" ref="survey_type3"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_0_Community" model="survey.page">
-			<field name="title">Service Characteristics</field>
-			<field name="survey_id" ref="survey_0_Community"/>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_1_Community" model="survey.page">
-			<field name="title">Performance Indicator</field>
-			<field name="survey_id" ref="survey_0_Community"/>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_page_2_Community" model="survey.page">
-			<field name="title">Client Information</field>
-			<field name="survey_id" ref="survey_0_Community"/>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_0_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="1" name="sequence"/>
-			<field name="question">Please rank, your criteria for choosing an organization.</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">matrix_of_choices_only_one_ans</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_0_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_1_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="2" name="sequence"/>
-			<field name="question">Please rate the following questions.</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">matrix_of_choices_only_one_ans</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_0_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_2_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="3" name="sequence"/>
-			<field name="question">How would you prefer for us to provide most communications?</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="1" name="is_comment_require"/>
-			<field name="type">multiple_choice_only_one_ans</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_0_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_3_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="4" name="sequence"/>
-			<field name="question">What should we improve on (please be specific)?</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">comment</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_1_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_4_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="5" name="sequence"/>
-			<field name="question">What do we do well?</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">comment</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_1_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_5_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="6" name="sequence"/>
-			<field name="question">What are the most important challenges facing your organization this year?</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">comment</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_1_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_6_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="7" name="sequence"/>
-			<field name="question">How can we help you do your job better?</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">comment</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_1_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_7_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="8" name="sequence"/>
-			<field name="question">Please provide any additional comments.</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">comment</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_1_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_8_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="9" name="sequence"/>
-			<field name="question">Contact information</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">multiple_textboxes_diff_type</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_2_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_9_Community" model="survey.question">
-			<field name="validation_type">do_not_validate</field>
-			<field name="comment_valid_type">do_not_validate</field>
-			<field name="make_comment_field_err_msg">Please enter a comment.</field>
-			<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-			<field eval="0" name="comment_column"/>
-			<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="rating_allow_one_column_require"/>
-			<field eval="0" name="is_validation_require"/>
-			<field name="req_error_msg">This question requires an answer.</field>
-			<field eval="10" name="sequence"/>
-			<field name="question">How many years have you been a client?</field>
-			<field name="comment_field_type">char</field>
-			<field eval="0" name="is_require_answer"/>
-			<field eval="0" name="is_comment_require"/>
-			<field name="type">multiple_choice_only_one_ans</field>
-			<field eval="1" name="req_ans"/>
-			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-			<field eval="0" name="make_comment_field"/>
-			<field eval="1" name="in_visible_menu_choice"/>
-			<field eval="1" name="in_visible_answer_type"/>
-			<field name="page_id" ref="survey_page_2_Community"/>
-			<field name="required_type">at least</field>
-			<field name="comment_label">Other (please specify)</field>
-			<field eval="1" name="in_visible_rating_weight"/>
-			<field eval="0" name="allow_comment"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_0_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Most Important</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_0_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_1_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Very Important</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_0_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_2_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Important</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_0_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_3_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Less Important</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_0_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_4_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Not Important</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_0_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_5_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Excellent</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_1_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_6_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Above Average</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_1_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_7_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Average</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_1_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_8_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Below Average</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_1_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_9_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">Poor</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_1_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_question_column_heading_10_Community" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
-			<field name="title">N/A</field>
-			<field eval="0" name="in_visible_rating_weight"/>
-			<field name="question_id" ref="survey_question_1_Community"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_0_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Email</field>
-			<field name="question_id" ref="survey_question_2_Community"/>
-			<field name="type">char</field>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_1_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">The quality of our responses to your questions and concerns.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_2_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">0 - 2 years</field>
-			<field name="question_id" ref="survey_question_9_Community"/>
-			<field name="type">char</field>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_3_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Name</field>
-			<field name="question_id" ref="survey_question_8_Community"/>
-			<field name="type">char</field>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_4_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Industry/marketplace knowledge</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="1" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_5_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Phone</field>
-			<field name="question_id" ref="survey_question_2_Community"/>
-			<field name="type">char</field>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_6_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">3 - 5 years</field>
-			<field name="question_id" ref="survey_question_9_Community"/>
-			<field name="type">char</field>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_7_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Length of time in business</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_8_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">The timeliness of our Representatives' response to your needs.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_9_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Company</field>
-			<field name="question_id" ref="survey_question_8_Community"/>
-			<field name="type">char</field>
-			<field eval="2" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_10_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">The knowledge level of your Representative.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_11_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Mail</field>
-			<field name="question_id" ref="survey_question_2_Community"/>
-			<field name="type">char</field>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_12_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Phone number</field>
-			<field name="question_id" ref="survey_question_8_Community"/>
-			<field name="type">char</field>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_13_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Consultative capabilities</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_14_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">6 - 10 years</field>
-			<field name="question_id" ref="survey_question_9_Community"/>
-			<field name="type">char</field>
-			<field eval="3" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_15_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">10 + years</field>
-			<field name="question_id" ref="survey_question_9_Community"/>
-			<field name="type">char</field>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_16_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Your Representative keeps you informed of changes.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_17_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Face-to-Face</field>
-			<field name="question_id" ref="survey_question_2_Community"/>
-			<field name="type">char</field>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_18_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Technology and Tools provided</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_19_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Email address</field>
-			<field name="question_id" ref="survey_question_8_Community"/>
-			<field name="type">email</field>
-			<field eval="4" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_20_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Other</field>
-			<field name="question_id" ref="survey_question_2_Community"/>
-			<field name="type">char</field>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_21_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Personal Referral</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_22_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">How is our ability to anticipate your needs and provide assistance pro actively.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="5" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_23_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Lowest rate</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="6" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_24_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Our products and services we provide meet your objectives.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="6" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_25_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Responsiveness to requests</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="7" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_26_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">We are easy to work with.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="7" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_27_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Value-added services</field>
-			<field name="question_id" ref="survey_question_0_Community"/>
-			<field name="type">char</field>
-			<field eval="8" name="sequence"/>
-		</record>
-	</data>
-	<data>
-		<record id="survey_answer_28_Community" model="survey.answer">
-			<field eval="0" name="in_visible_answer_type"/>
-			<field name="answer">Overall, how do you rank our services to you.</field>
-			<field name="question_id" ref="survey_question_1_Community"/>
-			<field name="type">char</field>
-			<field eval="8" name="sequence"/>
-		</record>
-	</data>
-	
-	<!--  Survey Response -->
-	
-	<data noupdate="1">
-		<record id="survey_history_0" model="survey.history">
-			<field name="date">2010-03-03 14:25:03</field>
-			<field name="survey_id" ref="survey.survey_partner_feedback"/>
-			<field name="user_id" ref="base.user_root"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_history_1" model="survey.history">
-			<field name="date">2010-03-03 14:29:36</field>
-			<field name="survey_id" ref="survey.survey_odoo_feedback"/>
-			<field name="user_id" ref="base.user_root"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_0" model="survey.response">
-			<field name="date_create">2010-03-03 14:25:03.603599</field>
-			<field name="state">done</field>
-			<field name="survey_id" ref="survey.survey_partner_feedback"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field name="response_type">link</field>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_1" model="survey.response">
-			<field name="date_create">2010-03-03 14:29:36.247905</field>
-			<field name="state">done</field>
-			<field name="survey_id" ref="survey.survey_odoo_feedback"/>
-			<field name="user_id" ref="base.user_root"/>
-			<field name="response_type">link</field>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_0" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:03.631622</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_your_customers"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_1" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:03.653849</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_located"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_2" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:03.671836</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_company_size"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_3" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:03.689999</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_offical_partner"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_4" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:03.706175</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="single_text">Tiny ERP</field>
-			<field name="question_id" ref="survey.survey_question_company_name"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_5" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:29.087116</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_partnership_contract"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_6" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:29.107571</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_contract_customers"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_7" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:25:29.126023</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_sell_to_your_customers"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_8" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:26:14.844451</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_partners_about"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_9" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:26:14.872224</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_launchpad_reporting"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_10" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:26:14.897764</field>
-			<field name="state">skip</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_partners_on_which_subjects"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_11" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:26:14.918989</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_0"/>
-			<field name="question_id" ref="survey.survey_question_Leads"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_12" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:29:36.27459</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_discover_odoo"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_13" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:29:36.301461</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_company_sector"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_14" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:29:36.33203</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="single_text">Tiny ERP</field>
-			<field name="question_id" ref="survey.survey_question_odoo_company_name"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_15" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:29:36.35911</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_mange_with_odoo"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_16" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:30:11.376172</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_continue_using_odoo"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_17" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:30:11.397675</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_subscribe_to_odoo"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_18" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:30:11.414119</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_configure_the_application"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_19" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:31:18.637519</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_would_you_prefer_use"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_20" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:31:18.653091</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="single_text">survey</field>
-			<field name="question_id" ref="survey.survey_question_odoo_modules_are_missing_in_odoo"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_21" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:31:18.669619</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_give_your_opinion"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_22" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:31:18.691933</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_you_think_about"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_23" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:32:08.47899</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_dms"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_24" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:32:08.501274</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_offer_opinion_about_odoo"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_25" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:32:08.523878</field>
-			<field name="state">skip</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_offer_comments_them_here"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_26" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:32:08.538988</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_would_you_prefer_receive_your_prepaid_bill"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_line_27" model="survey.response.line">
-			<field name="date_create">2010-03-03 14:32:08.555196</field>
-			<field name="state">done</field>
-			<field name="response_id" ref="survey_response_1"/>
-			<field name="question_id" ref="survey.survey_question_odoo_support_services"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_0" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_0"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_answer_saas_services"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_1" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_0"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_answer_specific_devlopments"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_2" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_0"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_answer_with_specific_devlopments"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_3" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_1"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_company_size_Europ"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_4" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_1"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_company_size_Asia"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_5" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_2"/>
-			<field name="answer_id" ref="survey.survey_question_company_size_51"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_6" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_3"/>
-			<field name="answer_id" ref="survey.survey_question_company_size_before_2006"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_7" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_5"/>
-			<field name="answer_id" ref="survey.survey_answer_Clear"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_8" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_6"/>
-			<field name="answer_id" ref="survey.survey_answer_sometimes"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_9" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_7"/>
-			<field name="answer_id" ref="survey.survey_answer_maintenance_contract"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_10" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_Good"/>
-			<field name="response_id" ref="survey_response_line_8"/>
-			<field name="answer_id" ref="survey.survey_answer_Maintenance_contracts"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_11" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_Very_Good"/>
-			<field name="response_id" ref="survey_response_line_8"/>
-			<field name="answer_id" ref="survey.survey_answer_partner_Leads"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_12" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_Very_Good"/>
-			<field name="response_id" ref="survey_response_line_8"/>
-			<field name="answer_id" ref="survey.survey_answer_Training_sessions"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_13" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_yes_but_could_better"/>
-			<field name="response_id" ref="survey_response_line_9"/>
-			<field name="answer_id" ref="survey.survey_answer_modify_a_translation"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_14" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_No"/>
-			<field name="response_id" ref="survey_response_line_9"/>
-			<field name="answer_id" ref="survey.survey_answer_bug_or_blueprint"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_15" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_yes_but_could_better"/>
-			<field name="response_id" ref="survey_response_line_9"/>
-			<field name="answer_id" ref="survey.survey_answer_find_openobject_website1"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_16" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_Easy"/>
-			<field name="response_id" ref="survey_response_line_11"/>
-			<field name="answer_id" ref="survey.survey_answer_converted_in_customers"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_17" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_Very_Easy"/>
-			<field name="response_id" ref="survey_response_line_11"/>
-			<field name="answer_id" ref="survey.survey_answer_find_openobject_website"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_18" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_12"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_OpenERP_website"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_19" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_13"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Other_sector"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_20" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_13"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Services"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_21" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_13"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_HR"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_22" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_13"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Engineering"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_23" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_15"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Customer_Accounting_Finance"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_24" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_15"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Customer_Relationship_Management"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_25" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_15"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Sales_Purchases"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_26" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_15"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Customer_Human_Resources"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_27" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_15"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Other_odoo_mange_with_odoo"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_28" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_15"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Project_Management"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_29" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_15"/>
-			<field name="answer">1</field>
-			<field name="answer_id" ref="survey.survey_question_Customer_inventory_Management"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_30" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_16"/>
-			<field name="answer_id" ref="survey.survey_answer_yes"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_31" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_17"/>
-			<field name="answer_id" ref="survey.survey_answer_switch_to_online_offer1"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_32" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_couple_of_hours"/>
-			<field name="response_id" ref="survey_response_line_18"/>
-			<field name="answer_id" ref="survey.survey_answer_importing_my_data"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_33" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_couple_of_minutes"/>
-			<field name="response_id" ref="survey_response_line_18"/>
-			<field name="answer_id" ref="survey.survey_answer_initial_data"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_34" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_couple_of_minutes"/>
-			<field name="response_id" ref="survey_response_line_18"/>
-			<field name="answer_id" ref="survey.survey_answer_switch_to_online_offer"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_35" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_couple_of_hours"/>
-			<field name="response_id" ref="survey_response_line_18"/>
-			<field name="answer_id" ref="survey.survey_answer_configuring_the_modules"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_36" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_couple_of_hours"/>
-			<field name="response_id" ref="survey_response_line_18"/>
-			<field name="answer_id" ref="survey.survey_answer_adding_modules_need"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_37" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_19"/>
-			<field name="answer_id" ref="survey.survey_answer_both_interface"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_38" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_yes_but_be_better"/>
-			<field name="response_id" ref="survey_response_line_21"/>
-			<field name="answer_id" ref="survey.survey_answer_faq_clear_and_choicese"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_39" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_no_opinion"/>
-			<field name="response_id" ref="survey_response_line_21"/>
-			<field name="answer_id" ref="survey.survey_answer_webclient_simple_and_useful"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_40" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_Absolutely"/>
-			<field name="response_id" ref="survey_response_line_21"/>
-			<field name="answer_id" ref="survey.survey_answer_control_center_user_friendly"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_41" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_no_opinion"/>
-			<field name="response_id" ref="survey_response_line_21"/>
-			<field name="answer_id" ref="survey.survey_answer_appropriately_structured"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_42" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_think_Easy"/>
-			<field name="response_id" ref="survey_response_line_22"/>
-			<field name="answer_id" ref="survey.survey_answer_downloadin_your_backups"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_43" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_think_Difficult"/>
-			<field name="response_id" ref="survey_response_line_22"/>
-			<field name="answer_id" ref="survey.survey_answer_duplicating_database"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_44" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_think_Easy"/>
-			<field name="response_id" ref="survey_response_line_22"/>
-			<field name="answer_id" ref="survey.survey_answer_database_new_version"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_45" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_23"/>
-			<field name="answer_id" ref="survey.survey_answer_No"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_46" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_pricing_No_Opinion"/>
-			<field name="response_id" ref="survey_response_line_24"/>
-			<field name="answer_id" ref="survey.survey_answer_pricing_understanding"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_47" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_pricing_Very_Good"/>
-			<field name="response_id" ref="survey_response_line_24"/>
-			<field name="answer_id" ref="survey.survey_answer_pricing_available_modules"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_48" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_pricing_Good"/>
-			<field name="response_id" ref="survey_response_line_24"/>
-			<field name="answer_id" ref="survey.survey_answer_pricing_criteria"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_49" model="survey.response.answer">
-			<field name="response_id" ref="survey_response_line_26"/>
-			<field name="answer_id" ref="survey.survey_answer_Monthly"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_50" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_offer_Very_Good"/>
-			<field name="response_id" ref="survey_response_line_27"/>
-			<field name="answer_id" ref="survey.survey_answer_pertinence_our_answer"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="survey_response_answer_51" model="survey.response.answer">
-			<field name="column_id" ref="survey.survey_column_offer_Good"/>
-			<field name="response_id" ref="survey_response_line_27"/>
-			<field name="answer_id" ref="survey.survey_answer_our_answer_is"/>
-		</record>
-	</data>
+    <data noupdate="1">
+        <record id="survey_0_Community" model="survey">
+            <field name="title">Community Survey</field>
+            <field name="note">Please take a few minutes to complete this survey on the quality of service we provide. We welcome your feedback and appreciate your honesty. With your help, we hope to strengthen the bond between our clients.</field>
+            <field eval="6" name="response_user"/>
+            <field name="state">draft</field>
+            <field name="responsible_id" ref="base.user_root"/>
+            <field eval="1" name="send_response"/>
+            <field eval="[(6,0,[])]" name="users"/>
+            <field name="type" ref="survey_type3"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_0_Community" model="survey.page">
+            <field name="title">Service Characteristics</field>
+            <field name="survey_id" ref="survey_0_Community"/>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_1_Community" model="survey.page">
+            <field name="title">Performance Indicator</field>
+            <field name="survey_id" ref="survey_0_Community"/>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_page_2_Community" model="survey.page">
+            <field name="title">Client Information</field>
+            <field name="survey_id" ref="survey_0_Community"/>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_0_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="1" name="sequence"/>
+            <field name="question">Please rank, your criteria for choosing an organization.</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_0_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_1_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="2" name="sequence"/>
+            <field name="question">Please rate the following questions.</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">matrix_of_choices_only_one_ans</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_0_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_2_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="3" name="sequence"/>
+            <field name="question">How would you prefer for us to provide most communications?</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="1" name="is_comment_require"/>
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_0_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_3_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="4" name="sequence"/>
+            <field name="question">What should we improve on (please be specific)?</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">comment</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_1_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_4_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="5" name="sequence"/>
+            <field name="question">What do we do well?</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">comment</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_1_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_5_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="6" name="sequence"/>
+            <field name="question">What are the most important challenges facing your organization this year?</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">comment</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_1_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_6_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="7" name="sequence"/>
+            <field name="question">How can we help you do your job better?</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">comment</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_1_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_7_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="8" name="sequence"/>
+            <field name="question">Please provide any additional comments.</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">comment</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_1_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_8_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="9" name="sequence"/>
+            <field name="question">Contact information</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">multiple_textboxes_diff_type</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_2_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_9_Community" model="survey.question">
+            <field name="validation_type">do_not_validate</field>
+            <field name="comment_valid_type">do_not_validate</field>
+            <field name="make_comment_field_err_msg">Please enter a comment.</field>
+            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
+            <field eval="0" name="comment_column"/>
+            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="rating_allow_one_column_require"/>
+            <field eval="0" name="is_validation_require"/>
+            <field name="req_error_msg">This question requires an answer.</field>
+            <field eval="10" name="sequence"/>
+            <field name="question">How many years have you been a client?</field>
+            <field name="comment_field_type">char</field>
+            <field eval="0" name="is_require_answer"/>
+            <field eval="0" name="is_comment_require"/>
+            <field name="type">multiple_choice_only_one_ans</field>
+            <field eval="1" name="req_ans"/>
+            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
+            <field eval="0" name="make_comment_field"/>
+            <field eval="1" name="in_visible_menu_choice"/>
+            <field eval="1" name="in_visible_answer_type"/>
+            <field name="page_id" ref="survey_page_2_Community"/>
+            <field name="required_type">at least</field>
+            <field name="comment_label">Other (please specify)</field>
+            <field eval="1" name="in_visible_rating_weight"/>
+            <field eval="0" name="allow_comment"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_0_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Most Important</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_0_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_1_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Very Important</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_0_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_2_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Important</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_0_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_3_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Less Important</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_0_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_4_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Not Important</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_0_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_5_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Excellent</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_1_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_6_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Above Average</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_1_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_7_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Average</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_1_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_8_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Below Average</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_1_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_9_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">Poor</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_1_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_question_column_heading_10_Community" model="survey.question.column.heading">
+            <field eval="0" name="in_visible_menu_choice"/>
+            <field name="title">N/A</field>
+            <field eval="0" name="in_visible_rating_weight"/>
+            <field name="question_id" ref="survey_question_1_Community"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_0_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Email</field>
+            <field name="question_id" ref="survey_question_2_Community"/>
+            <field name="type">char</field>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_1_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">The quality of our responses to your questions and concerns.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_2_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">0 - 2 years</field>
+            <field name="question_id" ref="survey_question_9_Community"/>
+            <field name="type">char</field>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_3_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Name</field>
+            <field name="question_id" ref="survey_question_8_Community"/>
+            <field name="type">char</field>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_4_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Industry/marketplace knowledge</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="1" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_5_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Phone</field>
+            <field name="question_id" ref="survey_question_2_Community"/>
+            <field name="type">char</field>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_6_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">3 - 5 years</field>
+            <field name="question_id" ref="survey_question_9_Community"/>
+            <field name="type">char</field>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_7_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Length of time in business</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_8_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">The timeliness of our Representatives' response to your needs.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_9_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Company</field>
+            <field name="question_id" ref="survey_question_8_Community"/>
+            <field name="type">char</field>
+            <field eval="2" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_10_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">The knowledge level of your Representative.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_11_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Mail</field>
+            <field name="question_id" ref="survey_question_2_Community"/>
+            <field name="type">char</field>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_12_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Phone number</field>
+            <field name="question_id" ref="survey_question_8_Community"/>
+            <field name="type">char</field>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_13_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Consultative capabilities</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_14_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">6 - 10 years</field>
+            <field name="question_id" ref="survey_question_9_Community"/>
+            <field name="type">char</field>
+            <field eval="3" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_15_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">10 + years</field>
+            <field name="question_id" ref="survey_question_9_Community"/>
+            <field name="type">char</field>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_16_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Your Representative keeps you informed of changes.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_17_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Face-to-Face</field>
+            <field name="question_id" ref="survey_question_2_Community"/>
+            <field name="type">char</field>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_18_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Technology and Tools provided</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_19_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Email address</field>
+            <field name="question_id" ref="survey_question_8_Community"/>
+            <field name="type">email</field>
+            <field eval="4" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_20_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Other</field>
+            <field name="question_id" ref="survey_question_2_Community"/>
+            <field name="type">char</field>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_21_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Personal Referral</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_22_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">How is our ability to anticipate your needs and provide assistance pro actively.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="5" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_23_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Lowest rate</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="6" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_24_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Our products and services we provide meet your objectives.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="6" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_25_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Responsiveness to requests</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="7" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_26_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">We are easy to work with.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="7" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_27_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Value-added services</field>
+            <field name="question_id" ref="survey_question_0_Community"/>
+            <field name="type">char</field>
+            <field eval="8" name="sequence"/>
+        </record>
+    </data>
+    <data>
+        <record id="survey_answer_28_Community" model="survey.answer">
+            <field eval="0" name="in_visible_answer_type"/>
+            <field name="answer">Overall, how do you rank our services to you.</field>
+            <field name="question_id" ref="survey_question_1_Community"/>
+            <field name="type">char</field>
+            <field eval="8" name="sequence"/>
+        </record>
+    </data>
+    
+    <!--  Survey Response -->
+    
+    <data noupdate="1">
+        <record id="survey_history_0" model="survey.history">
+            <field name="date">2010-03-03 14:25:03</field>
+            <field name="survey_id" ref="survey.survey_partner_feedback"/>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_history_1" model="survey.history">
+            <field name="date">2010-03-03 14:29:36</field>
+            <field name="survey_id" ref="survey.survey_odoo_feedback"/>
+            <field name="user_id" ref="base.user_root"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_0" model="survey.response">
+            <field name="date_create">2010-03-03 14:25:03.603599</field>
+            <field name="state">done</field>
+            <field name="survey_id" ref="survey.survey_partner_feedback"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="response_type">link</field>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_1" model="survey.response">
+            <field name="date_create">2010-03-03 14:29:36.247905</field>
+            <field name="state">done</field>
+            <field name="survey_id" ref="survey.survey_odoo_feedback"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="response_type">link</field>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_0" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:03.631622</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_your_customers"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_1" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:03.653849</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_located"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_2" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:03.671836</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_company_size"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_3" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:03.689999</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_offical_partner"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_4" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:03.706175</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="single_text">Tiny ERP</field>
+            <field name="question_id" ref="survey.survey_question_company_name"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_5" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:29.087116</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_partnership_contract"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_6" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:29.107571</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_contract_customers"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_7" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:25:29.126023</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_sell_to_your_customers"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_8" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:26:14.844451</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_partners_about"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_9" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:26:14.872224</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_launchpad_reporting"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_10" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:26:14.897764</field>
+            <field name="state">skip</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_partners_on_which_subjects"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_11" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:26:14.918989</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_0"/>
+            <field name="question_id" ref="survey.survey_question_Leads"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_12" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:29:36.27459</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_discover_odoo"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_13" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:29:36.301461</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_company_sector"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_14" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:29:36.33203</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="single_text">Tiny ERP</field>
+            <field name="question_id" ref="survey.survey_question_odoo_company_name"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_15" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:29:36.35911</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_mange_with_odoo"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_16" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:30:11.376172</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_continue_using_odoo"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_17" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:30:11.397675</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_subscribe_to_odoo"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_18" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:30:11.414119</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_configure_the_application"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_19" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:31:18.637519</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_would_you_prefer_use"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_20" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:31:18.653091</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="single_text">survey</field>
+            <field name="question_id" ref="survey.survey_question_odoo_modules_are_missing_in_odoo"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_21" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:31:18.669619</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_give_your_opinion"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_22" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:31:18.691933</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_you_think_about"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_23" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:32:08.47899</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_dms"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_24" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:32:08.501274</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_offer_opinion_about_odoo"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_25" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:32:08.523878</field>
+            <field name="state">skip</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_offer_comments_them_here"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_26" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:32:08.538988</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_would_you_prefer_receive_your_prepaid_bill"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_line_27" model="survey.response.line">
+            <field name="date_create">2010-03-03 14:32:08.555196</field>
+            <field name="state">done</field>
+            <field name="response_id" ref="survey_response_1"/>
+            <field name="question_id" ref="survey.survey_question_odoo_support_services"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_0" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_0"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_answer_saas_services"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_1" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_0"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_answer_specific_devlopments"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_2" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_0"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_answer_with_specific_devlopments"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_3" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_1"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_company_size_Europ"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_4" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_1"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_company_size_Asia"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_5" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_2"/>
+            <field name="answer_id" ref="survey.survey_question_company_size_51"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_6" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_3"/>
+            <field name="answer_id" ref="survey.survey_question_company_size_before_2006"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_7" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_5"/>
+            <field name="answer_id" ref="survey.survey_answer_Clear"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_8" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_6"/>
+            <field name="answer_id" ref="survey.survey_answer_sometimes"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_9" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_7"/>
+            <field name="answer_id" ref="survey.survey_answer_maintenance_contract"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_10" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_Good"/>
+            <field name="response_id" ref="survey_response_line_8"/>
+            <field name="answer_id" ref="survey.survey_answer_Maintenance_contracts"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_11" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_Very_Good"/>
+            <field name="response_id" ref="survey_response_line_8"/>
+            <field name="answer_id" ref="survey.survey_answer_partner_Leads"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_12" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_Very_Good"/>
+            <field name="response_id" ref="survey_response_line_8"/>
+            <field name="answer_id" ref="survey.survey_answer_Training_sessions"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_13" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_yes_but_could_better"/>
+            <field name="response_id" ref="survey_response_line_9"/>
+            <field name="answer_id" ref="survey.survey_answer_modify_a_translation"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_14" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_No"/>
+            <field name="response_id" ref="survey_response_line_9"/>
+            <field name="answer_id" ref="survey.survey_answer_bug_or_blueprint"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_15" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_yes_but_could_better"/>
+            <field name="response_id" ref="survey_response_line_9"/>
+            <field name="answer_id" ref="survey.survey_answer_find_openobject_website1"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_16" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_Easy"/>
+            <field name="response_id" ref="survey_response_line_11"/>
+            <field name="answer_id" ref="survey.survey_answer_converted_in_customers"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_17" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_Very_Easy"/>
+            <field name="response_id" ref="survey_response_line_11"/>
+            <field name="answer_id" ref="survey.survey_answer_find_openobject_website"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_18" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_12"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_OpenERP_website"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_19" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_13"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Other_sector"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_20" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_13"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Services"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_21" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_13"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_HR"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_22" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_13"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Engineering"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_23" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Customer_Accounting_Finance"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_24" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Customer_Relationship_Management"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_25" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Sales_Purchases"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_26" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Customer_Human_Resources"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_27" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Other_odoo_mange_with_odoo"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_28" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Project_Management"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_29" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_15"/>
+            <field name="answer">1</field>
+            <field name="answer_id" ref="survey.survey_question_Customer_inventory_Management"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_30" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_16"/>
+            <field name="answer_id" ref="survey.survey_answer_yes"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_31" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_17"/>
+            <field name="answer_id" ref="survey.survey_answer_switch_to_online_offer1"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_32" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_couple_of_hours"/>
+            <field name="response_id" ref="survey_response_line_18"/>
+            <field name="answer_id" ref="survey.survey_answer_importing_my_data"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_33" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_couple_of_minutes"/>
+            <field name="response_id" ref="survey_response_line_18"/>
+            <field name="answer_id" ref="survey.survey_answer_initial_data"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_34" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_couple_of_minutes"/>
+            <field name="response_id" ref="survey_response_line_18"/>
+            <field name="answer_id" ref="survey.survey_answer_switch_to_online_offer"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_35" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_couple_of_hours"/>
+            <field name="response_id" ref="survey_response_line_18"/>
+            <field name="answer_id" ref="survey.survey_answer_configuring_the_modules"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_36" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_couple_of_hours"/>
+            <field name="response_id" ref="survey_response_line_18"/>
+            <field name="answer_id" ref="survey.survey_answer_adding_modules_need"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_37" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_19"/>
+            <field name="answer_id" ref="survey.survey_answer_both_interface"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_38" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_yes_but_be_better"/>
+            <field name="response_id" ref="survey_response_line_21"/>
+            <field name="answer_id" ref="survey.survey_answer_faq_clear_and_choicese"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_39" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_no_opinion"/>
+            <field name="response_id" ref="survey_response_line_21"/>
+            <field name="answer_id" ref="survey.survey_answer_webclient_simple_and_useful"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_40" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_Absolutely"/>
+            <field name="response_id" ref="survey_response_line_21"/>
+            <field name="answer_id" ref="survey.survey_answer_control_center_user_friendly"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_41" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_no_opinion"/>
+            <field name="response_id" ref="survey_response_line_21"/>
+            <field name="answer_id" ref="survey.survey_answer_appropriately_structured"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_42" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_think_Easy"/>
+            <field name="response_id" ref="survey_response_line_22"/>
+            <field name="answer_id" ref="survey.survey_answer_downloadin_your_backups"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_43" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_think_Difficult"/>
+            <field name="response_id" ref="survey_response_line_22"/>
+            <field name="answer_id" ref="survey.survey_answer_duplicating_database"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_44" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_think_Easy"/>
+            <field name="response_id" ref="survey_response_line_22"/>
+            <field name="answer_id" ref="survey.survey_answer_database_new_version"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_45" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_23"/>
+            <field name="answer_id" ref="survey.survey_answer_No"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_46" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_pricing_No_Opinion"/>
+            <field name="response_id" ref="survey_response_line_24"/>
+            <field name="answer_id" ref="survey.survey_answer_pricing_understanding"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_47" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_pricing_Very_Good"/>
+            <field name="response_id" ref="survey_response_line_24"/>
+            <field name="answer_id" ref="survey.survey_answer_pricing_available_modules"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_48" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_pricing_Good"/>
+            <field name="response_id" ref="survey_response_line_24"/>
+            <field name="answer_id" ref="survey.survey_answer_pricing_criteria"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_49" model="survey.response.answer">
+            <field name="response_id" ref="survey_response_line_26"/>
+            <field name="answer_id" ref="survey.survey_answer_Monthly"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_50" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_offer_Very_Good"/>
+            <field name="response_id" ref="survey_response_line_27"/>
+            <field name="answer_id" ref="survey.survey_answer_pertinence_our_answer"/>
+        </record>
+    </data>
+    <data noupdate="1">
+        <record id="survey_response_answer_51" model="survey.response.answer">
+            <field name="column_id" ref="survey.survey_column_offer_Good"/>
+            <field name="response_id" ref="survey_response_line_27"/>
+            <field name="answer_id" ref="survey.survey_answer_our_answer_is"/>
+        </record>
+    </data>
 
-</openerp>
\ No newline at end of file
+</openerp>