diff options
| author | Vir (Open ERP) <vir@tinyerp.com> | 2010-06-22 17:56:04 +0530 |
|---|---|---|
| committer | Vir (Open ERP) <vir@tinyerp.com> | 2010-06-22 17:56:04 +0530 |
| commit | 0763d0d58874255f370fba4d499ccfdec9d1300a (patch) | |
| tree | bdfef8a339857d133f5c8ff104c84f40c1c9f775 /addons/idea | |
| parent | bafa49c7b7dc79f0b5cef08fa381b0f1ca28ce97 (diff) | |
[ADD] idea, lunch : lunch order analysis and vote reports added
bzr revid: vir@tinyerp.com-20100622122604-7t4i0d2durfqz8n1
Diffstat (limited to 'addons/idea')
| -rw-r--r-- | addons/idea/idea.py | 2 | ||||
| -rw-r--r-- | addons/idea/idea_view.xml | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/addons/idea/idea.py b/addons/idea/idea.py index 171ff85505f..e1a522b6381 100644 --- a/addons/idea/idea.py +++ b/addons/idea/idea.py @@ -304,7 +304,7 @@ class idea_vote(osv.osv): _rec_name = 'score' _columns = { - 'user_id': fields.many2one('res.users', 'By user', readonly="True"), + 'user_id': fields.many2one('res.users', 'User', readonly="True"), 'idea_id': fields.many2one('idea.idea', 'Idea', readonly="True", ondelete='cascade'), 'score': fields.selection(VoteValues, 'Vote Status', readonly="True"), 'date': fields.datetime('Date', readonly="True"), diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index 0f69931ca43..6b728560277 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -149,8 +149,22 @@ <field name="arch" type="xml"> <search string="Ideas vote"> <group col="10" colspan="4"> + <filter icon="terp-go-year" string=" 365 Days " + domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" + help="Tasks performed in last 365 days"/> + <filter icon="terp-go-month" string=" 30 Days " + name="month" + domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" + help="Tasks performed in last 30 days"/> + <filter icon="terp-go-week" + string=" 7 Days " + name="week" + separator="1" + domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" + help="Tasks during last 7 days"/> + <separator orientation="vertical"/> <field name="idea_id" widget="selection"/> - <field name="user_id"/> + <field name="user_id" string="User"/> </group> <newline/> <group expand="0" string="Group By..." colspan="14"> @@ -371,6 +385,7 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> <field name="search_view_id" ref="view_idea_vote_search"/> + <field name="context">{'search_default_week':1}</field> </record> <menuitem name="Votes" parent="menu_idea_reporting" id="menu_idea_vote" action="action_idea_vote"/> |