diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index a440b65a708..4b954674175 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -162,39 +162,37 @@
                 </header>
                 <sheet string="Supplier Invoice">
                   <div class="oe_title">
-                  <h1>
-                     <label string="Draft Invoice " attrs="{'invisible': [('state','not in',('draft',))]}"/>
-                     <label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
-                     <label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
-                     <field name="number" readonly="1" class="oe_inline"/>
-                  </h1>
-                    <label string="Concerns" for="origin" class="oe_edit_only"/>
-                    <h2>
-                        <field name="origin" placeholder="PO 002"/> From
-                        <field string="Supplier" name="partner_id"
-                              on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
-                              context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
-                              domain="[('supplier', '=', True)]"/>
-                      </h2>
-                    </div>
-                    <group>
+                    <h1>
+                        <label string="Draft Invoice" attrs="{'invisible': [('state','not in',('draft',))]}"/>
+                        <label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
+                        <label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
+                        <field name="number" readonly="1" class="oe_inline"/>-
+                        <field name="origin" placeholder="PO 002" class="oe_inline"/>
+                    </h1>
+                  </div> 
+                  <group>
                        <group>
-                         <field name="date_invoice"/>
-                         <field name="date_due"/>
-                         <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
-                         <label for="reference"/>
+                         <field string="Supplier" name="partner_id"
+                              on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
+                              context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1, 'show_address': 1}"
+                              domain="[('supplier', '=', True)]" options='{"always_reload": true}'/>
+                          <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
+                         
+                         <label for="reference" string="Communication"/>
                          <div>
-                          <field name="reference_type"/>
-                          <field name="reference" placeholder="Payment Reference"/>
+                           <field name="reference_type" class="oe_inline" nolabel="1"/>
+                          <field name="reference" placeholder="Payment Reference" class="oe_inline"/>
                          </div>
                        </group>
                        <group>
+                          <field name="date_invoice"/>
+                          <field name="date_due"/>
                           <field name="fiscal_position" widget="selection"/>
+                          <field name="currency_id"/>
                           <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
                                  groups="account.group_account_user"/>
                           <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
                                  name="account_id" groups="account.group_account_user"/>
-                          <field name="currency_id"/>
                           <field name="type" invisible="1"/>
                         </group>
                     </group>
@@ -310,14 +308,13 @@
                         <field name="number" readonly="1" class="oe_inline"/>-
                         <field name="name" placeholder="Project XYZ" class="oe_inline"/>
                     </h1>
-                    
                     <field name="type" invisible="1"/>
                     <group>
                         <group>
                             <field string="Customer" name="partner_id"
                                 on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
-                                groups="base.group_user" context="{'search_default_customer': 1}"
-                                domain="[('customer', '=', True)]"/>
+                                groups="base.group_user" context="{'search_default_customer': 1, 'show_address': 1}"
+                                domain="[('customer', '=', True)]" options='{"always_reload": true}'/>
                             <field name="fiscal_position" widget="selection" />
                             <field name="payment_term" widget="selection"/>
                         </group>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index c525ca9eb78..d39737aeeed 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -17,7 +17,6 @@
                     <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" class="oe_highlight"/>
                     <field name="state" widget="statusbar" nolabel="1" />
                 </header>
-                <sheet string="Fiscalyear" >
                     <group>
                         <group>
                             <field name="name"/>
@@ -41,7 +40,6 @@
                             </group>
                         </form>
                     </field>
-                </sheet>
                 </form>
             </field>
         </record>
@@ -103,25 +101,23 @@
                     <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
                     <field name="state" widget="statusbar" nolabel="1"/>
                 </header>
-                <sheet>
-                    <group col="4">
-                        <group>
-                            <field name="name"/>
-                            <field name="fiscalyear_id" widget="selection"/>
-                            <label for="date_start" string="Duration" />
-                            <div>
-                               <field name="date_start" class="oe_inline" nolabel="1"/> 
-                                <span attr="{'invisible': [('date_stop','=',False)]}"> - </span> 
-                                <field name="date_stop" nolabel="1" class="oe_inline"/>
-                             </div>
-                        </group>
-                        <group>
-                            <field name="code"/>
-                            <field name="special"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        </group>
-                    </group>
-                </sheet>
+                <group>
+                     <group>
+                         <field name="name"/>
+                         <field name="fiscalyear_id" widget="selection"/>
+                         <label for="date_start" string="Duration" />
+                         <div>
+                            <field name="date_start" class="oe_inline" nolabel="1"/> 
+                             <span attr="{'invisible': [('date_stop','=',False)]}"> - </span> 
+                             <field name="date_stop" nolabel="1" class="oe_inline"/>
+                          </div>
+                     </group>
+                     <group>
+                         <field name="code"/>
+                         <field name="special"/>
+                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                     </group>
+                 </group>
                 </form>
             </field>
         </record>
@@ -472,12 +468,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Journal" version="7.0">
-                    <div class="oe_title">
-                        <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
-                        <label for="type" class="oe_edit_only"/>
-                        <h2><field name="type" on_change="onchange_type(type, currency, context)"/></h2>
-                    </div>
+                   <group>
+                        <field name="name"/>
+                        <field name="type" on_change="onchange_type(type, currency, context)"/>
+                    </group>
                     <notebook>
                     <page string="Journal Configuration">
                         <group>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index b391764f6c7..7b309d42a79 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -25,13 +25,13 @@
                         <group col="4">
                             <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)"/>
                         </group>
-                        <group string="Dates" col="4">
-                            <field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
-                            <field name="date_to" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}"  colspan="4"/>
+                        <group string="Dates"  attrs="{'invisible':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" col="4" >
+                            <field name="date_from"  colspan="4"/>
+                            <field name="date_to"    colspan="4"/>
                         </group>
-                        <group string="Periods" col="4">
-                            <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
-                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
+                        <group string="Periods" attrs="{'invisible':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" col="4">
+                            <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]"   colspan="4"/>
+                            <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"  colspan="4"/>
                         </group>
                     </page>
                     <page string="Journals" name="journal_ids">