[IMP/MOD] lunch,idea,subscription,profile_tools : Usability Improvemetns

bzr revid: vir@tinyerp.com-20100903130821-s1i3j9qvreuhq5uh

19 files changed, 170 insertions, 84 deletions

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index edfbb573911..e70e34a5606 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -107,7 +107,7 @@ class base_setup_installer(osv.osv_memory):
     def _if_misc_tools(self, cr, uid, ids, context=None):
         interface = self.pool.get('res.users').browse(cr, uid, uid, context=context).view
         if interface == 'simple' or interface =='extended' :
-            return ['lunch','idea','survey']
+            return ['profile_tools']
         return None
 
     def _if_account(self, cr, uid, ids, context=None):
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index e1a522b6381..4b6dbd4d039 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -51,7 +51,7 @@ idea_category()
 class idea_idea(osv.osv):
     """ Idea """
     _name = 'idea.idea'
-    _rec_name = 'title'
+    _rec_name = 'name'
 
     def _vote_avg_compute(self, cr, uid, ids, name, arg, context = None):
 
@@ -153,7 +153,7 @@ class idea_idea(osv.osv):
 
     _columns = {
         'user_id': fields.many2one('res.users', 'Creator', required=True, readonly=True),
-        'title': fields.char('Idea Summary', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'name': fields.char('Idea Summary', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft':[('readonly',False)]}),
         'comment_ids': fields.one2many('idea.comment', 'idea_id', 'Comments'),
         'created_date': fields.datetime('Creation date', readonly=True),
diff --git a/addons/idea/idea_data.xml b/addons/idea/idea_data.xml
index 8c147c35d32..6d5bda20de4 100644
--- a/addons/idea/idea_data.xml
+++ b/addons/idea/idea_data.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    
+
         <record model="idea.category" id="idea_category_general">
             <field name="name">General</field>
             <field name="summary">General Ideas</field>
             <field name="visibility">True</field>
         </record>
-        
+
         <record model="idea.idea" id="idea_idea_one">
-            <field name="title">TODO: Need to put a good idea on OpenERP</field>
+            <field name="name">TODO: Need to put a good idea on OpenERP</field>
             <field name="description">TODO: Need to put a good idea on OpenERP</field>
             <field name="category_id" ref="idea_category_general"/>
             <field name="visibility">True</field>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 97f48e5b6f6..d5506d9a677 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -135,6 +135,7 @@
         <field name="arch" type="xml">
         <tree string="Votes">
             <field name="user_id" />
+            <field name="idea_id"/>
             <field name="score"/>
             <field name="date"/>
         </tree>
@@ -175,9 +176,11 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Group By..." colspan="14">
-                    <filter string="Vote date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
-                    <filter string="Idea" icon="terp-idea" domain="[]" context="{'group_by':'idea_id'}"/>
                     <filter string="User" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Idea" icon="terp-idea" domain="[]" context="{'group_by':'idea_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Vote date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                 </group>
             </search>
         </field>
@@ -192,7 +195,7 @@
         <field name="arch" type="xml">
         <form string="New Idea">
             <group col="6" colspan="4">
-                <field name="title" select="1" />
+                <field name="name" select="1" />
                 <field name="category_id" select="1"/>
                 <field name="user_id" attrs="{'invisible':[('visibility','=',False)]}"/>
                 <field name="vote_avg" widget="progressbar"/>
@@ -217,7 +220,7 @@
                         </tree>
                     </field>
                 </page>
-                <page string="Vote" groups="base.group_extended">
+                <page string="History" groups="base.group_extended">
                     <field name="vote_ids" nolabel="1" colspan="4" readonly="True">
                         <tree string="Votes">
                             <field name="user_id"/>
@@ -261,7 +264,7 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
         <tree colors="blue:state in ('draft');black:state in ('open','close');gray:state in('cancel')" string="Ideas">
-            <field name="title"/>
+            <field name="name"/>
             <field name="category_id" />
             <field name="created_date"/>
             <field name="vote_avg" widget="progressbar"/>
@@ -285,12 +288,11 @@
         <field name="arch" type="xml">
             <search string="Ideas">
                 <group col="10" colspan="4">
-                    <filter icon="terp-document-new" string="Draft"
-                        domain="[('state','=','draft')]" help="Draft Ideas" />
-                    <filter icon="terp-camera_test" string="Open"
-                        domain="[('state','=','open')]" help="Open Ideas" />
+                    <filter icon="terp-document-new" string="Current" domain="[('state','in', ('draft', 'open'))]" help="Draft and Open Ideas"/>
+                    <filter icon="terp-check" string="Accepted"
+                        domain="[('state','=','close')]" help="Accepted Ideas" />
                     <separator orientation="vertical"/>
-                    <field name="title" select="1"/>
+                    <field name="name" select="1"/>
                     <field name="category_id" select="1"/>
                     <field name="user_id" select="1"/>
                 </group>
@@ -309,11 +311,10 @@
         <field name="res_model">idea.idea</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="view_idea_idea_search"/>
     </record>
 
-    <menuitem name="Ideas" parent="menu_ideas1" id="menu_idea_idea" action="action_idea_idea"/>
+    <menuitem name="Ideas" parent="menu_ideas1" id="menu_idea_idea" action="action_idea_idea" sequence="1"/>
 
 <!-- Open Idea Action  -->
 
@@ -387,7 +388,7 @@
 
     <!-- Vote For Idea Action  -->
     <record model="ir.actions.act_window" id="action_idea_vote">
-        <field name="name">Idea's vote</field>
+        <field name="name">Idea's Votes</field>
         <field name="res_model">idea.vote</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
diff --git a/addons/idea/report/report_vote.py b/addons/idea/report/report_vote.py
index 2751450129c..008cb3ed711 100644
--- a/addons/idea/report/report_vote.py
+++ b/addons/idea/report/report_vote.py
@@ -35,7 +35,7 @@ class report_vote(osv.osv):
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'user_id': fields.many2one('res.users', 'User Name'),
-        'score': fields.integer('Score'),
+        'score': fields.integer('Score',group_operator="avg"),
         'idea_id': fields.many2one('idea.idea', 'Idea'),
         'nbr':fields.integer('# of Lines', readonly=True),
         'idea_state': fields.selection([('draft', 'Draft'),('open', 'Opened'),
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 5b82cb4e396..0b0fa7edb12 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -17,7 +17,7 @@
                     <field name="creater_id" invisible="1"/>
                     <field name="category_id" invisible="1"/>
                     <field name="nbr" sum="# of Lines"/>
-                    <field name="score" sum="Score"/>
+                    <field name="score" avg="Score"/>
                 </tree>
             </field>
         </record>
@@ -40,7 +40,7 @@
                              separator="1"
                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                              help="Idea Vote created last 7 days"/>
-                        <separator orientation="vertical"/>
+                         <separator orientation="vertical"/>
                          <filter icon="terp-go-today"
                              string="    Today    "
                              name="today"
@@ -51,21 +51,28 @@
                         <filter icon="terp-camera_test"
                             string="Open"
                             domain="[('idea_state','=',('open'))]"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-camera_test"
                             string="Accepted"
                             domain="[('idea_state','=',('close'))]"/>
                         <filter icon="terp-gtk-stop"
                             string="Refused"
                             domain="[('idea_state','=',('cancel'))]"/>
+                        <separator orientation="vertical"/>
+                        <field name="idea_id" string="Idea"/>
+                        <field name="creater_id" string="Creater"/>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="10" col="12">
+                        <filter string="Creater" icon="terp-personal" context="{'group_by':'creater_id'}"/>
+                        <filter string="User" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Idea" icon="terp-personal" context="{'group_by':'idea_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Category" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="User" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
-                        <filter string="Creater" icon="terp-personal" context="{'group_by':'creater_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'idea_state'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" name="State" context="{'group_by':'idea_state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
@@ -76,12 +83,12 @@
         </record>
 
         <record id="action_report_vote_all" model="ir.actions.act_window">
-            <field name="name">Idea Vote Analysis</field>
+            <field name="name">Ideas Analysis</field>
             <field name="res_model">report.vote</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_report_vote_search"/>
-            <field name="context">{'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_User':1,'search_default_State':1,'group_by_no_leaf':1,'group_by':[]}</field>
         </record>
 
         <menuitem action="action_report_vote_all" id="menu_report_vote_all" parent="menu_idea_reporting" sequence="1" groups="base.group_tool_manager,base.group_system"/>
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index dae5127cc90..30dc0850c3f 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -1,20 +1,20 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_idea_category","idea.category","model_idea_category","base.group_user",1,0,0,0
+"access_idea_category","idea.category","model_idea_category","base.group_user",1,1,1,1
 "access_idea_idea","idea.idea","model_idea_idea","base.group_user",1,1,1,1
 "access_idea_vote","idea.vote","model_idea_vote","base.group_user",1,1,1,1
-"access_idea_vote_stat","idea.vote.stat","model_idea_vote_stat","base.group_user",1,0,0,0
+"access_idea_vote_stat","idea.vote.stat","model_idea_vote_stat","base.group_user",1,1,1,1
 "access_idea_category_system","idea.category system","model_idea_category","base.group_system",1,1,1,1
 "access_idea_comment","idea.comment","model_idea_comment","base.group_system",1,1,1,1
-"access_idea_comment_user","idea.comment","model_idea_comment","base.group_user",1,1,1,0
+"access_idea_comment_base_user","idea.comment.base.user","model_idea_comment","base.group_user",1,1,1,1
 "access_report_vote","report.vote","model_report_vote","base.group_user",1,1,1,1
 "access_idea_idea_sale_salesman","idea.idea.sale","model_idea_idea","base.group_sale_salesman",1,1,1,1
 "access_idea_vote_sale_salesman","idea.vote.sale","model_idea_vote","base.group_sale_salesman",1,1,1,1
 "access_idea_category_user","idea.category user","model_idea_category","base.group_tool_user",1,1,1,1
 "access_idea_idea_user","idea.idea user","model_idea_idea","base.group_tool_user",1,1,1,1
 "access_idea_vote_user","idea.vote user","model_idea_vote","base.group_tool_user",1,1,1,1
-"access_idea_category_manager","idea.category manager","model_idea_category","base.group_tool_manager",1,0,0,0
-"access_idea_idea_manager","idea.idea manager","model_idea_idea","base.group_tool_manager",1,0,0,0
-"access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_tool_manager",1,0,0,0
+"access_idea_category_manager","idea.category manager","model_idea_category","base.group_tool_manager",1,1,1,1
+"access_idea_idea_manager","idea.idea manager","model_idea_idea","base.group_tool_manager",1,1,1,1
+"access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_tool_manager",1,1,1,1
 "access_idea_vote_stat_user","idea.vote.stat user","model_idea_vote_stat","base.group_tool_user",1,1,1,1
 "access_idea_comment_user","idea.comment user","model_idea_comment","base.group_tool_user",1,1,1,1
 "access_report_vote_manager","report.vote manager","model_report_vote","base.group_tool_manager",1,1,1,1
@@ -23,3 +23,4 @@
 "access_report_vote_system","report.vote system","model_report_vote","base.group_system",1,0,0,0
 "access_idea_vote_stat_manager","idea.vote.stat manager","model_idea_vote_stat","base.group_tool_manager",1,1,1,1
 "access_idea_vote_stat_system","idea.vote.stat system","model_idea_vote_stat","base.group_system",1,1,1,1
+"access_idea_comment_manager","idea.comment.manager","model_idea_comment","base.group_tool_manager",1,1,1,1
diff --git a/addons/idea/test/test_idea.yml b/addons/idea/test/test_idea.yml
index 307344cf584..bdf66af961e 100644
--- a/addons/idea/test/test_idea.yml
+++ b/addons/idea/test/test_idea.yml
@@ -15,7 +15,7 @@
     description: I want that Technical presentation are arranged for 1 hours in every
       day.\nso, on that presentation, we can know all things what improvement and development
       are done in our company.\n\n\n\n\n
-    title: Technical  presentation for 1 hours in every day
+    name: Technical  presentation for 1 hours in every day
     user_id: base.user_root
     
 - |
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index c4ba6f331dc..7dacbcfedac 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -87,7 +87,7 @@ class idea_post_vote(osv.osv_memory):
                    raise osv.except_osv(_('Warning !'),_("You can not give Vote for this idea more than %s times") % (user_limit))
 
             if idea.state != 'open':
-                raise osv.except_osv(_('Warning !'), _('Idea should be in \
+                raise osv.except_osv(_('Warning !'), _('Idea must be in \
 \'Open\' state before vote for that idea.'))
         return False
 
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 06034df1688..ad2996315aa 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -81,7 +81,7 @@ class lunch_cashbox(osv.osv):
     _columns = {
         'manager': fields.many2one('res.users', 'Manager'),
         'name': fields.char('Name', size=30, required=True, unique = True),
-        'sum_remain': fields.function(amount_available, method=True, string='Remained Total'),
+        'sum_remain': fields.function(amount_available, method=True, string='Total Remaining'),
     }
 
 lunch_cashbox()
@@ -136,12 +136,12 @@ class lunch_order(osv.osv):
             readonly=True, states={'draft':[('readonly', False)]}, change_default=True),
         'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
         'cashmove': fields.many2one('lunch.cashmove', 'CashMove' , readonly=True),
-        'descript': fields.char('Description Order', readonly=True, size=50, \
+        'descript': fields.char('Description Order', readonly=True, size=250, \
             states = {'draft':[('readonly', False)]}),
         'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ], \
             'State', readonly=True, select=True),
         'price': fields.function(_price_get, method=True, string="Price"),
-        'category': fields.many2one('lunch.category','Category'),
+        'category': fields.many2one('lunch.category','Category',readonly=True),
     }
 
     _defaults = {
@@ -217,6 +217,12 @@ class report_lunch_amount(osv.osv):
         'user_id': fields.many2one('res.users', 'User Name', readonly=True),
         'amount': fields.float('Amount', readonly=True, digits=(16, 2)),
         'box': fields.many2one('lunch.cashbox', 'Box Name', size=30, readonly=True),
+        'year': fields.char('Year', size=4, readonly=True),
+        '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),
+        'day': fields.char('Day', size=128, readonly=True),
+        'date': fields.date('Created Date', readonly=True),
     }
 
     def init(self, cr):
@@ -227,6 +233,10 @@ class report_lunch_amount(osv.osv):
             create or replace view report_lunch_amount as (
                 select
                     min(lc.id) as id,
+                    to_date(to_char(lc.create_date, 'dd-MM-YYYY'),'dd-MM-YYYY') as date,
+                    to_char(lc.create_date, 'YYYY') as year,
+                    to_char(lc.create_date, 'MM') as month,
+                    to_char(lc.create_date, 'YYYY-MM-DD') as day,
                     lc.user_cashmove as user_id,
                     sum(amount) as amount,
                     lc.box as box
@@ -234,7 +244,7 @@ class report_lunch_amount(osv.osv):
                     lunch_cashmove lc
                 where
                     active = 't'
-                group by lc.user_cashmove, lc.box
+                group by lc.user_cashmove, lc.box, lc.create_date
                 )""")
 
 report_lunch_amount()
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index b0804cbb9b0..3c33dcd247e 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -6,14 +6,14 @@
               id="menu_lunch" sequence="1" />
 
           <menuitem name="Reporting" parent="base.menu_tools"
-              id="base.menu_lunch_reporting" sequence="6" />
+              id="base.menu_lunch_reporting" sequence="6" groups="base.group_system,base.group_tool_manager"/>
 
           <menuitem name="Lunch Orders"
               parent="base.menu_lunch_reporting"
               id="menu_lunch_reporting_order" sequence="1" />
 
           <menuitem name="Configuration" parent="base.menu_tools"
-              id="base.menu_lunch_survey_root" sequence="20" />
+              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system"/>
 
           <menuitem name="Lunch" parent="base.menu_lunch_survey_root"
               id="menu_lunch_category_root_configuration" sequence="1" />
@@ -47,14 +47,13 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');black:state in ('confirmed')" string="Order">
+                    <field name="date"/>
                     <field name="user_id"/>
                     <field name="product"/>
-                    <field name="category"/>
-                    <field name="date"/>
-                    <field name="cashmove"/>
-                    <field name="state"/>
                     <field name="descript"/>
+                    <field name="category"/>
                     <field name="price" sum="Total price"/>
+                    <field name="state"/>
                     <button colspan="1"
                               name="%(action_lunch_order_confirm)d"
                               string="Confirm Order"
@@ -86,9 +85,6 @@
                     <field name="date"/>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
-                        <filter string="Cashbox" icon="terp-dolar" domain="[]"  context="{'group_by':'cashmove'}"/>
-                        <separator orientation="vertical"/>
-<!--                        <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product'}"/>-->
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'category'}"/>
                     </group>
                 </search>
@@ -105,16 +101,16 @@
                 <field name="context">{"search_default_Today":1}</field>
         </record>
 
-        <menuitem name="Lunch Order" parent="menu_lunch"
+        <menuitem name="Lunch Orders" parent="menu_lunch"
             id="menu_lunch_order_form" action="action_lunch_order_form" />
 
 <!--  Cash Box Form view  -->
 
         <record model="ir.ui.view" id="view_lunch_cashbox_form">
-            <field name="name">CashBox</field>
+            <field name="name">Cashboxes</field>
             <field name="model">lunch.cashbox</field>
             <field name="arch" type="xml">
-                <form string="CashBox">
+                <form string="Cashboxes">
                     <field name="name" select="1"/>
                     <field name="manager" select="1"/>
                 </form>
@@ -124,11 +120,11 @@
 <!--  Cash Box Tree view  -->
 
         <record model="ir.ui.view" id="view_lunch_cashbox_tree">
-            <field name="name">CashBox</field>
+            <field name="name">Cashboxes</field>
             <field name="model">lunch.cashbox</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="CashBox" colors="red:sum_remain&lt;=0">
+                <tree string="Cashboxes" colors="red:sum_remain&lt;=0">
                     <field name="name" select="1"/>
                     <field name="manager" select="1"/>
                     <field name="sum_remain" select="1"/>
@@ -139,11 +135,11 @@
 <!--  Cash Box Action  -->
 
         <record model="ir.actions.act_window" id="action_lunch_cashbox_form">
-                <field name="name"> CashBox </field>
+                <field name="name"> Cashboxes </field>
                 <field name="res_model">lunch.cashbox</field>
         </record>
 
-        <menuitem name="CashBox"
+        <menuitem name="Cashboxes"
             parent="menu_lunch_category_root_configuration"
             id="menu_lunch_cashbox_form"
             action="action_lunch_cashbox_form" />
@@ -173,10 +169,10 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="CashMove" editable="top">
+                    <field name="create_date"/>
                     <field name="box" select="1"/>
                     <field name="name" select="1" required="1"/>
                     <field name="user_cashmove" select="1"/>
-                    <field name="create_date"/>
                     <field name="amount" select="1" sum="Total amount"/>
                 </tree>
             </field>
@@ -200,6 +196,8 @@
                         <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_cashmove'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Box" icon="terp-dolar" domain="[]"  context="{'group_by':'box'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Date" icon="terp-go-today" domain="[]"  context="{'group_by':'create_date'}"/>
                     </group>
                 </search>
 
@@ -209,7 +207,7 @@
 <!-- Cash Move Action  -->
 
         <record model="ir.actions.act_window" id="action_lunch_cashmove_form">
-                <field name="name">CashMove</field>
+                <field name="name">Cash Moves</field>
                 <field name="res_model">lunch.cashmove</field>
                 <field name="search_view_id" ref="view_lunch_cashmove_filter"/>
                 <field name="context">{"search_default_Today":1}</field>
@@ -248,7 +246,7 @@
 <!-- Lunch Category Action  -->
 
         <record model="ir.actions.act_window" id="action_lunch_category_form">
-            <field name="name"> Category of product </field>
+            <field name="name"> Product Categories </field>
             <field name="res_model">lunch.category</field>
         </record>
 
@@ -261,10 +259,10 @@
             <field name="arch" type="xml">
                 <form string="Products">
                     <field name="name" select="1"/>
-                    <field name="category_id" widget='selection' select="1"/>
-                    <field name="description" select="1"/>
-                    <field name="price" select="1"/>
-                    <field name="active" select="1"/>
+                    <field name="category_id" widget="selection"/>
+                    <field name="description" />
+                    <field name="price" />
+                    <field name="active"/>
                 </form>
             </field>
         </record>
@@ -277,31 +275,47 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Products">
-                    <field name="name" select="1"/>
-                    <field name="category_id" select="1"/>
-                    <field name="description" select="1"/>
-                    <field name="price" select="1"/>
+                    <field name="name"/>
+                    <field name="category_id"/>
+                    <field name="description"/>
+                    <field name="price"/>
                 </tree>
             </field>
         </record>
 
+<!-- Lunch Product Search view  -->
+
+        <record model="ir.ui.view" id="view_lunch_product_search">
+            <field name="name">Products</field>
+            <field name="model">lunch.product</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Products">
+                    <field name="name" />
+                    <field name="category_id" widget="selection"/>
+                    <field name="description" />
+                    <field name="price"/>
+                </search>
+            </field>
+        </record>
+
 <!-- Lunch Product Action  -->
 
         <record model="ir.actions.act_window" id="action_lunch_product_form">
-            <field name="name">Product</field>
+            <field name="name">Products</field>
             <field name="res_model">lunch.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_lunch_product_tree"/>
+            <field name="search_view_id" ref="view_lunch_product_search"/>
         </record>
 
-        <menuitem name="Tools/Lunch/Configuration/Products"
-            id="menu_lunch_product_form" action="action_lunch_product_form"
-            sequence="1" />
-
         <menuitem name="Products"
             parent="menu_lunch_category_root_configuration"
             id="menu_lunch_product_form" action="action_lunch_product_form"
             sequence="2" />
 
-        <menuitem name="Category of product"
+        <menuitem name="Product Categories"
             parent="menu_lunch_category_root_configuration"
             id="menu_lunch_category_form"
             action="action_lunch_category_form" sequence="1" />
@@ -315,6 +329,10 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Box Amount by User">
+                     <field name="date" invisible="1"/>
+                    <field name="year" invisible="1"/>
+                    <field name="day" invisible="1"/>
+                    <field name="month" invisible="1"/>
                     <field name="box" select="1"/>
                     <field name="user_id" select="1"/>
                     <field name="amount" select="1" sum="Total box" />
@@ -346,6 +364,19 @@
             <field name="arch" type="xml">
                 <search string="Box Amount by User">
                     <group>
+                        <filter icon="terp-go-year" string="  Year  "
+                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                        help="Box amount in current year"/>
+                        <filter icon="terp-go-month" string="   Month   "
+                        name="month"
+                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                        help="Box amount in current month"/>
+                        <filter icon="terp-go-week"
+                         string="    Month-1    "
+                         separator="1"
+                         domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                         help="Box amount in last month"/>
+                    <separator orientation="vertical"/>
                         <field name="user_id" select="1"/>
                         <field name="box" select="1"/>
                         <field name="amount" select="1"/>
@@ -361,7 +392,7 @@
 <!-- Lunch Amount Action -->
 
         <record model="ir.actions.act_window" id="action_report_lunch_amount_tree">
-            <field name="name">Lunch amount</field>
+            <field name="name">Cash Position by User</field>
             <field name="res_model">report.lunch.amount</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
index e27fba4530f..b936b26a55e 100644
--- a/addons/lunch/security/ir.model.access.csv
+++ b/addons/lunch/security/ir.model.access.csv
@@ -2,14 +2,13 @@
 "access_lunch_category","lunch.category","model_lunch_category","base.group_user",1,1,1,1
 "access_lunch_product","lunch.product","model_lunch_product","base.group_user",1,1,1,1
 "access_lunch_cashbox","lunch.cashbox","model_lunch_cashbox","base.group_user",1,1,1,1
-"access_lunch_cashmove","lunch.cashmove","model_lunch_cashmove","base.group_user",1,1,1,1
 "access_lunch_order","lunch.order","model_lunch_order","base.group_user",1,1,1,1
 "access_report_lunch_amount","report.lunch.amount","model_report_lunch_amount","base.group_user",1,1,1,1
 "access_lunch_order_sale_salesman","lunch.order.sale","model_lunch_order","base.group_sale_salesman",1,1,1,1
 "access_lunch_order_user","lunch.order user","model_lunch_order","base.group_tool_user",1,1,1,1
-"access_lunch_order_manager","lunch.order manager","model_lunch_order","base.group_tool_manager",1,0,0,0
+"access_lunch_order_manager","lunch.order manager","model_lunch_order","base.group_tool_manager",1,1,1,1
 "access_lunch_cashmove_user","lunch.cashmove user","model_lunch_cashmove","base.group_tool_user",1,1,1,1
-"access_lunch_cashmove_manager","lunch.cashmove manager","model_lunch_cashmove","base.group_tool_manager",1,0,0,0
+"access_lunch_cashmove_manager","lunch.cashmove manager","model_lunch_cashmove","base.group_tool_manager",1,1,1,1
 "access_report_lunch_amount_manager","report.lunch.amount manager","model_report_lunch_amount","base.group_tool_manager",1,1,1,1
 "access_lunch_category_system","lunch.category system","model_lunch_category","base.group_system",1,1,1,1
 "access_lunch_product_system","lunch.product system","model_lunch_product","base.group_system",1,1,1,1
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index 39fa1f87d62..d47cc6d8ee9 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -34,7 +34,7 @@
         <act_window id="action_lunch_order_cancel_values"
     		key2="client_action_multi" name="Cancel Order"
     		res_model="lunch.order.cancel" src_model="lunch.order"
-    		view_mode="form" target="new" view_type="form" />
+    		view_mode="form" target="new" view_type="form" groups="base.group_tool_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index aa59acae628..dabcd7d5e84 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -36,7 +36,7 @@
         <act_window id="action_lunch_order_confirm_values"
     		key2="client_action_multi" name="Confirm Order"
     		res_model="lunch.order.confirm" src_model="lunch.order"
-    		view_mode="form" target="new" view_type="form" />
+    		view_mode="form" target="new" view_type="form" groups="base.group_tool_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 1a793352b6e..563c81f6237 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -28,6 +28,7 @@ class misc_tools_installer(osv.osv_memory):
         'lunch':fields.boolean('Lunch Orders',help='Installs tools for lunch module'),
         'subscription':fields.boolean('Recurring Documents',help='Installs tools for subscription module'),
         'survey':fields.boolean('Survey',help='Installs tools for survey module'),
+        'idea':fields.boolean('Idea',help='Installs tools for idea module'),
         'audittrail':fields.boolean('Audit Trail',help='Installs tools for audittrail module'),
     }
     _defaults = {
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index 9499518ee25..b485b712892 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -28,6 +28,7 @@
             <field name="lunch"/>
             <field name="subscription"/>
             <field name="survey"/>
+            <field name="idea"/>
             <field name="audittrail"/>
           </group>
         </data>
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..0c416c86a20 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,23 @@
             <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"/>
+                        <filter string="This Week" icon="terp-go-week" domain="[('date_init','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_init','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+                        <filter icon="terp-go-today" string="Today"
+                    domain="[('date_init','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date_init','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
+                        <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 +106,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 +170,7 @@
                     <group col="10" colspan="4">
                         <field name="name"/>
                         <field name="model"/>
-                    </group>                    
+                    </group>
                 </search>
             </field>
         </record>
@@ -167,6 +182,7 @@
             <field name="arch" type="xml">
                 <form string="Subscription Document Fields">
                     <field name="field" select="1"/>
+                    <newline/>
                     <field name="value"/>
                 </form>
             </field>