From cb0987889c8f04810a998388b2d8204458bd5708 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Wed, 23 Sep 2015 15:39:09 +0200
Subject: [PATCH] [FIX] account_cancel,web_editor: small issues introduced
 during previous forward-port

---
 addons/account_cancel/account_cancel_view.xml | 4 ++--
 addons/web_editor/static/src/js/tour.rte.js   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/account_cancel_view.xml
index 25fcbeffa4d..6b326bc09fb 100644
--- a/addons/account_cancel/account_cancel_view.xml
+++ b/addons/account_cancel/account_cancel_view.xml
@@ -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>
diff --git a/addons/web_editor/static/src/js/tour.rte.js b/addons/web_editor/static/src/js/tour.rte.js
index 97fd179fa25..dbf63538ae6 100644
--- a/addons/web_editor/static/src/js/tour.rte.js
+++ b/addons/web_editor/static/src/js/tour.rte.js
@@ -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",
         },
         {