[FIX] Security rules, and conflicts after merging trunk.
bzr revid: vta@openerp.com-20121121123346-5wi4ko1e5ny57ki0
This commit is contained in:
parent
9a15327d52
commit
132f052e17
|
@ -5,25 +5,23 @@
|
||||||
followers main template
|
followers main template
|
||||||
Template used to display the followers, the actions and the subtypes in a record.
|
Template used to display the followers, the actions and the subtypes in a record.
|
||||||
-->
|
-->
|
||||||
<div t-name="mail.followers" class="oe_followers">
|
<div t-name="mail.followers" class="oe_followers">
|
||||||
<t t-if="!widget.node.attrs.invisible">
|
<div class="oe_actions">
|
||||||
<div class="oe_actions">
|
<button type="button" class="oe_follower oe_notfollow">
|
||||||
<button type="button" class="oe_follower oe_notfollow">
|
<span class="oe_follow">Follow</span>
|
||||||
<span class="oe_follow">Follow</span>
|
<span class="oe_unfollow">Unfollow</span>
|
||||||
<span class="oe_unfollow">Unfollow</span>
|
<span class="oe_following">Following</span>
|
||||||
<span class="oe_following">Following</span>
|
</button>
|
||||||
</button>
|
<div class="oe_subtype_list"></div>
|
||||||
<div class="oe_subtype_list"></div>
|
</div>
|
||||||
</div>
|
<t t-if="widget.comment">
|
||||||
<t t-if="widget.comment">
|
<h5 class="oe_comment"><t t-raw="widget.comment"/></h5>
|
||||||
<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>
|
|
||||||
</t>
|
</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>
|
</div>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
|
|
|
@ -49,10 +49,6 @@
|
||||||
|
|
||||||
<menuitem name="Inbox" id="portal_inbox" parent="portal_messages"
|
<menuitem name="Inbox" id="portal_inbox" parent="portal_messages"
|
||||||
action="mail.action_mail_inbox_feeds" sequence="10"/>
|
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>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<field eval="1" name="perm_unlink"/>
|
<field eval="1" name="perm_unlink"/>
|
||||||
<field eval="1" name="perm_write"/>
|
<field eval="1" name="perm_write"/>
|
||||||
<field eval="1" name="perm_read"/>
|
<field eval="1" name="perm_read"/>
|
||||||
<field eval="1" name="perm_create"/>
|
<field eval="0" name="perm_create"/>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<field eval="1" name="perm_unlink"/>
|
<field eval="1" name="perm_unlink"/>
|
||||||
<field eval="1" name="perm_write"/>
|
<field eval="1" name="perm_write"/>
|
||||||
<field eval="1" name="perm_read"/>
|
<field eval="1" name="perm_read"/>
|
||||||
<field eval="1" name="perm_create"/>
|
<field eval="0" name="perm_create"/>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
</data>
|
</data>
|
||||||
|
|
|
@ -82,11 +82,11 @@
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<menuitem name="Quotations" id="portal_quotations" parent="portal.portal_orders"
|
<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"
|
<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"
|
<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"
|
<menuitem name="Customer Refunds" id="portal_payments" parent="portal.portal_orders"
|
||||||
action="action_invoice_tree2" sequence="40"/>
|
action="action_invoice_tree2" sequence="40"/>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue