diff --git a/addons/gamification_sale_crm/__openerp__.py b/addons/gamification_sale_crm/__openerp__.py
index b8b9444d643..429292e0025 100644
--- a/addons/gamification_sale_crm/__openerp__.py
+++ b/addons/gamification_sale_crm/__openerp__.py
@@ -26,8 +26,7 @@
     'depends': ['gamification','sale_crm'],
     'description': """Example of goal types and plans that can be used related to the usage of the CRM Sale module.""",
 
-    'data': [
-    	'sale_crm_goals.xml',
-        ],
+    'data': ['sale_crm_goals.xml'],
+    'demo': ['sale_crm_goals_demo.xml'],
     'auto_install': True,
 }
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 3541b658791..2269de8f856 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -2,32 +2,14 @@
 <openerp>
     <data>
 
-        <!-- 
-            plan sale
-                invocie of the month
-                delais de fermeture
-                commandes crees ce mois
-                factures payees
-                note de credit
-            plan marketing
-                delais d'ouverture
-                # new leads
-                # new opportunities
-
-
-        invoice of the month
-    
-
-         -->
-
         <!-- goal types -->
         <record model="gamification.goal.type" id="type_crm_tot_invoices">
             <field name="name">Total Invoiced</field>
             <field name="description"></field>
             <field name="computation_mode">sum</field>
-            <field name="model_id" eval="str(ref('account.model_account_invoice_report'))" />
-            <field name="field_id" eval="str(ref('account.field_account_invoice_report_price_total'))" />
-            <field name="field_date_id" eval="str(ref('account.field_account_invoice_report_day'))" />
+            <field name="model_id" eval="ref('account.model_account_invoice_report')" />
+            <field name="field_id" eval="ref('account.field_account_invoice_report_price_total')" />
+            <field name="field_date_id" eval="ref('account.field_account_invoice_report_day')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user_id)]</field>
         </record> 
 
@@ -36,9 +18,9 @@
             <field name="description">The average number of days to open the case (less than)</field>
             <field name="computation_mode">sum</field>
             <field name="condition">minus</field>
-            <field name="model_id" eval="str(ref('crm.model_crm_lead_report'))" />
-            <field name="field_id" eval="str(ref('crm.field_crm_lead_report_delay_close'))" />
-            <field name="field_date_id" eval="str(ref('crm.field_crm_lead_report_date_closed'))" />
+            <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
+            <field name="field_id" eval="ref('crm.field_crm_lead_report_delay_close')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_lead_report_date_closed')" />
             <field name="domain">[('user_id','=',user_id)]</field>
         </record> 
 
@@ -47,9 +29,9 @@
             <field name="description">The average number of days to close the case (less than)</field>
             <field name="computation_mode">sum</field>
             <field name="condition">minus</field>
-            <field name="model_id" eval="str(ref('crm.model_crm_lead_report'))" />
-            <field name="field_id" eval="str(ref('crm.field_crm_lead_report_delay_open'))" />
-            <field name="field_date_id" eval="str(ref('crm.field_crm_lead_report_opening_date'))" />
+            <field name="model_id" eval="ref('crm.model_crm_lead_report')" />
+            <field name="field_id" eval="ref('crm.field_crm_lead_report_delay_open')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_lead_report_opening_date')" />
             <field name="domain">[('user_id','=',user_id)]</field>
         </record> 
 
@@ -58,8 +40,8 @@
             <field name="name"># Logged Calls</field>
             <field name="description">Log a certain number of calls to reach this goal</field>
             <field name="computation_mode">count</field>
-            <field name="model_id" eval="str(ref('crm.model_crm_phonecall'))" />
-            <field name="field_date_id" eval="str(ref('crm.field_crm_phonecall_date_closed'))" />
+            <field name="model_id" eval="ref('crm.model_crm_phonecall')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_phonecall_date_closed')" />
             <field name="domain">[('user_id','=',user_id),('type','='),('state','=','done')]</field>
         </record> 
 
