From 87ece39c0211d5ce2871357b64e35b790d6a52fb Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 21 Jun 2010 14:20:32 +0530
Subject: [PATCH 1/2] [MOD,ADD] subscription, idea : menu sequence changed,
 lunch : Search view added for lunch order and cashmove

bzr revid: vir@tinyerp.com-20100621085032-a3p3ywxnrnooue5r
---
 addons/idea/idea_view.xml                 |  2 +-
 addons/lunch/lunch_view.xml               | 64 ++++++++++++++++++++++-
 addons/subscription/subscription_view.xml |  5 +-
 3 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index d24ad041fee..495110236da 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -372,7 +372,7 @@
         <field name="search_view_id" ref="view_idea_vote_search"/>
     </record>
 
-    <menuitem name="Votes" parent="menu_ideas" id="menu_idea_vote" action="action_idea_vote"/>
+    <menuitem name="Votes" parent="menu_idea_reporting" id="menu_idea_vote" action="action_idea_vote"/>
 
     </data>
 </openerp>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index aec0d877c18..5eea9a13d4a 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -53,16 +53,51 @@
                     <field name="state"/>
                     <field name="descript"/>
                     <field name="price" sum="Total price"/>
+                    <button colspan="1"
+                              name="%(action_lunch_order_confirm)d"
+                              string="Confirm Order"
+                              type="action" states="draft"
+                              icon="terp-gtk-go-back-rtl" />
+                    <button colspan="1"
+                              name="%(action_lunch_order_cancel)d"
+                              string="Cancel Order"
+                              type="action" states="confirmed"
+                              icon="terp-gtk-stop" />
                 </tree>
             </field>
         </record>
 
+<!-- Lunch order Search view -->
+
+        <record id="view_lunch_order_filter" model="ir.ui.view">
+            <field name="name">lunch.order.list.select</field>
+            <field name="model">lunch.order</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Lunch Order">
+                    <filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/>
+                    <filter icon="terp-go-today" name="Today" string="Today" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
+                    <separator orientation="vertical"/>
+                    <field name="user_id"/>
+                    <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'}"/>
+                        <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
 <!-- Lunch order Action -->
 
         <record model="ir.actions.act_window" id="action_lunch_order_form">
                 <field name="name">Lunch Orders</field>
                 <field name="res_model">lunch.order</field>
                 <field name="view_mode">tree,form</field>
+                <field name="search_view_id" ref="view_lunch_order_filter"/>
+                <field name="context">{"search_default_Today":1}</field>
         </record>
 
         <menuitem name="Lunch Order" parent="menu_lunch"
@@ -133,20 +168,45 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="CashMove" editable="top">
+                    <field name="box" select="1"/>
                     <field name="name" select="1" required="1"/>
                     <field name="user_cashmove" select="1"/>
-                    <field name="amount" select="1" sum="Total amount"/>
-                    <field name="box" select="1"/>
                     <field name="create_date"/>
+                    <field name="amount" select="1" sum="Total amount"/>
                 </tree>
             </field>
         </record>
 
+<!--  Cash Move Search View  -->
+
+        <record id="view_lunch_cashmove_filter" model="ir.ui.view">
+            <field name="name">lunch.cashmove.list.select</field>
+            <field name="model">lunch.cashmove</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search CashMove">
+                    <filter icon="terp-go-today" name="Today" string="Today" domain="[('create_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59'))]"/>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                    <field name="user_cashmove"/>
+                    <field name="create_date"/>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="20">
+                        <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_cashmove'}"/>
+                        <filter string="Box" icon="terp-accessories-archiver+" domain="[]"  context="{'group_by':'box'}"/>
+                    </group>
+                </search>
+
+            </field>
+        </record>
+
 <!-- Cash Move Action  -->
 
         <record model="ir.actions.act_window" id="action_lunch_cashmove_form">
                 <field name="name">CashMove</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>
         </record>
 
         <menuitem name="Cash Moves" parent="menu_lunch"
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 478bb4a4f67..695f9b00895 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -152,6 +152,9 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="document_tree"/>
         </record>
-        <menuitem action="action_document_form" id="menu_action_document_form" parent="subscription.next_id_45"/>
+        <menuitem name="Configuration" parent="base.menu_tools"
+              id="base.menu_lunch_survey_root" sequence="20" />
+        <menuitem id="config_recuuring_event" name="Recurring Events" parent="base.menu_lunch_survey_root" sequence="4"/>
+        <menuitem action="action_document_form" id="menu_action_document_form" parent="config_recuuring_event"/>
     </data>
 </openerp>

From 50bf02591345cebb01c37da4be8e2bc2409c7308 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 21 Jun 2010 15:47:10 +0530
Subject: [PATCH 2/2] [Fix,ADD] idea : problem of vote_id is solved, open
 button added

bzr revid: vir@tinyerp.com-20100621101710-zvz52nvql5ybsrae
---
 addons/idea/idea_view.xml            | 1 +
 addons/idea/wizard/idea_post_vote.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 495110236da..0f69931ca43 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -247,6 +247,7 @@
             <field name="count_comments" />
             <field name="count_votes" />
             <field name="state"/>
+             <button name="idea_open" string="Open" states="draft" icon="terp-gtk-go-back-rtl"/>
             <button name="%(idea.action_idea_post_vote)d" icon="gtk-execute" type="action" states="open" string="Submit Vote"/>
             <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
             <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/>
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index e723d0a4505..c4ba6f331dc 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -101,6 +101,7 @@ class idea_post_vote(osv.osv_memory):
         """
 
         vote_ids = context and context.get('active_ids', []) or []
+        vote_id = context['active_ids'][0]
         vote_pool = self.pool.get('idea.vote')
         idea_pool = self.pool.get('idea.idea')
         comment_pool = self.pool.get('idea.comment')