X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Faccount%2Faccount_view.xml;h=e4d0e9cf22c11fc4ba15f2daffe2d428d6b9ce71;hb=c15f748be05b3709f5e16680569abdc2949468e2;hp=bf77f0c82c61449a3e0d610cadc6d7b3be926a32;hpb=817be7587b7b91149c1cc191e645e19c38ed420e;p=odoo%2Fodoo.git

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index bf77f0c..e4d0e9c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -7,7 +7,7 @@
             <field name="name">account.fiscalyear.form</field>
             <field name="model">account.fiscalyear</field>
             <field name="arch" type="xml">
-                <form string="Fiscal year" version="7.0">
+                <form string="Fiscal year">
                 <header>
                     <button name="create_period" states="draft" string="Create Monthly Periods" type="object" class="oe_highlight"/>
                     <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" class="oe_highlight"/>
@@ -26,7 +26,7 @@
                         </group>
                     </group>
                     <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
-                        <form string="Period" version="7.0">
+                        <form string="Period">
                             <group col="4">
                                 <field name="name"/>
                                 <field name="code"/>
@@ -61,7 +61,7 @@
                     <filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/>
                     <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/>
                     <field name="state"/>
-                    <group expand="0" string="Group By...">
+                    <group expand="0" string="Group By">
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </search>
@@ -86,7 +86,7 @@
               </p>
             </field>
         </record>
-        <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration" sequence="5" />
+        <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration" sequence="1" />
         <menuitem id="menu_action_account_fiscalyear" action="action_account_fiscalyear" parent="next_id_23"/>
 
         <!-- Period -->
@@ -94,30 +94,28 @@
             <field name="name">account.period.form</field>
             <field name="model">account.period</field>
             <field name="arch" type="xml">
-                <form string="Account Period" version="7.0">
+                <form string="Account Period">
                     <header>
                         <button string="Close Period" name="%(account.action_account_period_close)d" type="action" class="oe_highlight" states="draft"/>
                         <button name="action_draft" states="done" string="Re-Open Period" type="object" groups="account.group_account_manager"/>
                         <field name="state" widget="statusbar" nolabel="1"/>
                     </header>
-                    <sheet>
+                    <group>
                         <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"/> -
-                                    <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>
+                            <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"/> -
+                                <field name="date_stop" nolabel="1" class="oe_inline"/>
+                            </div>
                         </group>
-                    </sheet>
+                        <group>
+                            <field name="code"/>
+                            <field name="special"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
@@ -168,7 +166,7 @@
             <field name="name">account.account.form</field>
             <field name="model">account.account</field>
             <field name="arch" type="xml">
-                <form string="Account" version="7.0">
+                <form string="Account">
                     <label for="code" class="oe_edit_only" string="Account Code and Name"/>
                     <h1>
                         <field name="code" class="oe_inline" placeholder="Account code" style="width: 6em"/> -
@@ -232,7 +230,7 @@
                     <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
                     <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                     <field name="user_type"/>
-                    <group expand="0" string="Group By...">
+                    <group expand="0" string="Group By">
                         <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
                         <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/>
                         <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'type'}"/>
@@ -260,8 +258,8 @@
               </p>
             </field>
         </record>
-        <menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="15"/>
-        <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
+        <menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="2"/>
+        <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu" sequence="1"/>
 
         <act_window
             id="act_account_acount_move_line_open_unreconciled"
@@ -351,7 +349,7 @@
         <act_window
             id="action_account_items"
             name="Journal Items"
-            context="{'search_default_account_id': [active_id]}"
+            context="{'search_default_account_id': [active_id], 'fiscalyear': context.get('fiscalyear')}"
             res_model="account.move.line"
             src_model="account.account"
             key2="tree_but_open"/>
@@ -362,6 +360,7 @@
             <field name="model">account.journal</field>
             <field name="arch" type="xml">
                 <tree string="Account Journal">
+                    <field name='sequence' widget='handle'/>
                     <field name="code"/>
                     <field name="name"/>
                     <field name="type"/>
@@ -381,9 +380,10 @@
                     <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
                     <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
                     <field name="user_id"/>
-                    <group expand="0" string="Group By...">
+                    <group expand="0" string="Group By">
                         <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
                         <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_symbol-selection"/>
+                        <filter string="Company" context="{'group_by':'company_id'}" icon="terp-go-home" groups="base.group_multi_company"/>
                     </group>
                 </search>
             </field>
@@ -392,7 +392,7 @@
             <field name="name">account.journal.form</field>
             <field name="model">account.journal</field>
             <field name="arch" type="xml">
-                <form string="Account Journal" version="7.0">
+                <form string="Account Journal">
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
@@ -413,7 +413,7 @@
                         <page string="Advanced Settings">
                             <group>
                                 <group>
-                                    <field name="user_id" context="{'default_groups_ref': ['account.group_account_user']}"/>
+                                    <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_user']}"/>
                                     <field name="sequence_id" required="0"/>
                                 </group>
                                 <group>
@@ -438,7 +438,7 @@
                                     <field name="internal_account_id" domain="[('type','!=','view')]"/>
                                 </group>
                                 <group string="Miscellaneous">
-                                    <field name="with_last_closing_balance"/>
+                                    <field name="with_last_closing_balance" attrs="{'invisible': [('type', 'not in', ['bank', 'cash'])]}"/>
                                     <field name="cash_control" attrs="{'invisible':[('type','not in', ('cash',))]}"/>
                                 </group>
                             </group>
@@ -488,6 +488,13 @@
            src_model="account.journal"/>
 
         <!-- Bank statement -->
+        
+        <record id="action_bank_reconcile_bank_statements" model="ir.actions.client">
+            <field name="name">Reconciliation on Bank Statements</field>
+            <field name="tag">bank_statement_reconciliation_view</field>
+            <field name="context">{'statement_ids': [active_id]}</field>
+        </record>
+        
         <record id="view_account_bank_statement_filter" model="ir.ui.view">
             <field name="name">account.cash.statement.select</field>
             <field name="model">account.bank.statement</field>