@@ -67,8 +49,8 @@
             <field name="name"># New Leads</field>
             <field name="description">Based on the creation date</field>
             <field name="computation_mode">count</field>
-            <field name="model_id" eval="str(ref('crm.model_crm_lead'))" />
-            <field name="field_date_id" eval="str(ref('crm.field_crm_lead_create_date'))" />
+            <field name="model_id" eval="ref('crm.model_crm_lead')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_lead_create_date')" />
             <field name="domain">[('user_id','=',user_id)]</field>
         </record>
 
@@ -76,8 +58,8 @@
             <field name="name"># New Opportunities</field>
             <field name="description">Based on the opening date</field>
             <field name="computation_mode">count</field>
-            <field name="model_id" eval="str(ref('crm.model_crm_lead'))" />
-            <field name="field_date_id" eval="str(ref('crm.field_crm_lead_date_open'))" />
+            <field name="model_id" eval="ref('crm.model_crm_lead')" />
+            <field name="field_date_id" eval="ref('crm.field_crm_lead_date_open')" />
             <field name="domain">[('user_id','=',user_id),('type','=','opportunity')]</field>
         </record>
 
@@ -85,8 +67,8 @@
             <field name="name"># New Sales Orders</field>
             <field name="description">Based on the creation date</field>
             <field name="computation_mode">count</field>
-            <field name="model_id" eval="str(ref('sale.model_sale_order'))" />
-            <field name="field_date_id" eval="str(ref('sale.field_sale_order_date_order'))" />
+            <field name="model_id" eval="ref('sale.model_sale_order')" />
+            <field name="field_date_id" eval="ref('sale.field_sale_order_date_order')" />
             <field name="domain">[('user_id','=',user_id),('state','not in',('draft', 'sent', 'cancel'))]</field>
         </record>
 
@@ -95,8 +77,8 @@
             <field name="name"># Paid Sales Orders</field>
             <field name="description">Based on the confirmation date</field>
             <field name="computation_mode">count</field>
-            <field name="model_id" eval="str(ref('sale.model_sale_order'))" />
-            <field name="field_date_id" eval="str(ref('sale.field_sale_order_date_confirm'))" />
+            <field name="model_id" eval="ref('sale.model_sale_order')" />
+            <field name="field_date_id" eval="ref('sale.field_sale_order_date_confirm')" />
             <field name="domain">[('user_id','=',user_id),('paid','=',True)]</field>
         </record>
 
@@ -104,10 +86,10 @@
             <field name="name">Total Paid Sales Orders</field>
             <field name="description">Based on the confirmation date</field>
             <field name="computation_mode">sum</field>
-            <field name="model_id" eval="str(ref('sale.model_sale_order'))" />
-            <field name="field_id" eval="str(ref('sale.field_sale_order_amount_total'))" />
-            <field name="field_date_id" eval="str(ref('sale.field_sale_order_date_confirm'))" />
-            <field name="domain">[('user_id','=',user_id),('paid','=',True)]</field>
+            <field name="model_id" eval="ref('sale.model_sale_order')" />
+            <field name="field_id" eval="ref('sale.field_sale_order_amount_total')" />
+            <field name="field_date_id" eval="ref('sale.field_sale_order_date_confirm')" />
+            <field name="domain">[('user_id','=',user_id),('invoiced','=',True)]</field>
         </record>
 
 
@@ -115,8 +97,8 @@
             <field name="name"># Customer Refunds</field>
             <field name="description"></field>
             <field name="computation_mode">count</field>
-            <field name="model_id" eval="str(ref('account.model_account_invoice'))" />
-            <field name="field_date_id" eval="str(ref('account.field_account_invoice_date_invoice'))" />
+            <field name="model_id" eval="ref('account.model_account_invoice')" />
+            <field name="field_date_id" eval="ref('account.field_account_invoice_date_invoice')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user_id),('type','=','out_refund')]</field>
         </record>
 
