diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index bf8c7a9e3cb..4a6575f5a94 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -39,81 +39,81 @@
             <field name="model">account.voucher</field>
             <field name="arch" type="xml">
                 <form string="Accounting Voucher" version="7.0">
-                    <header>
-                        <button name="proforma_voucher" string="Post" states="draft" class="oe_highlight"/>
-                        <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
-                        <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
-                        <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
-                        <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                    </header>
-                    <sheet string="Accounting Voucher">
-                        <group col="6" colspan="4">
-                            <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-                            <field name="payment_rate_currency_id" invisible="1"/>
-                            <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
-                            <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-                            <field name="type" required="1"/>
-                            <field name="name" colspan="2"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            <field name="reference"/>
-                            <field name="account_id" widget="selection" invisible="True"/>
-                        </group>
-                        <notebook colspan="4">
-                            <page string="Voucher Entry">
-                                <field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
-                                    <tree string="Voucher Items" editable="bottom">
-                                        <field name="account_id"/>
-                                        <field name="name"/>
-                                        <field name="amount" sum="Total Amount"/>
-                                        <field name="type"/>
-                                        <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
-                                    </tree>
-                                </field>
-                                <group col="3">
-                                    <group string="Internal Notes">
-                                        <field name="narration" colspan="2" nolabel="1"/>
-                                    </group>
-                                    <group string="Other Information">
-                                        <field name="number"/>
-                                        <field name="currency_id" groups="base.group_multi_currency"/>
-                                    </group>
-                                    <group col="4" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
-                                        <separator string="Total" colspan="4"/>
-                                        <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
-                                        <field name="tax_amount" nolabel="1"/>
-                                        <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                        <label colspan="1" string=""/><field name="amount" string="Total"/>
-                                    </group>
+                  <header>
+                      <button name="proforma_voucher" string="Post" states="draft" class="oe_highlight"/>
+                      <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
+                      <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
+                      <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
+                      <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                  </header>
+                  <sheet string="Accounting Voucher">
+                    <group col="6" colspan="4">
+                        <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                        <field name="payment_rate_currency_id" invisible="1"/>
+                        <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
+                        <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
+                        <field name="type" required="1"/>
+                        <field name="name" colspan="2"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <field name="reference"/>
+                        <field name="account_id" widget="selection" invisible="True"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Voucher Entry">
+                            <field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
+                                <tree string="Voucher Items" editable="bottom">
+                                    <field name="account_id"/>
+                                    <field name="name"/>
+                                    <field name="amount" sum="Total Amount"/>
+                                    <field name="type"/>
+                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                                </tree>
+                            </field>
+                            <group col="3">
+                                <group string="Internal Notes">
+                                    <field name="narration" colspan="2" nolabel="1"/>
                                 </group>
-                            </page>
-                            <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
-                                <group col="4">
-                                    <field name="period_id"/>
-                                    <field name="audit"/>
+                                <group string="Other Information">
+                                    <field name="number"/>
+                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                 </group>
-                                <field name="move_ids" readonly="1">
-                                    <tree string="Journal Items">
-                                        <field name="move_id"/>
-                                        <field name="ref"/>
-                                        <field name="date"/>
-                                        <field name="statement_id"/>
-                                        <field name="partner_id"/>
-                                        <field name="account_id"/>
-                                        <field name="name"/>
-                                        <field name="debit"/>
-                                        <field name="credit"/>
-                                        <field name="state"/>
-                                        <field name="reconcile_id"/>
-                                    </tree>
-                                </field>
-                            </page>
-                        </notebook>
-                    </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_is_follower" invisible="1"/>
-                        <field name="message_ids" widget="mail_thread"/>
-                        <field name="message_follower_ids" widget="mail_followers"/>
-                    </div>
+                                <group col="4" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
+                                    <separator string="Total" colspan="4"/>
+                                    <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                                    <field name="tax_amount" nolabel="1"/>
+                                    <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    <label colspan="1" string=""/><field name="amount" string="Total"/>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
+                            <group col="4">
+                                <field name="period_id"/>
+                                <field name="audit"/>
+                            </group>
+                            <field name="move_ids" readonly="1">
+                               <tree string="Journal Items">
+                                   <field name="move_id"/>
+                                   <field name="ref"/>
+                                   <field name="date"/>
+                                   <field name="statement_id"/>
+                                   <field name="partner_id"/>
+                                   <field name="account_id"/>
+                                   <field name="name"/>
+                                   <field name="debit"/>
+                                   <field name="credit"/>
+                                   <field name="state"/>
+                                   <field name="reconcile_id"/>
+                               </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                  </sheet>
+                  <div class="oe_chatter">
+                      <field name="message_is_follower" invisible="1"/>
+                      <field name="message_ids" widget="mail_thread"/>
+                      <field name="message_follower_ids" widget="mail_followers"/>
+                  </div>
                 </form>
             </field>
         </record>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index ce3d8192ac5..6f1662404e9 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+  <data>
 
     <menuitem name="Organizer" id="note_my_stuff" parent="mail.mail_feeds_main"/>
 
     <!-- note Stage Form View -->
     <record model="ir.ui.view" id="view_note_stage_form">
