Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
<record id="ir_filters_portal_public_rule" model="ir.rule">
<field name="domain_force">[('user_ids', 'in', user.ids)]</field>
</record>
<record id="it" model="res.country">
<field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s %(state_code)s\n%(country_name)s'" name="address_format"/>
</record>
<record id="kg" model="res.country">
<field eval="'%(street)s\n%(street2)s\n%(city)s\n%(state_name)s\n%(country_name)s'" name="address_format"/>
<field name="state_required">1</field>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,13 @@ new model website.page_options.mixin [module website]
new model website.page_visibility_options.mixin [module website]
new model website.technical.page [module website]
---Fields in module 'general'---
# 14568 fields matched,
# Direct match: 14393
# 14577 fields matched,
# Direct match: 14402
# Found in other module with different type: 0
# Found in other module: 143
# Found with different type: 32
# In obsolete models: 207
# New columns: 1815
# New columns: 1816
# Not matched: 1002
---XML records in module 'general'---
---Probably obsolete module l10n_in_ewaybill_port---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ resource / resource.calendar.attendance / day_period (selection) : se
resource / resource.calendar.attendance / duration_hours (float) : is now stored
resource / resource.calendar.attendance / resource_id (many2one) : DEL relation: resource.resource
---XML records in module 'resource'---
NEW ir.ui.view: resource.view_company_form_inherit_resource
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
Hello<br/><br/>
There is something new in the course <strong t-out="object.channel_id.name or ''">Trees, Wood and Gardens</strong> you are following:<br/><br/>
<center><strong t-out="object.name or ''">Trees</strong></center>
<t t-if="object.image_1024"><div style="padding: 16px 8px 16px 8px; text-align: center;"><a t-att-href="object.website_share_url"><img t-att-alt="object.name" t-attf-src="{{ ctx.get('base_url') }}/web/image/slide.slide/{{ object.id }}/image_1024" style="height:auto; width:150px; margin: 16px;"/></a></div></t>
<t t-if="object.image_1024"><div style="padding: 16px 8px 16px 8px; text-align: center;"><a t-att-href="object.website_share_url"><img t-att-alt="object.name" t-att-src="object.get_image_1024_src()" style="height:auto; width:150px; margin: 16px;"/></a></div></t>
<div style="padding: 16px 8px 16px 8px; text-align: center;"><a t-att-href="object.website_share_url" t-attf-style="background-color: {{object.user_id.company_id.email_secondary_color or '#875A7B'}}; padding: 8px 16px 8px 16px; text-decoration: none; color: {{object.user_id.company_id.email_primary_color or '#FFFFFF'}}; border-radius: 5px;">View content</a></div>
Enjoy this exclusive content!
<t t-if="user.signature"><br/><div>--<br/><t t-out="user.signature or ''">Mitchell Admin</t></div></t>
Expand All @@ -189,7 +189,7 @@
<p style="margin: 0px; padding: 0px; font-size: 13px;">
Hello<br/><br/>
<t t-out="user.name or ''">Mitchell Admin</t> shared the <t t-out="object.slide_category or ''">document</t> <strong t-out="object.name or ''">Trees</strong> with you!
<div style="margin: 16px 8px 16px 8px; text-align: center;"><a t-att-href="(object.website_share_url + '?fullscreen=1') if ctx.get('fullscreen') else object.website_share_url"><img t-att-alt="object.name" t-attf-src="{{ ctx.get('base_url') }}/web/image/slide.slide/{{ object.id }}/image_1024" style="height:auto; width:150px; margin: 16px;"/></a></div>
<div style="margin: 16px 8px 16px 8px; text-align: center;"><a t-att-href="(object.website_share_url + '?fullscreen=1') if ctx.get('fullscreen') else object.website_share_url"><img t-att-alt="object.name" t-att-src="object.get_image_1024_src()" style="height:auto; width:150px; margin: 16px;"/></a></div>
<div style="padding: 16px 8px 16px 8px; text-align: center;"><a t-att-href="(object.website_share_url + '?fullscreen=1') if ctx.get('fullscreen') else object.website_share_url" t-attf-style="background-color: {{user.company_id.email_secondary_color or '#875A7B'}}; padding: 8px 16px 8px 16px; text-decoration: none; color: {{user.company_id.email_primary_color or '#FFFFFF'}}; border-radius: 5px;">View <strong t-out="object.name or ''">Trees</strong></a></div>
<t t-if="user.signature"><br/><div>--<br/><t t-out="user.signature or ''">Mitchell Admin</t></div></t>
</p>
Expand Down
Loading