@@ -499,7 +506,7 @@
                     <filter string="Open" name="state_open" domain="[('state','=','open')]" icon="terp-check"/>
                     <filter string="Confirmed" name="state_confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                     <field name="journal_id" domain="[('type', '=', 'cash')]" />
-                    <group expand="0" string="Group By...">
+                    <group expand="0" string="Group By">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
@@ -524,6 +531,7 @@
                 </tree>
             </field>
         </record>
+        
         <record id="view_bank_statement_search" model="ir.ui.view">
             <field name="name">account.bank.statement.search</field>
             <field name="model">account.bank.statement</field>
@@ -535,7 +543,7 @@
                     <filter string="Confirmed" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                     <field name="period_id"/>
                     <field name="journal_id" domain="[('type', '=', 'bank')]" />
-                    <group expand="0" string="Group By...">
+                    <group expand="0" string="Group By">
                         <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
                         <filter string="Status" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                         <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
@@ -543,27 +551,39 @@
                 </search>
             </field>
         </record>
+        
         <record id="view_bank_statement_form" model="ir.ui.view">
             <field name="name">account.bank.statement.form</field>
             <field name="model">account.bank.statement</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
-                <form string="Bank Statement" version="7.0">
+                <form string="Bank Statement">
                 <header>
-                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object" class="oe_highlight"/>
-                    <button name="button_dummy" states="draft" string="Compute" type="object" class="oe_highlight"/>
+                    <field name="all_lines_reconciled" invisible="1" />
+                    <span attrs="{'invisible':['|',('all_lines_reconciled','=',True),('line_ids','=',[])]}">
+                        <button name="%(action_bank_reconcile_bank_statements)d" states="draft" string="Reconcile" type="action" class="oe_highlight"/>
+                    </span>
+                    <span attrs="{'invisible':[('all_lines_reconciled','=',False)]}">
+                        <button name="button_confirm_bank" states="draft" string="Close" type="object" class="oe_highlight"/>
+                    </span>
                     <button name="button_cancel" states="confirm" string="Cancel Statement" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
                     <div class="oe_right oe_button_box" name="import_buttons">
-                       <!-- Put here related buttons -->
+                        <button class="oe_inline oe_stat_button" name="%(action_view_account_statement_from_invoice_lines)d"
+                            string="Import Invoice" type="action"
+                            attrs="{'invisible':[('state','=','confirm')]}" widget="statinfo" icon="fa-pencil-square-o"/>
+                        <button class="oe_inline oe_stat_button" name="button_journal_entries"
+                                string="Journal Items" type="object"
+                                attrs="{'invisible':[('move_line_ids','=',[])]}" icon="fa-bars"/>
+                        <field name="move_line_ids" invisible="1"/>
                     </div>
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <group>
                         <group>
-                            <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" widget="selection"/>
+                            <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" attrs="{'readonly': [('move_line_ids', '!=', [])]}" widget="selection"/>
                             <label for="date" string="Date / Period"/>
                             <div>
                                 <field name="date" on_change="onchange_date(date, company_id)" class="oe_inline"/>
@@ -580,53 +600,39 @@
                     <notebook>
                         <page string="Transactions" name="statement_line_ids">
                             <field name="line_ids" context="{'date':date}">
-                                <tree editable="bottom" string="Statement lines">
+                                <tree editable="bottom" string="Statement lines" colors="grey:journal_entry_id!=False">
                                     <field name="sequence" readonly="1" invisible="1"/>
-                                    <field name="date"/>
-                                    <field name="name"/>
-                                    <field name="ref"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="['|',('parent_id','=',False),('is_company','=',True)]"/>
-                                    <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]"/>
-                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
-                                    <field name="amount"/>
+                                    <field name="journal_entry_id" invisible="1"/>
+                                    <field name="date" attrs="{'readonly' : [('journal_entry_id', '!=', False)] }"/>
+                                    <field name="name" attrs="{'readonly' : [('journal_entry_id', '!=', False)] }"/>
+                                    <field name="ref" attrs="{'readonly' : [('journal_entry_id', '!=', False)] }"/>
+                                    <field name="partner_id" domain="[
+                                        '&amp;',
+                                            '|',('parent_id','=',False),('is_company','=',True),
+                                            '|',('customer','=',True),('supplier','=',True)]"
+                                         context="{'default_supplier': 1}"
+                                         attrs="{'readonly' : [('journal_entry_id', '!=', False)] }"/>
+                                    <field name="amount" attrs="{'readonly' : [('journal_entry_id', '!=', False)] }"/>
+                                    <field name="amount_currency" groups="base.group_multi_currency" attrs="{'readonly' : [('journal_entry_id', '!=', False)] }"/>
+                                    <field name="currency_id" groups="base.group_multi_currency" attrs="{'readonly' : [('journal_entry_id', '!=', False)] }"/>
+                                    <field name="bank_account_id" groups="base.group_no_one"/>
                                 </tree>
-                                <form string="Statement lines" version="7.0">
-                                    <group col="4">
-                                        <field name="date"/>
-                                        <field name="name"/>
-                                        <field name="ref"/>
-                                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                        <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                        <field name="account_id" domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]"/>
-                                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
-                                        <field name="amount"/>
-                                        <field name="sequence" readonly="0"/>
-                                    </group>
-                                    <separator string="Notes"/>
-                                    <field name="note"/>
-                                </form>
                             </field>
                         </page>
                     </notebook>
+                    <group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total">
+                        <div class="oe_subtotal_footer_separator oe_inline">
+                            <label for="balance_end" />
+                            <button name="button_dummy" states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
+                        </div>
+                        <field name="balance_end" nolabel="1" class="oe_subtotal_footer_separator" widget='monetary' options="{'currency_field': 'currency_id'}"/>
+                    </group>
+                    <div class="oe_clear"/>
                 </sheet>
                 </form>
             </field>
         </record>
 