-        <field name="name">note.stage.form</field>
-        <field name="model">note.stage</field>
-        <field name="arch" type="xml">
-            <form string="Stage of Notes" version="7.0">
-                <group>
-                    <field name="name"/>
-                </group>
-            </form>
-        </field>
+      <field name="name">note.stage.form</field>
+      <field name="model">note.stage</field>
+      <field name="arch" type="xml">
+        <form string="Stage of Notes" version="7.0">
+          <group>
+            <field name="name"/>
+          </group>
+        </form>
+      </field>
     </record>
 
     <!-- note Stage Tree View -->
     <record model="ir.ui.view" id="view_note_stage_tree">
-        <field name="name">note.stage.tree</field>
-        <field name="model">note.stage</field>
-        <field name="field_parent"></field>
-        <field name="arch" type="xml">
-            <tree string="Stages of Notes" editable="bottom">
-                <field name="sequence" widget="handle"/>
-                <field name="name"/>
-                <field name="fold"/>
-            </tree>
-        </field>
+      <field name="name">note.stage.tree</field>
+      <field name="model">note.stage</field>
+      <field name="field_parent"></field>
+      <field name="arch" type="xml">
+        <tree string="Stages of Notes" editable="bottom">
+            <field name="sequence" widget="handle"/>
+            <field name="name"/>
+            <field name="fold"/>
+        </tree>
+      </field>
     </record>
 
     <!-- note Stage Action -->
@@ -43,151 +43,155 @@
 
     <!-- New note Kanban View -->
     <record model="ir.ui.view" id="view_note_note_kanban">