@@ -124,9 +106,9 @@
             <field name="name">Total Customer Refunds</field>
             <field name="description"></field>
             <field name="computation_mode">sum</field>
-            <field name="model_id" eval="str(ref('account.model_account_invoice'))" />
-            <field name="field_id" eval="str(ref('account.field_account_invoice_amount_total'))" />
-            <field name="field_date_id" eval="str(ref('account.field_account_invoice_date_invoice'))" />
+            <field name="model_id" eval="ref('account.model_account_invoice')" />
+            <field name="field_id" eval="ref('account.field_account_invoice_amount_total')" />
+            <field name="field_date_id" eval="ref('account.field_account_invoice_date_invoice')" />
             <field name="domain">[('state','!=','cancel'),('user_id','=',user_id),('type','=','out_refund')]</field>
         </record>
 
@@ -135,38 +117,38 @@
 
         <!-- planlines -->
         <record model="gamification.goal.planline" id="planline_crm_sale1">
-            <field name="type_id" eval="str(ref('type_crm_tot_invoices'))" />
+            <field name="type_id" eval="ref('type_crm_tot_invoices')" />
             <field name="target_goal">20000</field>
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale2">
-            <field name="type_id" eval="str(ref('type_crm_lead_delay_close'))" />
+            <field name="type_id" eval="ref('type_crm_lead_delay_close')" />
             <field name="target_goal">20</field>
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale3">
-            <field name="type_id" eval="str(ref('type_crm_nbr_sale_order_created'))" />
+            <field name="type_id" eval="ref('type_crm_nbr_sale_order_created')" />
             <field name="target_goal">5</field>
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale4">
-            <field name="type_id" eval="str(ref('type_crm_nbr_paid_sale_order'))" />
+            <field name="type_id" eval="ref('type_crm_nbr_paid_sale_order')" />
             <field name="target_goal">5</field>
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale5">
-            <field name="type_id" eval="str(ref('type_crm_nbr_customer_refunds'))" />
+            <field name="type_id" eval="ref('type_crm_nbr_customer_refunds')" />
             <field name="target_goal">4</field>
         </record>
 
 
 
         <record model="gamification.goal.planline" id="planline_crm_marketing1">
-            <field name="type_id" eval="str(ref('type_crm_lead_delay_open'))" />
+            <field name="type_id" eval="ref('type_crm_lead_delay_open')" />
             <field name="target_goal">15</field>
         </record>
         <record model="gamification.goal.planline" id="planline_crm_marketing2">
-            <field name="type_id" eval="str(ref('type_crm_nbr_new_leads'))" />
+            <field name="type_id" eval="ref('type_crm_nbr_new_leads')" />
             <field name="target_goal">7</field>
         </record>
         <record model="gamification.goal.planline" id="planline_crm_marketing3">
-            <field name="type_id" eval="str(ref('type_crm_nbr_new_opportunities'))" />
+            <field name="type_id" eval="ref('type_crm_nbr_new_opportunities')" />
             <field name="target_goal">5</field>
         </record>
 
@@ -196,29 +178,29 @@
 
         <!-- link planline -> plan -->
         <record model="gamification.goal.planline" id="planline_crm_sale1">
-            <field name="plan_id" eval="str(ref('plan_crm_sale'))" />
+            <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale2">
-            <field name="plan_id" eval="str(ref('plan_crm_sale'))" />
+            <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale3">
-            <field name="plan_id" eval="str(ref('plan_crm_sale'))" />
+            <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale4">
-            <field name="plan_id" eval="str(ref('plan_crm_sale'))" />
+            <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_sale5">
-            <field name="plan_id" eval="str(ref('plan_crm_sale'))" />
+            <field name="plan_id" eval="ref('plan_crm_sale')" />
         </record>
 
         <record model="gamification.goal.planline" id="planline_crm_marketing1">