-        <record id="view_bank_statement_form_journal_items" model="ir.ui.view">
-            <field name="name">account.bank.statement.journal.items.form.inherit</field>
-            <field name="model">account.bank.statement</field>
-            <field name="inherit_id" ref="view_bank_statement_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//div[@name='import_buttons']" position="inside">
-                    <button name="button_journal_entries"
-                            string="Journal Items" type="object"
-                            attrs="{'invisible':[('state','!=','confirm')]}"/>
-                </xpath>
-            </field>
-        </record>
-
         <record id="action_bank_statement_tree" model="ir.actions.act_window">
             <field name="name">Bank Statements</field>
             <field name="res_model">account.bank.statement</field>
@@ -643,7 +649,7 @@
                 occurring over a given period of time on a bank account. You
                 should receive this periodicaly from your bank.
               </p><p>
-                OpenERP allows you to reconcile a statement line directly with
+                Odoo allows you to reconcile a statement line directly with
                 the related sale or puchase invoices.
               </p>
             </field>
@@ -671,6 +677,99 @@
             <field name="domain">[('state','=','draft')]</field>
             <field name="filter" eval="True"/>
         </record>
+        
+        <record id="action_bank_reconcile" model="ir.actions.client">
+            <field name="name">Reconciliation on Bank Statements</field>
+            <field name="res_model">account.bank.statement.line</field>
+            <field name="tag">bank_statement_reconciliation_view</field>
+        </record>
+        
+        <!-- because of the needaction badge, groups needs to be specified -->
+        <menuitem id="menu_bank_reconcile_bank_statements" name="Reconcile" parent="account.periodical_processing_bank_statements" groups="group_account_user" action="action_bank_reconcile" sequence="20"/>
+
+        <record id="view_account_statement_operation_template_form" model="ir.ui.view">
+            <field name="name">account.statement.operation.template.form</field>
+            <field name="model">account.statement.operation.template</field>
+            <field name="arch" type="xml">
+                <form string="Statement Operation Templates">
+                    <sheet>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name"/>
+                            </h1>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="account_id" domain="[('company_id', '=', company_id)]"/>
+                                <field name="amount_type"/>
+                                <field name="tax_id" domain="[('company_id', '=', company_id)]"/>
+                            </group>
+                            <group>
+                                <field name="label"/>
+                                <label for="amount"/>
+                                <div>
+                                    <field name="amount" class="oe_inline" />
+                                    <label string="%" class="oe_inline" attrs="{'invisible':[('amount_type','not in',('percentage_of_total', 'percentage_of_balance'))]}" />
+                                </div>
+                                <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', company_id)]"/>
+                                <field name="company_id" groups="base.group_multi_company"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+        <record id="view_account_statement_operation_template_tree" model="ir.ui.view">
+            <field name="name">account.statement.operation.template.tree</field>
+            <field name="model">account.statement.operation.template</field>
+            <field name="arch" type="xml">
+                <tree string="Bank Reconciliation Move Presets">
+                    <field name="name"/>
+                    <field name="account_id"/>
+                    <field name="amount_type"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_account_statement_operation_template_search" model="ir.ui.view">
+            <field name="name">account.statement.operation.template.search</field>
+            <field name="model">account.statement.operation.template</field>
+            <field name="arch" type="xml">
+                <search string="Bank Reconciliation Move preset">
+                        <filter string="With tax" domain="[('tax_id','!=',False)]"/>
+                        <field name="amount_type"/>
+                </search>
+            </field>
+        </record>
+        <record id="action_account_statement_operation_template" model="ir.actions.act_window">
+            <field name="name">Statement Operations</field>
+            <field name="res_model">account.statement.operation.template</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_statement_operation_template_search"/>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a statement operation template.
+              </p><p>
+                Those can be used to quickly create a move line when reconciling
+                your bank statements.
+              </p>
+            </field>
+        </record>
+
+        <menuitem
+            id="account_template_folder"
+            name="Templates"
+            parent="account_account_menu"
+            groups="account.group_account_manager"
+            sequence="3"/>
+        <menuitem
+            id="account_report_folder"
+            name="Reports"
+            parent="account_account_menu"
+            groups="account.group_account_manager"
+            sequence="4"/>
+        <menuitem action="action_account_statement_operation_template" id="menu_action_account_statement_operation_template" parent="account_template_folder" name="Statement Operation Templates" sequence="22"/>
 
         <!-- Account Types -->
         <record id="view_account_type_search" model="ir.ui.view">
@@ -696,7 +795,7 @@
             <field name="name">account.account.type.form</field>
             <field name="model">account.account.type</field>
             <field name="arch" type="xml">
-                <form string="Account Type" version="7.0">
+                <form string="Account Type">
                     <group>
                         <group>
                             <field name="name"/>
@@ -730,7 +829,7 @@
               </p>
             </field>
         </record>
-        <menuitem action="action_account_type_form" sequence="20" id="menu_action_account_type_form" parent="account_account_menu" groups="base.group_no_one"/>
+        <menuitem action="action_account_type_form" sequence="2" id="menu_action_account_type_form" parent="account_account_menu" groups="base.group_no_one"/>
 
         <!-- Entries -->
         <record id="view_account_move_tree" model="ir.ui.view">
@@ -755,7 +854,7 @@
             <field name="name">account.move.reconcile.form</field>
             <field name="model">account.move.reconcile</field>
             <field name="arch" type="xml">
-                <form string="Journal Entry Reconcile" version="7.0">
+                <form string="Journal Entry Reconcile">
                     <group col="4">
                         <field name="name"/>
                         <field name="create_date"/>
@@ -800,7 +899,7 @@
             <field name="name">account.tax.code.form</field>
             <field name="model">account.tax.code</field>
             <field name="arch" type="xml">
-                <form string="Account Tax Code" version="7.0">
+                <form string="Account Tax Code">
                     <group>
                         <group col="4" colspan="2">
                             <field name="name"/>
