-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MERGE] Forward-port saas-4 up to bf135ad
- Loading branch information
Showing
23 changed files
with
157 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink | ||
access_event_event_ticket_user,event.event.ticket.user,event_sale.model_event_event_ticket,event.group_event_user,1,0,0,0 | ||
access_event_event_ticket_admin,event.event.ticket.admin,event_sale.model_event_event_ticket,event.group_event_manager,1,1,1,1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -134,3 +134,6 @@ div#blog_angle_down | |
|
||
mark + .popover | ||
cursor: pointer | ||
|
||
.discussion_scroll_post | ||
overflow-x: auto |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
addons/website_crm_partner_assign/data/res_partner_grade_demo.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<openerp> | ||
<data noupdate="1"> | ||
<record id="crm_partner_assign.res_partner_grade_platinium" model="res.partner.grade"> | ||
<field name="website_published" eval="True" /> | ||
</record> | ||
<record id="crm_partner_assign.res_partner_grade_gold" model="res.partner.grade"> | ||
<field name="website_published" eval="True" /> | ||
</record> | ||
<record id="crm_partner_assign.res_partner_grade_silver" model="res.partner.grade"> | ||
<field name="website_published" eval="True" /> | ||
</record> | ||
<record id="crm_partner_assign.res_partner_grade_bronze" model="res.partner.grade"> | ||
<field name="website_published" eval="True" /> | ||
</record> | ||
</data> | ||
</openerp> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink | ||
access_event_event_ticket_public,event.event.ticket.public,event_sale.model_event_event_ticket,,1,0,0,0 | ||
access_event_event_ticket_admin,event.event.ticket.admin,event_sale.model_event_event_ticket,event.group_event_manager,1,1,1,1 | ||
access_event_product_product_public,event.product.product.public,product.model_product_product,base.group_public,1,0,0,0 | ||
access_event_product_template_public,event.product.template.public,product.model_product_template,base.group_public,1,0,0,0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<openerp> | ||
<data> | ||
|
||
<template id="subscribe" inherit_id="website.snippets" name="Snippet Subscribe"> | ||
|
||
<xpath expr="//div[@id='snippet_content']" position="inside"> | ||
<div> | ||
<div class="oe_snippet_thumbnail"> | ||
<img class="oe_snippet_thumbnail_img" src="/website_mail/static/src/img/blocks/button_group_subscribe.png"/> | ||
<span class="oe_snippet_thumbnail_title">Discussion Group</span> | ||
</div> | ||
|
||
<div class="oe_snippet_body js_follow" | ||
data-id="0" | ||
data-object="mail.group" | ||
data-follow="off"> | ||
<div class="input-group js_mg_follow_form"> | ||
<input | ||
type="email" | ||
name="email" | ||
class="js_follow_email form-control" | ||
placeholder="your email..."/> | ||
<span class="input-group-btn"> | ||
<button href="#" class="btn btn-primary js_follow_btn">Subscribe</button> | ||
</span> | ||
</div> | ||
<p class="js_mg_details hidden well well-sm"> | ||
<span class="js_mg_email hidden"><i class="fa fa-envelope-o"/><a href="#" class="js_mg_email"> send mail</a> - </span> | ||
<i class="fa fa-file-o"/><a href="#" class="js_mg_link"> archives</a> - | ||
<i class="fa fa-times"/><a href="#" class="js_unfollow_btn"> unsubscribe</a> | ||
</p> | ||
</div> | ||
|
||
</div> | ||
</xpath> | ||
|
||
|
||
<xpath expr="//div[@id='snippet_options']" position="inside"> | ||
<div data-snippet-option-id='subscribe' | ||
data-selector=".js_follow" | ||
data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel" | ||
> | ||
<li> | ||
<a href="#" class="button js_mailing_list">Change Discussion List</a> | ||
</li> | ||
</div> | ||
</xpath> | ||
|
||
</template> | ||
|
||
</data> | ||
</openerp> |
Oops, something went wrong.