diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index 44d2edb503c..cb5bdbc392b 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -29,7 +29,7 @@
     'depends': ['base'],
     'init_xml': [],
     'update_xml': ['security/subcription_security.xml', 'security/ir.model.access.csv', 'subscription_view.xml'],
-    'demo_xml': [],
+    'demo_xml': ['subscription_demo.xml',],
     'installable': True,
     'active': False,
     'certificate': '0029454782573',
diff --git a/addons/subscription/subscription_demo.xml b/addons/subscription/subscription_demo.xml
new file mode 100644
index 00000000000..bb8d61ef4b0
--- /dev/null
+++ b/addons/subscription/subscription_demo.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        <record id="subscription_document_partner0" model="subscription.document">
+            <field eval="1" name="active"/>
+            <field name="model" ref="base.model_res_partner"/>
+            <field name="name">Partner</field>
+        </record>
+        <record id="subscription_document_fields_2" model="subscription.document.fields">
+            <field name="field" ref="base.field_res_partner_name"/>
+            <field name="value">false</field>
+            <field model="subscription.document" name="document_id" search="[('name', '=', u'Partner')]"/>
+        </record>
+        <record id="subscription_document_fields_3" model="subscription.document.fields">
+            <field name="field" ref="base.field_res_partner_address"/>
+            <field model="subscription.document" name="document_id" search="[('name', '=', u'Partner')]"/>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 3ea4396c7d9..dac94e890ae 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -59,10 +59,13 @@
             <field name="arch" type="xml">
                 <tree string="Subscriptions">
                     <field name="name"/>
-                    <field name="active" groups="base.group_extended"/>
-                    <field name="user_id"/>
                     <field name="partner_id"/>
+                    <field name="active" groups="base.group_extended"/>
+                    <field name="user_id" select="1"/>
                     <field name="state"/>
+                    <button name="set_process" states="draft" string="Process" type="object" icon="terp-check"/>
+                    <button name="set_done" states="running" string="Done" type="object" icon="terp-gtk-stop"/>
+                    <button name="set_draft" states="done" string="Set to Draft" type="object" icon="terp-document-new"/>
                 </tree>
             </field>
         </record>
@@ -74,12 +77,19 @@
             <field name="arch" type="xml">
                 <search string="Search Subscription">
                     <group col="10" colspan="4">
+                        <filter icon="terp-check"
+                        string="Running"
+                        domain="[('state','=','running')]"/>
+                        <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="user_id" widget="selection"/>
+                        <field name="user_id" select="1"/>
+                        <field name="partner_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="4">
-                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="User" icon="terp-personal" name="User" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Partner" icon="terp-personal" name="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
@@ -92,6 +102,7 @@
             <field name="res_model">subscription.subscription</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_subscription_tree"/>
+            <field name="context">{'search_default_User':1}</field>
             <field name="search_view_id" ref="view_subscription_filter" />
         </record>
         <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="subscription.next_id_45"/>
@@ -155,7 +166,7 @@
                     <group col="10" colspan="4">
                         <field name="name"/>
                         <field name="model"/>
-                    </group>                    
+                    </group>
                 </search>
             </field>
         </record>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index a9a17edc494..ec3b1677db6 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -872,6 +872,7 @@
                 <tree editable="bottom" string="Survey Answer">
                     <field name="sequence" string="Seq"/>
                     <field name="answer" select="1"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>