@@ -834,14 +933,14 @@
                 Click to define a new tax code.
               </p><p>
                 Depending on the country, a tax code is usually a cell to fill
-                in your legal tax statement. OpenERP allows you to define the
+                in your legal tax statement. Odoo allows you to define the
                 tax structure and each tax computation will be registered in
                 one or several tax code.
               </p>
             </field>
         </record>
-        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration" sequence="20"/>
-        <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12" groups="base.group_no_one"/>
+        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration" sequence="4"/>
+        <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="2" groups="base.group_no_one"/>
 
         <act_window
             id="action_tax_code_line_open"
@@ -871,6 +970,7 @@
                     <field name="price_include"/>
                     <field name="description"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <field name="type_tax_use" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -881,6 +981,12 @@
                 <search string="Search Taxes">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('description','ilike',self)]" string="Tax"/>
                     <field name="company_id" groups="base.group_multi_company"/>
+                    <filter string="Sale" domain="[('type_tax_use','=','sale')]" />
+                    <filter string="Purchase" domain="[('type_tax_use','=','purchase')]" />
+                    <group string="Group By">
+                        <filter string="Company" domain="[]" context="{'group_by':'company_id'}"/>
+                        <filter string="Tax Application" domain="[]" context="{'group_by':'type_tax_use'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -888,7 +994,7 @@
             <field name="name">account.tax.form</field>
             <field name="model">account.tax</field>
             <field name="arch" type="xml">
-                <form string="Account Tax" version="7.0">
+                <form string="Account Tax">
                     <group>
                         <group>
                             <field name="name"/>
@@ -907,9 +1013,7 @@
                                 <label for="type"/>
                                 <div>
                                     <field name="type"/>
-                                    <field name="amount" class="oe_inline"
-                                        attrs="{'invisible':[('type','in',('none', 'code', 'balance'))]}"/>
-                                    <label string="%%" attrs="{'invisible':[('type','&lt;&gt;','percent')]}"/>
+                                    <field name="amount" attrs="{'invisible':[('type','in',('none', 'code', 'balance'))]}"/>
                                 </div>
                                 <field name="python_compute" attrs="{'invisible':[('type','!=','code')],'required':[('type','=','code')]}"/>
                                 <field name="python_compute_inv" attrs="{'invisible':[('type','!=','code')],'required':[('type','=','code')]}"/>
@@ -940,7 +1044,6 @@
                                   <field name="ref_tax_sign"/>
                             </group>
                             <group string="Children/Sub Taxes" colspan="2">
-                                <field name="child_depend" class="oe_inline"/>
                                 <field name="child_ids" nolabel="1" colspan="2">
                                       <tree string="Account Tax">
                                           <field name="sequence"/>
@@ -972,7 +1075,7 @@
             <field name="view_id" ref="view_tax_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27"/>
+        <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27" sequence="1"/>
 
         <record id="action_tax_code_tree" model="ir.actions.act_window">
             <field name="name">Chart of Taxes</field>
@@ -988,7 +1091,7 @@
             <field name="model">account.move.line</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Journal Item" version="7.0">
+                <form string="Journal Item">
                     <sheet>
                         <group>
                             <group>
@@ -1057,7 +1160,7 @@
             <field name="model">account.move.line</field>
             <field eval="9" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Journal Item" version="7.0">
+                <form string="Journal Item">
                     <notebook colspan="4">
                         <page string="Information">
                             <group col="4">
@@ -1104,7 +1207,7 @@
             <field name="model">account.move.line</field>
             <field eval="1" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items" create="true" on_write="on_create_write" version="7.0" editable="top">
+                <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items" create="true" on_write="on_create_write" editable="top">
                     <field name="journal_id" options='{"no_open":True}' invisible="context.get('journal_id',False)"/>
                     <field name="period_id" options='{"no_open":True}' invisible="context.get('period_id',False)"/>
                     <field name="date"/>
@@ -1119,7 +1222,7 @@
                     <field name="debit" sum="Total Debit"/>
                     <field name="credit" sum="Total Credit"/>
                     <field name="date_maturity" invisible="context.get('journal_type', False) not in ['sale','sale_refund','purchase','purchase_refund']"/>
-                    <field name="reconcile"/>
+                    <field name="reconcile_ref"/>
                     <field name="invoice" invisible="1"/>
                     <field name="amount_currency" readonly="True" invisible="not context.get('currency',False)"/>
                     <field name="currency_id" readonly="True" invisible="not context.get('currency',False)" />
@@ -1159,7 +1262,7 @@
                     <field name="partner_id"/>
                     <field name="journal_id" context="{'journal_id':self}" widget="selection"/> <!-- it's important to keep widget='selection' in this filter viewbecause without that the value passed in the context is not the ID but the textual value (name) of the selected journal -->
                     <field name="period_id" context="{'period_id':self}" widget="selection"/> <!-- it's important to keep the widget='selection' in this field, for the same reason as explained above -->
-                    <group expand="0" string="Group By...">
+                    <group expand="0" string="Group By">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Account"  icon="terp-folder-green" context="{'group_by':'account_id'}"/>
@@ -1179,8 +1282,8 @@
                 Select the period and the journal you want to fill.
               </p><p>
                 This view can be used by accountants in order to quickly record
-                entries in OpenERP. If you want to record a supplier invoice,
-                start by recording the line of the expense account. OpenERP
+                entries in Odoo. If you want to record a supplier invoice,
+                start by recording the line of the expense account. Odoo
                 will propose to you automatically the Tax related to this
                 account and the counterpart "Account Payable".
               </p>
@@ -1203,8 +1306,9 @@
         <record id="view_move_line_tree_reconcile" model="ir.ui.view">
             <field name="model">account.move.line</field>
             <field eval="24" name="priority"/>
+            <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree_account_reconciliation colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false" version="7.0">
+                <tree_account_reconciliation colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false">
                     <field name="date"/>
                     <field name="move_id"/>
                     <field name="ref"/>