-        <field name="name">note.note.kanban</field>
-        <field name="model">note.note</field>
-        <field name="arch" type="xml">
-            <kanban default_group_by="stage_id" class="oe_notes oe_kanban_quickcreate_textarea" version="7.0">
-                <field name="color"/>
-                <field name="sequence"/>
-                <field name="name"/>
-                <field name="stage_id"/>
-                <field name="active"/>
-                <field name="memo"/>
-                <field name="date_done"/>
-                <field name="current_partner_id"/>
-                <field name="message_follower_ids"/>
-                <field name="tag_ids"/>
-                <templates>
-                    <t t-name="kanban-box">
-                    <t t-set="record.group_fancy" t-value="1"  groups="note.group_note_fancy"/>
-                    <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_global_click_edit oe_semantic_html_override oe_kanban_card #{record.group_fancy==1 ? 'oe_kanban_card_fancy' : ''}">
-                        <div class="oe_dropdown_kanban">
-                            <span>
-                                <a name="onclick_note_is_done" type="object" t-if="record.active.raw_value" class="oe_e">W</a>
-                                <a name="onclick_note_not_done" type="object" t-if="!record.active.raw_value" class="oe_e">è</a>
-                            </span>
-                            <!-- dropdown menu -->
-                            <div class="oe_dropdown_toggle">
-                                <span class="oe_e">í</span>
-                                <ul class="oe_dropdown_menu">
-                                    <li><a type="delete">Delete</a></li>
-                                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-                                </ul>
-                            </div>
-                        </div>
-                        <!-- kanban note -->
-                        <div t-attf-class="oe_kanban_content #{record.active.raw_value ? '' : 'note_text_line_through'}">
-                            <!-- title -->
-                            <field name="name"/>
-                        </div>
-                        <div widget="many2many_tags" t-att-data="record.tag_ids.raw_value" model="note.tag"/>
-                        <div class="oe_right">
-                            <t t-foreach="record.message_follower_ids.raw_value" t-as="follower">
-                                <img t-if="record.current_partner_id.raw_value!=follower" t-att-src="kanban_image('res.partner', 'image_small', follower)" width="24" height="24" class="oe_kanban_avatar" t-att-data-member_id="follower"/>
-                            </t>
-                        </div>
-                        <div class="oe_clear"></div>
-                    </div>
-                    </t>
-                </templates>
-            </kanban>
-        </field>
+      <field name="name">note.note.kanban</field>
+      <field name="model">note.note</field>
+      <field name="arch" type="xml">
+        <kanban default_group_by="stage_id" class="oe_notes oe_kanban_quickcreate_textarea" version="7.0">
+          <field name="color"/>
+          <field name="sequence"/>
+          <field name="name"/>
+          <field name="stage_id"/>
+          <field name="active"/>
+          <field name="memo"/>
+          <field name="date_done"/>
+          <field name="current_partner_id"/>
+          <field name="message_follower_ids"/>
+          <field name="tag_ids"/>
+          <templates>
+            <t t-name="kanban-box">
+
+              <t t-set="record.group_fancy" t-value="1"  groups="note.group_note_fancy"/>
+
+              <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_global_click_edit oe_semantic_html_override oe_kanban_card #{record.group_fancy==1 ? 'oe_kanban_card_fancy' : ''}">
+                <div class="oe_dropdown_kanban">
+                  <span>
+                    <a name="onclick_note_is_done" type="object" t-if="record.active.raw_value" class="oe_e">W</a>
+                    <a name="onclick_note_not_done" type="object" t-if="!record.active.raw_value" class="oe_e">è</a>
+                  </span>
+
+                  <!-- dropdown menu -->
+                  <div class="oe_dropdown_toggle">
+                    <span class="oe_e">í</span>
+                    <ul class="oe_dropdown_menu">
+                      <li><a type="delete">Delete</a></li>
+                      <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                    </ul>
+                  </div>
+                </div>
+
+                <!-- kanban note -->
+                <div t-attf-class="oe_kanban_content #{record.active.raw_value ? '' : 'note_text_line_through'}">
+                  <!-- title -->
+                  <field name="name"/>
+                </div>
+                <div widget="many2many_tags" t-att-data="record.tag_ids.raw_value" model="note.tag"/>
+                <div class="oe_right">
+                  <t t-foreach="record.message_follower_ids.raw_value" t-as="follower">
+                    <img t-if="record.current_partner_id.raw_value!=follower" t-att-src="kanban_image('res.partner', 'image_small', follower)" width="24" height="24" class="oe_kanban_avatar" t-att-data-member_id="follower"/>
+                  </t>
+                </div>
+                <div class="oe_clear"></div>
+              </div>
+            </t>
+          </templates>
+        </kanban>
+      </field>
     </record>
 
-    <!-- New note Tree View -->
+    <!-- New note Form View -->
     <record model="ir.ui.view" id="view_note_note_tree">
-        <field name="name">note.note.tree</field>
-        <field name="model">note.note</field>
-        <field name="arch" type="xml">
-            <tree string="Stages">
-                <field name="name"/>
-                <field name="active"/>
-                <field name="stage_id"/>
-                <field name="tag_ids" widget="many2many_tags" groups="note.group_note_tags"/>
-            </tree>
-        </field>
+      <field name="name">note.note.tree</field>
+      <field name="model">note.note</field>
+      <field name="arch" type="xml">
+        <tree string="Stages">
+          <field name="name"/>
+          <field name="active"/>
+          <field name="stage_id"/>
+          <field name="tag_ids" widget="many2many_tags" groups="note.group_note_tags"/>
+        </tree>
+      </field>
     </record>
 
     <!-- New note Form View -->
     <record model="ir.ui.view" id="view_note_note_form">
-        <field name="name">note.note.form</field>
-        <field name="model">note.note</field>
-        <field name="arch" type="xml">
-            <form string="Note" version="7.0">
-                <header>
-                    <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
-                </header>
-                <field name="memo" widget="html"/><!-- editor_width="100%%" editor_height="60%%" -->
-                <group groups="note.group_note_tags" col="2">
-                    <field name="tag_ids" widget="many2many_tags"/>
-                </group>
-                <div class="oe_chatter">
-                    <field name="message_is_follower" invisible="1"/>
-                    <field name="message_ids" widget="mail_thread"/>
-                    <field name="message_follower_ids" widget="mail_followers"/>
-                </div>
-            </form>
+      <field name="name">note.note.form</field>
+      <field name="model">note.note</field>
+      <field name="arch" type="xml">
+        <form string="Note" version="7.0">
+          <header>
+            <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
+          </header>
+          <field name="memo" widget="html"/><!-- editor_width="100%%" editor_height="60%%" -->
+          <group groups="note.group_note_tags" col="2">
+            <field name="tag_ids" widget="many2many_tags"/>
+          </group>
+          <div class="oe_chatter">
+            <field name="message_is_follower" invisible="1"/>
+            <field name="message_ids" widget="mail_thread"/>
+            <field name="message_follower_ids" widget="mail_followers"/>
+          </div>
+        </form>
       </field>
     </record>
 
     <!-- Search note  -->
     <record model="ir.ui.view" id="view_note_note_filter">