-            <field name="plan_id" eval="str(ref('plan_crm_marketing'))" />
+            <field name="plan_id" eval="ref('plan_crm_marketing')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_marketing2">
-            <field name="plan_id" eval="str(ref('plan_crm_marketing'))" />
+            <field name="plan_id" eval="ref('plan_crm_marketing')" />
         </record>
         <record model="gamification.goal.planline" id="planline_crm_marketing3">
-            <field name="plan_id" eval="str(ref('plan_crm_marketing'))" />
+            <field name="plan_id" eval="ref('plan_crm_marketing')" />
         </record>
     </data>
 </openerp>
diff --git a/addons/gamification_sale_crm/sale_crm_goals_demo.xml b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
new file mode 100644
index 00000000000..d6382dac773
--- /dev/null
+++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!-- plans -->
+        <record model="gamification.goal.plan" id="plan_crm_sale">
+            <field name="user_ids" eval="[(4,ref('base.user_demo'))]" />
+            <field name="state">inprogress</field>
+        </record>
+
+        <!-- goals -->
+        <record model="gamification.goal" id="goal_crm_sale1">
+            <field name="type_id" eval="ref('type_crm_tot_invoices')" />
+            <field name="user_id" eval="ref('base.user_demo')" />
+            <field name="planline_id" eval="ref('planline_crm_sale1')" />
+            <field name="start_date" eval="time.strftime('2013-03-01')" />
+            <field name="end_date" eval="time.strftime('2013-03-31')" />
+            <field name="target_goal">2000</field>
+            <field name="state">inprogress</field>
+        </record>
+
+        <record model="gamification.goal" id="goal_crm_sale2">
+            <field name="type_id" eval="ref('type_crm_lead_delay_close')" />
+            <field name="user_id" eval="ref('base.user_demo')" />
+            <field name="planline_id" eval="ref('planline_crm_sale2')" />
+            <field name="start_date" eval="time.strftime('2013-03-01')" />
+            <field name="end_date" eval="time.strftime('2013-03-31')" />
+            <field name="target_goal">20</field>
+            <field name="state">inprogress</field>
+        </record>
+
+        <record model="gamification.goal" id="goal_crm_sale3">
+            <field name="type_id" eval="ref('type_crm_nbr_sale_order_created')" />
+            <field name="user_id" eval="ref('base.user_demo')" />
+            <field name="planline_id" eval="ref('planline_crm_sale3')" />
+            <field name="start_date" eval="time.strftime('2013-03-01')" />
+            <field name="end_date" eval="time.strftime('2013-03-31')" />
+            <field name="target_goal">5</field>
+            <field name="state">inprogress</field>
+        </record>
+
+        <record model="gamification.goal" id="goal_crm_sale4">
+            <field name="type_id" eval="ref('type_crm_nbr_paid_sale_order')" />
+            <field name="user_id" eval="ref('base.user_demo')" />
+            <field name="planline_id" eval="ref('planline_crm_sale4')" />
+            <field name="start_date" eval="time.strftime('2013-03-01')" />
+            <field name="end_date" eval="time.strftime('2013-03-31')" />
+            <field name="target_goal">5</field>
+            <field name="state">inprogress</field>
+        </record>
+
+        <record model="gamification.goal" id="goal_crm_sale5">
+            <field name="type_id" eval="ref('type_crm_nbr_customer_refunds')" />
+            <field name="user_id" eval="ref('base.user_demo')" />
+            <field name="planline_id" eval="ref('planline_crm_sale5')" />
+            <field name="start_date" eval="time.strftime('2013-03-01')" />
+            <field name="end_date" eval="time.strftime('2013-03-31')" />
+            <field name="target_goal">4</field>
+            <field name="state">inprogress</field>
+        </record>
+        
+    </data>
+</openerp>