@@ -1260,13 +1364,12 @@
             <field name="name">account.move.form</field>
             <field name="model">account.move</field>
             <field name="arch" type="xml">
-                <form string="Account Entry" version="7.0">
-                <header>
-                    <button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight" groups="account.group_account_invoice"/>
-                    <button name="button_cancel" states="posted" string="Cancel Entry" type="object" groups="account.group_account_invoice"/>
-                    <field name="state" widget="statusbar"/>
-                </header>
-                <sheet string="Journal Entries" >
+                <form string="Account Entry">
+                    <header>
+                        <button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight" groups="account.group_account_invoice"/>
+                        <button name="button_cancel" states="posted" string="Cancel Entry" type="object" groups="account.group_account_invoice"/>
+                        <field name="state" widget="statusbar"/>
+                    </header>
                     <label for="name" class="oe_edit_only" attrs="{'invisible':[('name','=','/')]}"/>
                     <h1>
                         <field name="name" readonly="True" attrs="{'invisible':[('name','=','/')]}"/>
@@ -1289,7 +1392,7 @@
                         <page string="Journal Items">
                             <field name="line_id" widget="one2many_list"
                               context="{'line_id': line_id , 'journal_id': journal_id }">
-                                <form string="Journal Item" version="7.0">
+                                <form string="Journal Item">
                                     <group col="6" colspan="4">
                                         <field name="name"/>
                                         <field name="ref"/>
@@ -1375,7 +1478,6 @@
                             <field name="narration" colspan="4" placeholder="Add an internal note..." nolabel="1" height="50"/>
                         </page>
                     </notebook>
-                    </sheet>
                 </form>
             </field>
         </record>
@@ -1393,12 +1495,12 @@
                     <field name="partner_id"/>
                     <field name="journal_id"/>
                     <field name="period_id"/>
-                    <group expand="0" string="Group By...">
+                    <group expand="0" string="Group By">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
-                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Entries Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Journal Entries by Month"/>
                     </group>
                 </search>
             </field>
@@ -1417,7 +1519,7 @@
                 A journal entry consists of several journal items, each of
                 which is either a debit or a credit transaction.
               </p><p>
-                OpenERP automatically creates one journal entry per accounting
+                Odoo automatically creates one journal entry per accounting
                 document: invoice, refund, supplier payment, bank statements,
                 etc. So, you should record journal entries manually only/mainly
                 for miscellaneous operations.
@@ -1444,7 +1546,7 @@
         <act_window
             id="act_account_move_to_account_move_line_open"
             name="Journal Items"
-            context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
+            context="{'search_default_move_id': active_id, 'default_move_id': active_id}"
             res_model="account.move.line"
             src_model="account.move"/>
 
@@ -1496,7 +1598,7 @@
             <field name="name">account.model.line.form</field>
             <field name="model">account.model.line</field>
             <field name="arch" type="xml">
-                <form string="Journal Entry Model Line" version="7.0">
+                <form string="Journal Entry Model Line">
                     <group col="4">
                         <field colspan="4" name="name"/>
                         <field name="sequence"/>
@@ -1515,7 +1617,7 @@
             <field name="name">account.model.form</field>
             <field name="model">account.model</field>
             <field name="arch" type="xml">
-                <form string="Journal Entry Model" version="7.0">
+                <form string="Journal Entry Model">
                     <group col="4">
                         <field name="name"/>
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)"/>
@@ -1550,7 +1652,7 @@
                     <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
                     <field name="journal_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <group expand="0" string="Group By...">
+                    <group expand="0" string="Group By">
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                     </group>
                 </search>
@@ -1566,7 +1668,7 @@
         </record>
         <menuitem
             action="action_model_form" name="Models" id="menu_action_model_form" sequence="5"
-            parent="account.menu_finance_recurrent_entries"/>
+            parent="account.menu_configuration_recurrent_entries"/>
 
         <!-- Payment Terms -->
         <record id="view_payment_term_line_tree" model="ir.ui.view">
@@ -1585,15 +1687,14 @@
             <field name="name">account.payment.term.line.form</field>
             <field name="model">account.payment.term.line</field>
             <field name="arch" type="xml">
-                <form string="Payment Term" version="7.0">
+                <form string="Payment Term">
                     <group>
                         <group string="Amount Computation">
-	                        <field name="value"/>
-	                        <label for="value_amount" string="Amount To Pay"  attrs="{'invisible':[('value','=','balance')]}"/>
-	                        <div attrs="{'invisible':[('value','=','balance')]}">
-	                            <field name="value_amount" class="oe_inline"/>
-	                            <label string="%%" class="oe_inline" attrs="{'invisible':['!',('value','=','procent')]}" />
-	                        </div>
+                            <field name="value" widget="radio" nolabel="1" colspan="4"/>
+                            <label for="value_amount" string="Amount To Pay"  attrs="{'invisible':[('value','=','balance')]}"/>
+                            <div attrs="{'invisible':[('value','=','balance')]}">
+                                <field name="value_amount" class="oe_inline"/>
+                            </div>
                         </group>
                         <group string="Due Date Computation">
                             <field name="days"/>
@@ -1617,11 +1718,12 @@
             <field name="name">account.payment.term.form</field>
             <field name="model">account.payment.term</field>
             <field name="arch" type="xml">
-                <form string="Payment Term" version="7.0">
+                <form string="Payment Term">
                     <group col="4">
                         <field name="name"/>
                         <field name="active"/>
                     </group>
+                    <label for="note"/>
                     <field name="note" placeholder="Payment term explanation for the customer..."/>
                     <separator string="Computation"/>
                     <field name="line_ids"/>
@@ -1635,15 +1737,17 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_payment_term_search"/>
         </record>
+        <menuitem id="account_followup_main_menu" parent="menu_finance_configuration" name="Follow-ups" sequence="6"/>
+
         <menuitem action="action_payment_term_form"
