From 132f052e178f53d2e7cffefebf7a3f8ec7196208 Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 21 Nov 2012 13:33:46 +0100
Subject: [PATCH] [FIX] Security rules, and conflicts after merging trunk.

bzr revid: vta@openerp.com-20121121123346-5wi4ko1e5ny57ki0
---
 addons/mail/static/src/xml/mail_followers.xml | 34 +++++++++----------
 addons/portal/portal_view.xml                 |  4 ---
 .../portal_claim/security/portal_security.xml |  2 +-
 .../security/portal_security.xml              |  2 +-
 addons/portal_sale/portal_sale_view.xml       |  6 ++--
 5 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 5fde087a660..11698c1fb62 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -5,25 +5,23 @@
         followers main template
         Template used to display the followers, the actions and the subtypes in a record.
         -->
-    <div t-name="mail.followers" class="oe_followers">
-        <t t-if="!widget.node.attrs.invisible">        
-            <div class="oe_actions">
-                <button type="button" class="oe_follower oe_notfollow">
-                    <span class="oe_follow">Follow</span>
-                    <span class="oe_unfollow">Unfollow</span>
-                    <span class="oe_following">Following</span>
-                </button>
-                <div class="oe_subtype_list"></div>
-            </div>
-            <t t-if="widget.comment">
-                <h5 class="oe_comment"><t t-raw="widget.comment"/></h5>
-            </t>
-            <div class='oe_follower_title_box'>
-                <h4 class='oe_follower_title'>Followers</h4>
-                <a href='#' class="oe_invite">Invite others</a>
-            </div>
-            <div class="oe_follower_list"></div>
+    <div t-name="mail.followers" class="oe_followers">        
+        <div class="oe_actions">
+            <button type="button" class="oe_follower oe_notfollow">
+                <span class="oe_follow">Follow</span>
+                <span class="oe_unfollow">Unfollow</span>
+                <span class="oe_following">Following</span>
+            </button>
+            <div class="oe_subtype_list"></div>
+        </div>
+        <t t-if="widget.comment">
+            <h5 class="oe_comment"><t t-raw="widget.comment"/></h5>
         </t>
+        <div class='oe_follower_title_box'>
+            <h4 class='oe_follower_title'>Followers</h4>
+            <a href='#' class="oe_invite">Invite others</a>
+        </div>
+        <div class="oe_follower_list"></div>
     </div>
 
     <!--
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 45fa2a4dacb..9e9c492a614 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -49,10 +49,6 @@
 
         <menuitem name="Inbox" id="portal_inbox" parent="portal_messages"
             action="mail.action_mail_inbox_feeds" sequence="10"/>
-        <menuitem name="Archives" id="portal_tome" parent="portal_messages"
-            action="mail.action_mail_archives_feeds" sequence="20"/>
-        <menuitem name="Sent" id="portal_sent" parent="portal_messages"
-            action="mail.action_mail_sent_feeds" sequence="30"/>
 
     </data>
 </openerp>
diff --git a/addons/portal_claim/security/portal_security.xml b/addons/portal_claim/security/portal_security.xml
index 6a04ca9747e..af5261c408b 100644
--- a/addons/portal_claim/security/portal_security.xml
+++ b/addons/portal_claim/security/portal_security.xml
@@ -10,7 +10,7 @@
             <field eval="1" name="perm_unlink"/>
             <field eval="1" name="perm_write"/>
             <field eval="1" name="perm_read"/>
-            <field eval="1" name="perm_create"/>
+            <field eval="0" name="perm_create"/>
         </record>
 
     </data>
diff --git a/addons/portal_project_issue/security/portal_security.xml b/addons/portal_project_issue/security/portal_security.xml
index 2937ed52b69..a121eeb593e 100644
--- a/addons/portal_project_issue/security/portal_security.xml
+++ b/addons/portal_project_issue/security/portal_security.xml
@@ -10,7 +10,7 @@
             <field eval="1" name="perm_unlink"/>
             <field eval="1" name="perm_write"/>
             <field eval="1" name="perm_read"/>
-            <field eval="1" name="perm_create"/>
+            <field eval="0" name="perm_create"/>
         </record>
 
     </data>
diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml
index 3a984ccd55f..7d3ab5b3632 100644
--- a/addons/portal_sale/portal_sale_view.xml
+++ b/addons/portal_sale/portal_sale_view.xml
@@ -82,11 +82,11 @@
         </record>
 
         <menuitem name="Quotations" id="portal_quotations" parent="portal.portal_orders"
-            action="action_order_tree5" sequence="10"/>
+            action="action_quotations_portal" sequence="10"/>
         <menuitem name="Sales Orders" id="portal_sales_orders" parent="portal.portal_orders"
-            action="action_order_form" sequence="20"/>
+            action="action_orders_portal" sequence="20"/>
         <menuitem name="Invoices" id="portal_invoices" parent="portal.portal_orders"
-            action="action_invoice_tree1" sequence="30"/>
+            action="portal_action_invoices" sequence="30"/>
         <menuitem name="Customer Refunds" id="portal_payments" parent="portal.portal_orders"
             action="action_invoice_tree2" sequence="40"/>