-        <field name="name">note.note.search</field>
-        <field name="model">note.note</field>
-        <field name="arch" type="xml">
-            <search string="Notes">
-                <field name="memo" string="Note"/>
-                <field name="tag_ids" groups="note.group_note_tags"/>
-                <field name="stage_id"/>
-                <filter name="active_true" string="Active" domain="['|',('active', '=', True),('date_done','=',time.strftime('%%Y-%%m-%%d'))]"/>
-                <filter name="active_false" string="Old" domain="[('active', '=', False)]"/>
-                <group expand="0" string="Group By...">
-                    <filter icon="terp-stock_symbol-selection" string="Stage" help="By sticky note Category" context="{'group_by':'stage_id'}"/>
-                </group>
-            </search>
+      <field name="name">note.note.search</field>
+      <field name="model">note.note</field>
+      <field name="arch" type="xml">
+        <search string="Notes">
+          <field name="memo" string="Note"/>
+          <field name="tag_ids" groups="note.group_note_tags"/>
+          <field name="stage_id"/>
+          <filter name="active_true" string="Active" domain="['|',('active', '=', True),('date_done','=',time.strftime('%%Y-%%m-%%d'))]"/>
+          <filter name="active_false" string="Old" domain="[('active', '=', False)]"/>
+          <group expand="0" string="Group By...">
+            <filter icon="terp-stock_symbol-selection" string="Stage" help="By sticky note Category" context="{'group_by':'stage_id'}"/>
+          </group>
+        </search>
       </field>
     </record>
 
 
     <!-- general settings -->
     <record model="ir.ui.view" id="view_general_settings_note_form">
-        <field name="name">note.view.general_settings.form</field>
-        <field name="model">base.config.settings</field>
-        <field name="inherit_id" ref="base_setup.view_general_configuration"/>
-        <field name="arch" type="xml">
-            <xpath expr="//label[@string='Authentication']/.." position="after">
-                <group>
-                    <label for="id" string="Notes"/>
-                    <div name="note">
-                        <div>
-                            <field name="module_note_pad" class="oe_inline"/>
-                            <label for="module_note_pad"/>
-                        </div>
-                        <div>
-                            <field name="group_note_fancy" class="oe_inline"/>
-                            <label for="group_note_fancy"/>
-                        </div>
-                        <div>
-                            <field name="group_note_tags" class="oe_inline"/>
-                            <label for="group_note_tags"/>
-                        </div>
-                    </div>
-                </group>
-            </xpath>
-        </field>
+      <field name="name">note.view.general_settings.form</field>
+      <field name="model">base.config.settings</field>
+      <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+      <field name="arch" type="xml">
+        <xpath expr="//label[@string='Authentication']/.." position="after">
+          <group>
+              <label for="id" string="Notes"/>
+              <div name="note">
+                  <div>
+                      <field name="module_note_pad" class="oe_inline"/>
+                      <label for="module_note_pad"/>
+                  </div>
+                  <div>
+                      <field name="group_note_fancy" class="oe_inline"/>
+                      <label for="group_note_fancy"/>
+                  </div>
+                  <div>
+                      <field name="group_note_tags" class="oe_inline"/>
+                      <label for="group_note_tags"/>
+                  </div>
+              </div>
+          </group>
+        </xpath>
+      </field>
     </record>
 
     <!-- Action -->
     <record model="ir.actions.act_window" id="action_note_note">
-        <field name="name">Notes</field>
-        <field name="res_model">note.note</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">kanban,tree,form</field>
-        <field name="search_view_id" ref="view_note_note_filter"/>
-        <field name="context">{'search_default_active_true':True}</field>
+      <field name="name">Notes</field>
+      <field name="res_model">note.note</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">kanban,tree,form</field>
+      <field name="search_view_id" ref="view_note_note_filter"/>
+      <field name="context">{'search_default_active_true':True}</field>
     </record>
 
     <menuitem name="Notes" id="note_notes" parent="note_my_stuff" sequence="20" action="action_note_note"/>
 
-    </data>
+  </data>
 </openerp>