-            id="menu_action_payment_term_form" parent="menu_configuration_misc"/>
+            id="menu_action_payment_term_form" parent="account_followup_main_menu" sequence="0"/>
 
         <!-- Account Subscriptions -->
         <record id="view_subscription_line_form" model="ir.ui.view">
             <field name="name">account.subscription.line.form</field>
             <field name="model">account.subscription.line</field>
             <field name="arch" type="xml">
-                <form string="Subscription lines" version="7.0">
+                <form string="Subscription lines">
                     <group>
                         <field name="date"/>
                         <field name="move_id"/>
@@ -1684,7 +1788,7 @@
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
                     <filter icon="terp-camera_test" string="Running" domain="[('state','=','running')]" help="Running Subscription"/>
                     <field name="model_id"/>
-                    <group expand="0" string="Group By...">
+                    <group expand="0" string="Group By">
                         <filter string="Model" icon="terp-folder-orange" domain="[]" context="{'group_by':'model_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
@@ -1695,7 +1799,7 @@
             <field name="name">account.subscription.form</field>
             <field name="model">account.subscription</field>
             <field name="arch" type="xml">
-                <form string="Recurring" version="7.0">
+                <form string="Recurring">
                     <header>
                         <button name="state_draft" states="done" string="Set to Draft" type="object"  icon="gtk-convert" />
                         <button name="compute" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific" class="oe_highlight"/>
@@ -1742,7 +1846,7 @@
         <menuitem
             name="Define Recurring Entries" action="action_subscription_form"
             id="menu_action_subscription_form" sequence="1"
-            parent="account.menu_finance_recurrent_entries"/>
+            parent="account.menu_configuration_recurrent_entries"/>
 
         <record id="action_subscription_form_running" model="ir.actions.act_window">
             <field name="name">Running Subscriptions</field>
@@ -1766,7 +1870,7 @@
             <field name="model">account.subscription.line</field>
             <field eval="20" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Subscription lines" version="7.0">
+                <form string="Subscription lines">
                     <group col="4">
                         <field name="subscription_id"/>
                         <field name="date"/>
@@ -1777,27 +1881,18 @@
         </record>
 
         <!-- Account Templates -->
-        <menuitem
-            id="account_template_folder"
-            name="Templates"
-            parent="account_account_menu"
-            groups="account.group_account_manager"/>
+
         <menuitem
             id="account_template_taxes"
-            name="Taxes"
-            parent="account_template_folder"
-            sequence="2"/>
-        <menuitem
-            id="account_template_accounts"
-            name="Accounts"
-            parent="account_template_folder"
-            sequence="1"/>
+            name="Templates"
+            parent="next_id_27"
+            sequence="4"/>
 
         <record id="view_account_template_form" model="ir.ui.view">
             <field name="name">account.account.template.form</field>
             <field name="model">account.account.template</field>
             <field name="arch" type="xml">
-                <form string="Account Template" version="7.0">
+                <form string="Account Template">
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
@@ -1836,12 +1931,12 @@
             <field name="arch" type="xml">
                 <search string="Search Account Templates">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account Template"/>
-                    <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
+                    <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
                     <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                     <field name="parent_id"/>
                     <field name="user_type"/>
                     <field name="type"/>
-                    <group expand="0" string="Group By...">
+                    <group expand="0" string="Group By">
                         <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                         <filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type'}"/>
                    </group>
@@ -1855,13 +1950,14 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_account_template_search"/>
         </record>
-        <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_accounts"/>
+        <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_folder" 
+        sequence="2"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Create Account</field>
             <field name="model">account.addtmpl.wizard</field>
             <field name="arch" type="xml">
-                <form string="Create Account" version="7.0">
+                <form string="Create Account">
                     <header>
                         <button icon="gtk-ok" name="action_create" string="Add" type="object" class="oe_highlight"  />
                     </header>
@@ -1885,7 +1981,7 @@
             <field name="name">account.chart.template.form</field>
             <field name="model">account.chart.template</field>
             <field name="arch" type="xml">
-                <form string="Chart of Accounts Template" version="7.0">
+                <form string="Chart of Accounts Template">
                     <group col="4">
                         <field name="name"/>
                         <field name="account_root_id" attrs="{'required': [('parent_id', '=', False)]}"/>
@@ -1920,7 +2016,7 @@
                     <field name="name" string="Account Template"/>
                     <field name="account_root_id"/>
                     <field name="bank_account_view_id"/>
-                    <group expand="0" string="Group By...">
+                    <group expand="0" string="Group By">
                         <filter string="Root Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_root_id'}"/>
                         <filter string="Bank Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'bank_account_view_id'}"/>
                         <filter string="Receivable Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_receivable'}"/>
@@ -1953,14 +2049,14 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts" sequence="1"/>
+        <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_folder" sequence="1"/>
 
         <!-- Account Tax Templates -->
         <record id="view_account_tax_template_form" model="ir.ui.view">
             <field name="name">account.tax.template.form</field>
             <field name="model">account.tax.template</field>
             <field name="arch" type="xml">
-                <form string="Account Tax Template" version="7.0">
+                <form string="Account Tax Template">
                     <group col="4">
                         <field name="name"/>
                         <field name="description"/>
@@ -2063,7 +2159,7 @@
                 <search string="Search tax template">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Tax Template"/>
                     <field name="parent_id"/>
-                    <group expand="0" string="Group By...">
+                    <group expand="0" string="Group By">
                         <filter string="Parent Code" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
                     </group>
                 </search>
@@ -2073,7 +2169,7 @@
             <field name="name">account.tax.code.template.form</field>
             <field name="model">account.tax.code.template</field>
             <field name="arch" type="xml">
-                <form string="Account Tax Code Template" version="7.0">
+                <form string="Account Tax Code Template">
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
@@ -2086,7 +2182,7 @@
             </field>
         </record>
         <record id="action_account_tax_code_template_form" model="ir.actions.act_window">
