From 22a4a4f38191046fd317646fd610e826ec77c8f2 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Tue, 24 Apr 2012 11:09:54 +0530
Subject: [PATCH] [FIX]: Hide Feeds Menu, remove domain force for event, remove
 tweets widget for latest news.

bzr revid: atp@tinyerp.com-20120424053954-hdyd43ra72oiih4a
---
 addons/mail/mail_thread_view.xml                    |  2 +-
 .../portal_customer/board_portal_customer_view.xml  | 13 ++-----------
 addons/portal_customer/portal_customer_menu.xml     | 10 ++--------
 .../portal_customer_event_view.xml                  |  2 +-
 .../security/portal_customer_security.xml           |  1 -
 addons/sale/sale_view.xml                           |  2 +-
 6 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 35508477009..9525045b8aa 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -5,7 +5,7 @@
         <!-- toplevel menu -->
         <menuitem id="mail_feeds_main" name="Feeds" sequence="0"
             web_icon="static/src/img/feeds.png"
-            web_icon_hover="static/src/img/feeds-hover.png" />
+            web_icon_hover="static/src/img/feeds-hover.png"  groups="base.group_user"/>
         <record id="mail_feeds_main" model="ir.ui.menu">
             <field name="action" ref="action_mail_all_feeds"/>
         </record>
diff --git a/addons/portal_customer/board_portal_customer_view.xml b/addons/portal_customer/board_portal_customer_view.xml
index 8ace2d0e380..db6283b47a7 100644
--- a/addons/portal_customer/board_portal_customer_view.xml
+++ b/addons/portal_customer/board_portal_customer_view.xml
@@ -2,15 +2,6 @@
 <openerp>
     <data>
     
-     <!-- <record model="ir.actions.act_window" id="action_event_view_main">
-           <field name="name">Events</field>
-           <field name="type">ir.actions.act_window</field>
-           <field name="res_model">event.event</field>
-           <field name="view_type">tree</field>
-           <field name="view_mode">kanban</field>
-           <field name="view_id" ref="event.view_event_kanban"/>
-           <field name="context">{"search_default_upcoming":1}</field>
-       </record> -->
        
        <record id="action_mail_my_feeds" model="ir.actions.client">
             <field name="name">My Feeds</field>
@@ -25,10 +16,10 @@
                <form string="DashBoard">
                    <board style="2-1">
                        <column>
-                        <action name="%(board.action_res_widgets_tweets)d" string="Latest News" />
+                         <action name="%(mail.action_mail_my_feeds)d" string="My Wall"/>
                        </column>
                        <column>
-                         <action name="%(mail.action_mail_my_feeds)d" string="My Wall"/>
+                        
                        </column>
                    </board>
                </form>
diff --git a/addons/portal_customer/portal_customer_menu.xml b/addons/portal_customer/portal_customer_menu.xml
index e64f9e14ffa..84f628dd1a5 100644
--- a/addons/portal_customer/portal_customer_menu.xml
+++ b/addons/portal_customer/portal_customer_menu.xml
@@ -5,24 +5,18 @@
       <menuitem name="Customer Portal" id="customer_portal"/>      
         <menuitem name="Address Book" id="customer_portal_address_book_main" parent="customer_portal" groups="group_sales_portal"/>
             <menuitem name="Contacts" id="customer_portal_address_book" parent="customer_portal_address_book_main" action="base.action_partner_form"/>
-
         <menuitem name="Track Orders" id="customer_portal_track_orders" parent="customer_portal" groups="group_sales_portal"/>
             <menuitem name="Quotation" id="customer_portal_quotation" parent="customer_portal_track_orders" action="sale.action_order_tree5"/>
             <menuitem name="Sales Orders" id="customer_portal_sales_orders" parent="customer_portal_track_orders" action="sale.action_order_form"/>
             <menuitem name="Delivery Orders" id="customer_portal_delivery" parent="customer_portal_track_orders" action="action_picking_tree"/>
-    
         <menuitem name="Invoice and Payments" id="customer_portal_invoice_payements" parent="customer_portal" groups="group_sales_portal"/>
             <menuitem name="Invoice" id="customer_portal_invoice" parent="customer_portal_invoice_payements" action="account.action_invoice_tree1"/>
             <menuitem name="Payments" id="customer_portal_payments" parent="customer_portal_invoice_payements" action="account_voucher.action_vendor_receipt"/>
-        
         <menuitem name="Services" id="customer_portal_services" parent="customer_portal" groups="group_sales_portal"/>
             <menuitem name="Products" id="customer_portal_products" parent="customer_portal_services" action="product_normal_action"/>
-  
         <menuitem name="After Sales Services" id="customer_portal_after_sales" parent="customer_portal" groups="group_sales_portal"/>
-        
         <menuitem name="Contact Us" id="customer_portal_contact" parent="customer_portal" groups="group_sales_portal"/>
-            <menuitem name="Contact Us" id="customer_portal_contact1" parent="customer_portal_contact" groups="group_sales_portal" action="action_contact_us" />
-        
-        
+        <menuitem name="Contact Us" id="customer_portal_contact1" parent="customer_portal_contact" groups="group_sales_portal" action="action_contact_us"/>
+            
     </data>
 </openerp>
diff --git a/addons/portal_customer_event/portal_customer_event_view.xml b/addons/portal_customer_event/portal_customer_event_view.xml
index 65f69741d1b..9ffcb95d9b2 100644
--- a/addons/portal_customer_event/portal_customer_event_view.xml
+++ b/addons/portal_customer_event/portal_customer_event_view.xml
@@ -3,6 +3,6 @@
     <data>
         <menuitem name="Registration" id="customer_portal_registration" parent="portal_customer.customer_portal_track_orders" action="event.action_registration"/>
         <menuitem name="Events" id="customer_portal_events" parent="portal_customer.customer_portal_services" action="event.action_event_view"  />
-        <menuitem name="Events" id="event.menu_event_event" action="event.action_event_view" parent="base.menu_event_main" groups="base.group_sale_salesman"/>
+        <menuitem name="Events" id="event.menu_event_event" action="event.action_event_view" parent="base.menu_event_main" groups="base.group_user"/>
     </data>
 </openerp>
diff --git a/addons/portal_customer_event/security/portal_customer_security.xml b/addons/portal_customer_event/security/portal_customer_security.xml
index ae161c8c642..d08c038bb1f 100644
--- a/addons/portal_customer_event/security/portal_customer_security.xml
+++ b/addons/portal_customer_event/security/portal_customer_security.xml
@@ -5,7 +5,6 @@
         <record id="portal_event_rule" model="ir.rule">
             <field name="name">Personal Events</field>
             <field ref="event.model_event_event" name="model_id"/>
-            <field name="domain_force">[('registration_ids.email','=',user.login)]</field>
             <field name="groups" eval="[(4, ref('portal_customer.group_sales_portal'))]"/>
         </record>
         
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2b41b74305c..3518b1a26f1 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -131,7 +131,7 @@
                     </group>
                     <notebook colspan="5">
                         <page string="Sales Order">
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1" groups="base.group_user"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1" />
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>