[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2

bzr revid: atp@tinyerp.co.in-20100622051544-c7hig73zk2at66cy

3 files changed, 13 insertions, 13 deletions

diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 20a2904c4e6..dd0a22cf523 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -68,11 +68,11 @@ class idea_idea(osv.osv):
 
         sql = """SELECT i.id, avg(v.score::integer)
            FROM idea_idea i LEFT OUTER JOIN idea_vote v ON i.id = v.idea_id
-            WHERE i.id = ANY(%s)
+            WHERE i.id IN %s
             GROUP BY i.id
         """
 
-        cr.execute(sql, (ids,))
+        cr.execute(sql, (tuple(ids),))
         return dict(cr.fetchall())
 
     def _vote_count(self, cr, uid, ids, name, arg, context=None):
@@ -88,11 +88,11 @@ class idea_idea(osv.osv):
 
         sql = """SELECT i.id, COUNT(1)
            FROM idea_idea i LEFT OUTER JOIN idea_vote v ON i.id = v.idea_id
-            WHERE i.id = ANY(%s)
+            WHERE i.id IN %s
             GROUP BY i.id
         """
 
-        cr.execute(sql, (ids,))
+        cr.execute(sql, (tuple(ids),))
         return dict(cr.fetchall())
 
     def _comment_count(self, cr, uid, ids, name, arg, context=None):
@@ -108,11 +108,11 @@ class idea_idea(osv.osv):
 
         sql = """SELECT i.id, COUNT(1)
            FROM idea_idea i LEFT OUTER JOIN idea_comment c ON i.id = c.idea_id
-            WHERE i.id = ANY(%s)
+            WHERE i.id IN %s
             GROUP BY i.id
         """
 
-        cr.execute(sql, (ids,))
+        cr.execute(sql, (tuple(ids),))
         return dict(cr.fetchall())
 
     def _vote_read(self, cr, uid, ids, name, arg, context = None):
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index ca46b31ace8..d24ad041fee 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -3,7 +3,7 @@
     <data>
 
     <!-- Idea Category Form View -->
-    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
+    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="28"/>
         <record model="ir.ui.view" id="view_idea_category_form">
             <field name="name">idea.category.form</field>
             <field name="model">idea.category</field>
@@ -44,9 +44,9 @@
     </record>
 
     <menuitem name="Configuration" parent="base.menu_tools"
-         id="base.menu_lunch_survey_root" sequence="6"/>
+         id="base.menu_lunch_survey_root" sequence="20"/>
 
-    <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas"/>
+    <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas" sequence="3"/>
 
     <menuitem name="Categories" parent="menu_ideas" id="menu_idea_category" action="action_idea_category" />
 
@@ -356,9 +356,9 @@
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
     </record>
-    <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="5"/>
+    <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="6"/>
 
-    <menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting"/>
+    <menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting" sequence="3"/>
 
     <menuitem name="Vote Statistics" parent="menu_idea_reporting"
         id="menu_idea_vote_stat" action="action_idea_vote_stat" />
diff --git a/addons/idea/test/test_idea.yml b/addons/idea/test/test_idea.yml
index 4c3f5301a5a..bcb764f8933 100644
--- a/addons/idea/test/test_idea.yml
+++ b/addons/idea/test/test_idea.yml
@@ -19,13 +19,13 @@
     user_id: base.user_root
     
 - |
-  I check that idea on draft state.
+  I check that the idea is in draft state.
 -
   !assert {model: idea.idea, id: idea_idea_0}:
     - state == 'draft'  
     
 - |
-  I open this idea by click on "Open" button.
+  I open this idea by clicking on the "Open" button.
 - 
   !workflow {model: idea.idea, action: idea_open, ref: idea_idea_0}