-            <field name="name">Tax Code Templates</field>
+            <field name="name">Tax Code</field>
             <field name="res_model">account.tax.code.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -2101,7 +2197,7 @@
             <field name="model">wizard.multi.charts.accounts</field>
             <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form position="attributes" version="7.0">
+                <form position="attributes">
                     <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <group string="res_config_contents" position="replace">
@@ -2111,10 +2207,8 @@
                         <group attrs="{'invisible': [('only_one_chart_template','=',True)]}">
                             <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
                         </group>
-                        <group groups="base.group_multi_company">
-                            <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
-                        </group>
                         <group>
+                            <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                             <field name="currency_id" class="oe_inline"/>
                             <field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
                             <label for="sale_tax_rate" string="Sale Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
@@ -2171,7 +2265,7 @@
             <field name="name">account.fiscal.position.template.form</field>
             <field name="model">account.fiscal.position.template</field>
             <field name="arch" type="xml">
-                <form string="Fiscal Position Template" version="7.0">
+                <form string="Fiscal Position Template">
                     <group col="4">
                         <field name="name"/>
                         <field name="chart_template_id"/>
@@ -2181,7 +2275,7 @@
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </tree>
-                        <form string="Taxes Mapping" version="7.0">
+                        <form string="Taxes Mapping">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
@@ -2191,7 +2285,7 @@
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </tree>
-                        <form string="Accounts Mapping" version="7.0">
+                        <form string="Accounts Mapping">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
                         </form>
@@ -2210,7 +2304,7 @@
         </record>
 
         <record id="action_account_fiscal_position_template_form" model="ir.actions.act_window">
-            <field name="name">Fiscal Position Templates</field>
+            <field name="name">Fiscal Position</field>
             <field name="res_model">account.fiscal.position.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -2244,9 +2338,15 @@
             <field name="model">account.bank.statement</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <form string="Statement" version="7.0">
+                <form string="Statement">
                 <header>
-                    <button name="button_confirm_cash" states="open" string="Close CashBox" type="object" class="oe_highlight"/>
+                    <field name="all_lines_reconciled" invisible="1" />
+                    <span attrs="{'invisible':['|',('all_lines_reconciled','=',True),('line_ids','=',[])]}">
+                        <button name="%(action_bank_reconcile_bank_statements)d" states="open" string="Reconcile" type="action" class="oe_highlight"/>
+                    </span>
+                    <span attrs="{'invisible':[('all_lines_reconciled','=',False)]}">
+                        <button name="button_confirm_cash" states="open" string="Close CashBox" type="object" class="oe_highlight"/>
+                    </span>
                     <button name="button_open" states="draft" string="Open CashBox" type="object" class="oe_highlight"/>
                     <button name="button_cancel" states="confirm,open" string="Cancel CashBox" type="object"/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
@@ -2257,8 +2357,7 @@
                     <group>
                         <group>
                             <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection" domain="[('type', '=', 'cash')]" />
-                            <field name="user_id" readonly="1" string="Responsible" context="{'default_groups_ref': ['account.group_account_user']}"/>
-                            <field name="total_entry_encoding"/>
+                            <field name="user_id" attrs="{'readonly':[('state','!=','draft')]}" string="Responsible"/>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         </group>
                         <group>
@@ -2266,6 +2365,7 @@
                             <field name="closing_date" readonly="1"/>
                             <field name="period_id" class="oe_inline"/>
                             <field name="currency" invisible="1"/>
+                            <field name="cash_control" invisible="1"/>
                         </group>
                     </group>
                     <notebook>
@@ -2276,21 +2376,15 @@
                                     <field name="date"/>
                                     <field name="name"/>
                                     <field name="ref"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                    <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
-                                    <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
+                                    <field name="partner_id"/>
                                     <field name="amount"/>
                                 </tree>
-                                <form string="Statement lines" version="7.0">
+                                <form string="Statement lines">
                                     <group col="4">
                                         <field name="date"/>
                                         <field name="name"/>
                                         <field name="ref"/>
-                                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                        <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                        <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
-                                        <field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]" groups="analytic.group_analytic_accounting" />
+                                        <field name="partner_id"/>
                                         <field name="amount"/>
                                         <field name="sequence"/>
                                     </group>
@@ -2299,41 +2393,64 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Cash Control">
+                        <page string="Cash Control" attrs="{'invisible' : [('cash_control', '=', False)]}">
                             <group col="2" expand="1">
-                                <field name="opening_details_ids" nolabel="1" colspan="4" attrs="{'invisible' : [('state', '!=', 'draft')]}">
-                                    <tree string="Opening Cashbox Lines" editable="bottom">
-                                        <field name="pieces"/>
-                                        <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
-                                        <field name="subtotal_opening" string="Opening Subtotal"/>
-                                    </tree>
-                                </field>
-                                <field name="closing_details_ids" nolabel="1" colspan="4" attrs="{'invisible' : [('state', '=', 'draft')]}">
-                                    <tree string="Closing Cashbox Lines" editable="bottom">
-                                        <field name="pieces" readonly="1" />
-                                        <field name="number_opening" string="Opening Unit Numbers" readonly="1" />
-                                        <field name="subtotal_opening" string="Opening Subtotal" readonly="1" />
-
-                                        <field name="number_closing" string="Closing Unit Numbers" on_change="on_change_sub_closing(pieces, number_closing, parent.balance_end)"/>
-                                        <field name="subtotal_closing" string="Closing Subtotal"/>
-                                    </tree>
-                                </field>
+                                <group string="Opening Cash Control" attrs="{'invisible' : [('state', '!=', 'draft')]}">
+                                    <field name="opening_details_ids" colspan="2" nolabel="1">
+                                        <tree string="Opening Cashbox Lines" editable="bottom">
+                                            <field name="pieces"/>
+                                            <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening)" />
+                                            <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
+                                        </tree>
+                                    </field>
+                                </group>
+                                <group>
+                                    <group string="Opening Cash Control" attrs="{'invisible' : [('state', '=', 'draft')]}">
+                                        <field name="details_ids" colspan="2" nolabel="1" attrs="{'readonly' : [('state', '!=', 'draft')]}">
+                                            <tree string="Opening Cashbox Lines" editable="bottom">
+                                                <field name="pieces"/>
+                                                <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening)"/>
+                                                <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
+                                            </tree>
+                                        </field>
+                                    </group>
+                                    <group string="Closing Cash Control" attrs="{'invisible' : [('state', '=', 'draft')]}">
+                                        <field name="closing_details_ids" colspan="2" nolabel="1" attrs="{'readonly' : [('state', '=', 'confirm')]}">
+                                            <tree string="Closing Cashbox Lines" editable="bottom">
+                                                <field name="pieces" readonly="1" />
+                                                <field name="number_closing" on_change="on_change_sub_closing(pieces, number_closing)"/>
+                                                <field name="subtotal_closing" string="Closing Subtotal" sum="Total"/>
+                                            </tree>
+                                        </field>
+                                    </group>
+                                </group>
                             </group>
                         </page>
                         <page string="Journal Entries" attrs="{'invisible': [('state','!=','confirm')]}">
                             <field name="move_line_ids" string="Journal Entries"/>
                         </page>
                     </notebook>
