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

[FIX] account_cancel,web_editor: small issues introduced during previous forward-port

Browse Source
This commit is contained in:
Christophe Simonis
2015-09-23 15:39:09 +02:00
parent a93d8380ab
commit cb0987889c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_cancel/account_cancel_view.xml
+2 -2
View File
@@ -48,7 +48,7 @@
<record id="bank_statement_draft_form_inherit2" model="ir.ui.view">
<field name="name">bank.statement.draft.form.inherit2</field>
<field name="model">account.bank.statement</field>
<field name="inherit_id" ref="account.view_bank_statement_form2"/>
<field name="inherit_id" ref="account.view_bank_statement_form"/>
<field name="arch" type="xml">
<xpath expr="//button[@name='button_cancel']" position="after">
<button name="button_draft" states="confirm" string="Reset to New" type="object"/>
@@ -84,7 +84,7 @@
<record id="bank_statement_cancel_form_inherit2" model="ir.ui.view">
<field name="name">bank.statement.cancel.form.inherit2</field>
<field name="model">account.bank.statement</field>
<field name="inherit_id" ref="account.view_bank_statement_form2"/>
<field name="inherit_id" ref="account.view_bank_statement_form"/>
<field name="arch" type="xml">
<field name="line_ids" position="attributes">
<attribute name="options">{'reload_on_button': true}</attribute>
addons/web_editor/static/src/js/tour.rte.js
+1 -1
View File
@@ -377,7 +377,7 @@ Tour.register({
title: "check the image style",
},
{
waitFor: '#wrapwrap img:eq(1)[src^="/web_editor/font_to_img/"][src$="/rgb(66,139,202)/27"]',
waitFor: '#wrapwrap img:eq(1)[src^="/web_editor/font_to_img/"][src$="/rgb(66,139,202)/32"]',
title: "check the font image src",
},
{