pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-10 up to 09e9434

Browse Source
This commit is contained in:
Christophe Simonis
2016-07-30 13:02:20 +02:00
parent ec841b7fa1 09e943429e
commit 65a67cedb4
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/less/web_editor.common.less
+4
View File
@@ -8,6 +8,10 @@ html, body {
display: none !important; display: none !important;
} }
.editor_enable .css_editable_mode_hidden {
display: none !important;
}
/* ----- Editor (for public user, like forum) ----- */ /* ----- Editor (for public user, like forum) ----- */
.note-toolbar { .note-toolbar {
margin-left: 0 !important; margin-left: 0 !important;
addons/website_sale/views/templates.xml
+7
View File
@@ -439,6 +439,13 @@
<span itemprop="price" style="display:none;" t-esc="product.price"/> <span itemprop="price" style="display:none;" t-esc="product.price"/>
<span itemprop="priceCurrency" style="display:none;" t-esc="website.currency_id.name"/> <span itemprop="priceCurrency" style="display:none;" t-esc="website.currency_id.name"/>
</h4> </h4>
<h4 class="css_non_editable_mode_hidden">
<span t-field="product.lst_price"
t-field-options='{
"widget": "monetary",
"display_currency": "product.currency_id"
}'/>
</h4>
<h4 class="hidden oe_not_available bg-warning">Product not available</h4> <h4 class="hidden oe_not_available bg-warning">Product not available</h4>
</div> </div>
</template> </template>