-                    <group col="6" colspan="4">
-                        <group col="2" colspan="2">
-                            <separator string="Opening Balance" colspan="4"/>
-                            <field name="balance_start" readonly="1" string="Opening Cash Control" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                            <field name="last_closing_balance" readonly="1" string="Last Closing Balance" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                            <field name="total_entry_encoding" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                        </group>
-                        <group string="Closing Balance">
-                            <field name="balance_end" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                    <group>
+                        <group class="oe_subtotal_footer oe_right">
+                            <label for="balance_start" class="oe_subtotal_footer_separator oe_open_balance" string="Opening Balance" style="padding-right: 23px !important; padding-top: 6px !important;"/>
+                            <field name="balance_start" attrs="{'readonly' : ['|', ('cash_control', '=', True), ('state', '=', 'confirm')]}" nolabel="1" widget="monetary" class="oe_subtotal_footer_separator oe_open_balance" options="{'currency_field': 'currency'}" help="Total of opening cash control lines"/>
+                            <label for="total_entry_encoding" string="+ Transactions" class="oe_force_bold oe_mini_subtotal_footer_separator" style="padding-right: 20px !important;"/>
+                            <field name="total_entry_encoding" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
+                            <label for="balance_end" string="= Theoretical Closing Balance" class="oe_force_bold oe_mini_subtotal_footer_separator" style="padding-right: 20px !important;" help="Sum of opening balance and transactions."/>
+                            <field name="balance_end" nolabel="1" class="oe_bold oe_account_total" widget="monetary" options="{'currency_field': 'currency'}"/>
                         </group>
+                        <div>
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible': [('state', '=', 'draft')]}">
+                                <label for="balance_end_real" class="oe_subtotal_footer_separator oe_real_closing_balance" string="Real Closing Balance" style="padding-right: 23px !important; padding-top: 6px !important;"/>
+                                <field name="balance_end_real" attrs="{'readonly' : ['|', ('cash_control', '=', True), ('state', '=', 'confirm')]}" nolabel="1" class="oe_subtotal_footer_separator oe_real_closing_balance" widget="monetary" options="{'currency_field': 'currency'}" help="Total of closing cash control lines."/>
+                            </group>
+                            <group/>
+                            <group/>
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible': [('state', '=', 'draft')]}">
+                                <label for="difference" string="Difference" class="oe_subtotal_footer_separator oe_difference" style="padding-right: 20px !important;"/>
+                                <field name="difference" nolabel="1" class="oe_subtotal_footer_separator oe_difference" widget="monetary" options="{'currency_field': 'currency'}"/>
+                            </group>
+                        </div>
                     </group>
                 </sheet>
                 </form>
@@ -2400,14 +2517,14 @@
 
         <menuitem id="menu_account_supplier" name="Suppliers"
             parent="menu_finance_payables"
-            action="base.action_partner_supplier_form" sequence="100"/>
+            action="base.action_partner_supplier_form" sequence="7"/>
 
         <!-- Account Reports -->
         <record id="view_account_financial_report_form" model="ir.ui.view">
             <field name="name">account.financial.report.form</field>
             <field name="model">account.financial.report</field>
             <field name="arch" type="xml">
-                <form string="Account Report" version="7.0">
+                <form string="Account Report">
                     <group col="4">
                         <field name="name"/>
                         <field name="parent_id"/>
@@ -2416,7 +2533,7 @@
                         <field name="sign"/>
                         <field name="style_overwrite"/>
                     </group>
-                    <notebook>
+                    <notebook attrs="{'invisible': [('type','not in',['accounts','account_type'])]}">
                         <page string="Report">
                             <group>
                                 <field name="display_detail" attrs="{'invisible': [('type','not in',['accounts','account_type'])]}"/>
@@ -2449,7 +2566,7 @@
                     <field name="name" string="Account Report"/>
                     <field name="type"/>
                     <field name="account_report_id"/>
-                    <group expand="0" string="Group By...">
+                    <group expand="0" string="Group By">
                         <filter string="Parent Report" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
                         <filter string="Report Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
@@ -2465,7 +2582,7 @@
             <field name="search_view_id" ref="view_account_financial_report_search"/>
             <field name="view_id" ref="view_account_financial_report_tree"/>
         </record>
-        <menuitem id="menu_account_financial_reports_tree" name="Account Reports" parent="menu_account_reports" action="action_account_financial_report_tree"/>
+        <menuitem id="menu_account_financial_reports_tree" name="Account Reports Types" parent="menu_account_reports" action="action_account_financial_report_tree"/>
 
         <record id="view_account_report_tree_hierarchy" model="ir.ui.view">
             <field name="name">account.report.hierarchy</field>