From 256bca359d74a134f94d4e37f7cadf0d87448b53 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 9 Oct 2010 18:01:43 +0200
Subject: [PATCH] [IMP] better useability

bzr revid: fp@tinyerp.com-20101009160143-rrcfgoyudey22zv4
---
 addons/account/account.py                     |  12 +-
 addons/account/account_invoice_view.xml       |  14 +-
 addons/account/account_menuitem.xml           |  44 +--
 addons/account/account_report.xml             |   1 +
 addons/account/account_view.xml               |  52 ++--
 addons/account/account_wizard.xml             |   2 +-
 addons/account/invoice.py                     |   4 +-
 addons/account/partner.py                     |  16 +-
 addons/account/partner_view.xml               |   6 +-
 .../process/customer_invoice_process.xml      |   2 -
 .../process/supplier_invoice_process.xml      |   2 -
 ...count_analytic_inverted_balance_report.xml |  74 ++---
 .../report/account_aged_partner_balance.py    |   2 +
 .../account_analytic_entries_report_view.xml  |   5 +-
 .../report/account_entries_report_view.xml    |   5 +-
 .../account/report/account_invoice_report.py  |   2 +-
 .../report/account_invoice_report_view.xml    |   6 +-
 .../account/report/account_print_invoice.rml  |   2 +-
 addons/account/security/account_security.xml  | 141 +---------
 .../wizard/account_move_journal_view.xml      |  23 +-
 .../account/wizard/account_reconcile_view.xml |   3 +-
 .../account_report_balance_sheet_view.xml     |   1 +
 .../account_report_general_ledger_view.xml    |   1 +
 .../account_report_partner_ledger_view.xml    |   1 +
 .../account/wizard/account_tax_chart_view.xml |   7 +-
 addons/account_accountant/__openerp__.py      |  13 +-
 .../account_accountant/account_security.xml   |   6 -
 .../security/account_security.xml             |  10 +
 .../voucher_payment_receipt_view.xml          |   4 +-
 .../voucher_sales_purchase_view.xml           |  18 +-
 .../analytic/security/analytic_security.xml   |   6 +-
 addons/auction/auction_demo.xml               | 252 +++++++++---------
 addons/auction/auction_view.xml               |  92 +++----
 addons/base_setup/base_setup_installer.xml    |  29 +-
 addons/base_setup/installer.py                |  21 +-
 addons/product/product.py                     |   6 +-
 addons/product/product_view.xml               |  13 +-
 addons/purchase/purchase_view.xml             |  10 +-
 addons/stock/product_view.xml                 |  13 +-
 39 files changed, 389 insertions(+), 532 deletions(-)
 delete mode 100644 addons/account_accountant/account_security.xml
 create mode 100644 addons/account_accountant/security/account_security.xml

diff --git a/addons/account/account.py b/addons/account/account.py
index 8ff9d35086e..b0271a4fee1 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2473,14 +2473,14 @@ class account_tax_template(osv.osv):
 
 account_tax_template()
 
-# Fiscal Mapping Templates
+# Fiscal Position Templates
 
 class account_fiscal_position_template(osv.osv):
     _name = 'account.fiscal.position.template'
-    _description = 'Template for Fiscal Mapping'
+    _description = 'Template for Fiscal Position'
 
     _columns = {
-        'name': fields.char('Fiscal Mapping Template', size=64, translate=True, required=True),
+        'name': fields.char('Fiscal Position Template', size=64, translate=True, required=True),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
         'account_ids': fields.one2many('account.fiscal.position.account.template', 'position_id', 'Account Mapping'),
         'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping')
@@ -2490,11 +2490,11 @@ account_fiscal_position_template()
 
 class account_fiscal_position_tax_template(osv.osv):
     _name = 'account.fiscal.position.tax.template'
-    _description = 'Template Tax Fiscal Mapping'
+    _description = 'Template Tax Fiscal Position'
     _rec_name = 'position_id'
 
     _columns = {
-        'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Mapping', required=True, ondelete='cascade'),
+        'position_id': fields.many2one('account.fiscal.position.template', 'Fiscal Position', required=True, ondelete='cascade'),
         'tax_src_id': fields.many2one('account.tax.template', 'Tax Source', required=True),
         'tax_dest_id': fields.many2one('account.tax.template', 'Replacement Tax')
     }
@@ -2860,4 +2860,4 @@ class account_bank_accounts_wizard(osv.osv_memory):
 
 account_bank_accounts_wizard()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 734b99e81f3..ebf58bab11d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -40,7 +40,7 @@
                     <field name="quantity"/>
                     <field name="uos_id"/>
                     <field name="price_unit"/>
-                    <field name="discount"/>
+                    <field name="discount" groups="base.group_extended"/>
                     <field name="price_subtotal"/>
                 </tree>
             </field>
@@ -58,13 +58,11 @@
                             <field name="uos_id"  widget="selection" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
                             <field name="quantity"/>
                             <field name="price_unit"/>
-                            <field name="discount"/>
+                            <field name="discount" groups="base.group_extended"/>
                             <field colspan="4" name="name"/>
-                            <field colspan="4" name="origin" groups="base.group_extended"/>
                             <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)" groups="base.group_user"/>
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                             <newline/>
-                            <field name="price_subtotal"/>
                             <field name="company_id" groups="base.group_multi_company" readonly="1"/>
                             <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
                         </page>
@@ -156,7 +154,7 @@
                         <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
                         <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                         <newline/>
-                        <field string="Vendor" name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
+                        <field string="Supplier" name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
@@ -452,7 +450,7 @@
         <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/>
 
         <record id="action_invoice_tree2" model="ir.actions.act_window">
-            <field name="name">Vendor Invoices</field>
+            <field name="name">Supplier Invoices</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
@@ -460,7 +458,7 @@
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice', 'journal_type': 'purchase'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">Proposal for vendor invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices.</field>
+            <field name="help">Proposal for supplier invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices.</field>
         </record>
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
@@ -491,7 +489,7 @@
         <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="menu_finance_receivables"/>
 
         <record id="action_invoice_tree4" model="ir.actions.act_window">
-            <field name="name">Vendor Refunds</field>
+            <field name="name">Supplier Refunds</field>
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index fac1a1eec4d..dde71f4efc1 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -2,47 +2,49 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"/>
-        <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="1" groups="group_account_user,group_account_manager"/>
-        <menuitem id="menu_finance_payables" name="Vendors" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager"/>
-        <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,group_account_invoice"/>
+        <menuitem icon="terp-account" id="menu_finance" name="Accounting" sequence="13"
+            groups="group_account_user,group_account_manager,group_account_invoice"/>
+        <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="1"/>
+        <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="2"/>
+        <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"
+            groups="group_account_user"/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
         <!-- This menu is used in account_code module -->
         <menuitem id="menu_account_pp_statements" name="Statements" parent="menu_finance_periodical_processing" sequence="12"/>
-        <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager"/>
+        <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
         <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
         <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5"/>
-        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12" groups="group_account_manager,group_account_user"/>
-        <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
+        <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
+        <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user"/>
         <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13" groups="group_account_manager"/>
-        <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration" groups="group_account_manager"/>
-        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="group_account_manager"/>
+        <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
+        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
         <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting" groups="base.group_extended"/>
         <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30" groups="group_account_manager"/>
         <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
-        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100" groups="group_account_manager"/>
-        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="4"
-        groups="group_account_user,group_account_manager"/>
+        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
+        <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="4" groups="group_account_user"/>
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended"/>
 
-        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager" sequence="25"/>
+        <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_manager" sequence="25"/>
         <menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>
 
-        <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300" groups="account.group_account_manager"/>
+        <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
 
         <menuitem
-        parent="account.menu_finance_legal_statement"
-        id="final_accounting_reports"
-        name="Accounting Reports"/>
+            parent="account.menu_finance_legal_statement"
+            id="final_accounting_reports"
+            name="Accounting Reports"/>
 
         <menuitem
-        parent="account.menu_finance_legal_statement"
-        id="menu_journals_report"
-        name="Journals"/>
+            parent="account.menu_finance_legal_statement"
+            id="menu_journals_report"
+            groups="group_account_user"
+            name="Journals"/>
 
     </data>
 </openerp>
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 907ff01b832..c9f7cc6cf66 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -45,6 +45,7 @@
         <menuitem
             id="menu_tax_report"
             name="Taxes"
+            groups="group_account_user"
             parent="account.menu_finance_generic_reporting" sequence="3"/>
 
         <report id="account_account_balance_landscape"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e7e1c055c32..36ee5255523 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -347,10 +347,10 @@
             <field name="arch" type="xml">
                 <tree string="Search Account Journal">
                     <group>
-                    <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Customer Journals" icon="terp-sale"/>
-                    <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Vendor Journals" icon="terp-purchase"/>
-                   <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity Journals" icon="terp-dolar"/>
-                    <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Global Journals" icon="terp-stock"/>
+                    <filter domain="['|', ('type', '=', 'sale'), ('type', '=', 'sale_refund')]" string="Sale" icon="terp-sale"/>
+                    <filter domain="['|', ('type', '=', 'purchase'), ('type', '=', 'purchase_refund')]" string="Purchase" icon="terp-purchase"/>
+                   <filter domain="['|', ('type', '=', 'cash'), ('type', '=', 'bank')]" string="Liquidity" icon="terp-dolar"/>
+                    <filter domain="['|', ('type', '=', 'general'), ('type', '=', 'situation')]" string="Others" icon="terp-stock"/>
                     <separator orientation="vertical"/>
                     <field name="code"/>
                     <field name="name"/>
@@ -899,13 +899,6 @@
             <field name="help">Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs.</field>
         </record>
 
-        <!--
-        <menuitem
-            action="action_tax_code_tree"
-            id="menu_action_tax_code_tree"
-            parent="menu_finance_charts"
-            sequence="12"/> --> <!-- move to wizard -->
-
         <!--
     Entries lines
     -->
@@ -1389,6 +1382,7 @@
             action="action_move_journal_line"
             id="menu_action_move_journal_line_form"
             parent="account.menu_finance_entries"
+            groups="group_account_user"
             sequence="5"/>
 
         <record id="action_move_line_form" model="ir.actions.act_window">
@@ -1428,8 +1422,6 @@
             <field name="act_window_id" ref="action_move_line_search"/>
         </record>
 
-        <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
-
         <record id="view_bank_statement_reconcile_form" model="ir.ui.view">
             <field name="name">account.bank.statement.form</field>
             <field name="model">account.bank.statement</field>
@@ -1502,8 +1494,8 @@
 
 
         <menuitem
-                name="Manual Reconcilication" icon="STOCK_EXECUTE"
-                action="action_account_manual_reconcile"
+             name="Manual Reconcilication" icon="STOCK_EXECUTE"
+             action="action_account_manual_reconcile"
              id="menu_manual_reconcile"
              parent="account.periodical_processing_reconciliation"/>
 
@@ -1655,7 +1647,9 @@
             <field name="view_mode">tree,form,search</field>
             <field name="search_view_id" ref="view_model_search"/>
         </record>
-        <menuitem action="action_model_form" id="menu_action_model_form" sequence="5" parent="account.menu_configuration_misc" groups="base.group_extended"/>
+        <menuitem
+            action="action_model_form" id="menu_action_model_form" sequence="5"
+            parent="account.menu_configuration_misc" groups="base.group_extended"/>
 
         <!--
             # Payment Terms
@@ -1741,7 +1735,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_payment_term_form" id="menu_action_payment_term_form" parent="menu_configuration_misc"/>
+        <menuitem action="action_payment_term_form"
+            id="menu_action_payment_term_form" parent="menu_configuration_misc"
+            groups="group_account_manager"/>
 
         <!--
         # Account Subscriptions
@@ -1853,7 +1849,11 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_subscription_search"/>
         </record>
-        <menuitem name="Define Recurring Entries" action="action_subscription_form" id="menu_action_subscription_form" sequence="1" parent="account.menu_finance_recurrent_entries"/>
+        <menuitem
+            name="Define Recurring Entries" action="action_subscription_form"
+            groups="base.group_extended"
+            id="menu_action_subscription_form" sequence="1"
+            parent="account.menu_finance_recurrent_entries"/>
 
         <record id="action_subscription_form_running" model="ir.actions.act_window">
             <field name="name">Running Subscriptions</field>
@@ -2075,7 +2075,6 @@
             <field name="view_mode">tree,form,search</field>
         </record>
 
-
         <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_accounts"/>
 
         <!-- Chart of Accounts Templates -->
@@ -2368,7 +2367,9 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem name="New Company Financial Setting" parent="account.account_template_folder" action="account.action_account_configuration_installer" id="menu_wizard"/>
+        <menuitem name="New Company Financial Setting" parent="account.account_template_folder"
+            groups="group_account_manager"
+            action="account.action_account_configuration_installer" id="menu_wizard"/>
 
         <record id="account_account_graph" model="ir.ui.view">
             <field name="name">account.account.graph</field>
@@ -2382,14 +2383,14 @@
             </field>
          </record>
 
-         <!-- Fiscal Mapping Templates -->
+         <!-- Fiscal Position Templates -->
 
         <record id="view_account_position_template_form" model="ir.ui.view">
             <field name="name">account.fiscal.position.template.form</field>
             <field name="model">account.fiscal.position.template</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Fiscal Mapping Template">
+                <form string="Fiscal Position Template">
                     <field name="name" select="1"/>
                     <field name="chart_template_id"/>
                     <newline/>
@@ -2421,14 +2422,14 @@
             <field name="model">account.fiscal.position.template</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Fiscal Mapping">
+                <tree string="Fiscal Position">
                     <field name="name"/>
                 </tree>
             </field>
         </record>
 
         <record id="action_account_fiscal_position_template_form" model="ir.actions.act_window">
-            <field name="name">Fiscal Mapping Templates</field>
+            <field name="name">Fiscal Position Templates</field>
             <field name="res_model">account.fiscal.position.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -2606,7 +2607,8 @@
             <field name="view_id" ref="account_cash_statement_graph"/>
             <field name="act_window_id" ref="action_view_bank_statement_tree"/>
         </record>
-        <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
+        <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"
+            groups="group_account_user"/>
 
     </data>
 </openerp>
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 639dc2dc111..0e48dfc7b66 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem id="next_id_22" name="Partner Accounts" parent="menu_finance_generic_reporting" sequence="1"/>
+        <menuitem id="next_id_22" name="Partners" parent="menu_finance_generic_reporting" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 79978c0bbaf..3879d3af32a 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -315,7 +315,7 @@ class account_invoice(osv.osv):
         'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
         'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
         'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
-        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Mapping', readonly=True, states={'draft':[('readonly',False)]})
+        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
     }
     _defaults = {
         'type': _get_type,
@@ -353,7 +353,7 @@ class account_invoice(osv.osv):
             nodes = doc.xpath("//field[@name='partner_id']")
             partner_string = 'Customer'
             if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'):
-                partner_string = 'Vendor'
+                partner_string = _('Supplier')
             for node in nodes:
                 node.set('string', partner_string)
             res['arch'] = etree.tostring(doc)
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 536976d1e39..9f4fdf82abd 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -25,9 +25,9 @@ import ir
 
 class account_fiscal_position(osv.osv):
     _name = 'account.fiscal.position'
-    _description = 'Fiscal Mapping'
+    _description = 'Fiscal Position'
     _columns = {
-        'name': fields.char('Fiscal Mapping', size=64, translate=True, required=True),
+        'name': fields.char('Fiscal Position', size=64, translate=True, required=True),
         'company_id': fields.many2one('res.company', 'Company'),
         'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Account Mapping'),
         'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping'),
@@ -64,10 +64,10 @@ account_fiscal_position()
 
 class account_fiscal_position_tax(osv.osv):
     _name = 'account.fiscal.position.tax'
-    _description = 'Taxes Fiscal Mapping'
+    _description = 'Taxes Fiscal Position'
     _rec_name = 'position_id'
     _columns = {
-        'position_id': fields.many2one('account.fiscal.position', 'Fiscal Mapping', required=True, ondelete='cascade'),
+        'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'),
         'tax_src_id': fields.many2one('account.tax', 'Tax Source', required=True),
         'tax_dest_id': fields.many2one('account.tax', 'Replacement Tax')
     }
@@ -76,10 +76,10 @@ account_fiscal_position_tax()
 
 class account_fiscal_position_account(osv.osv):
     _name = 'account.fiscal.position.account'
-    _description = 'Accounts Fiscal Mapping'
+    _description = 'Accounts Fiscal Position'
     _rec_name = 'position_id'
     _columns = {
-        'position_id': fields.many2one('account.fiscal.position', 'Fiscal Mapping', required=True, ondelete='cascade'),
+        'position_id': fields.many2one('account.fiscal.position', 'Fiscal Position', required=True, ondelete='cascade'),
         'account_src_id': fields.many2one('account.account', 'Account Source', domain=[('type','<>','view')], required=True),
         'account_dest_id': fields.many2one('account.account', 'Account Destination', domain=[('type','<>','view')], required=True)
     }
@@ -172,10 +172,10 @@ class res_partner(osv.osv):
             'account.fiscal.position',
             type='many2one',
             relation='account.fiscal.position',
-            string="Fiscal Mapping",
+            string="Fiscal Position",
             method=True,
             view_load=True,
-            help="The fiscal Mapping will determine taxes and the accounts used for the partner.",
+            help="The fiscal position will determine taxes and the accounts used for the partner.",
         ),
         'property_payment_term': fields.property(
             'account.payment.term',
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index ca489acd9bd..da33d680d95 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -7,7 +7,7 @@
             <field name="model">account.fiscal.position</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Fiscal Mapping">
+                <form string="Fiscal Position">
                     <field name="name" select="1"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <separator string="Mapping" colspan="4"/>
@@ -42,7 +42,7 @@
             <field name="model">account.fiscal.position</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Fiscal Mapping">
+                <tree string="Fiscal Position">
                     <field name="name"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </tree>
@@ -50,7 +50,7 @@
         </record>
 
         <record id="action_account_fiscal_position_form" model="ir.actions.act_window">
-            <field name="name">Fiscal Mappings</field>
+            <field name="name">Fiscal Positions</field>
             <field name="res_model">account.fiscal.position</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index b34dca0dbb9..ca013f48be7 100644
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -83,7 +83,6 @@
         </record>
 
         <record id="process_node_reconciliation0" model="process.node">
-            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_reconcile"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Reconciliation&quot;&quot;&quot;" name="name"/>
@@ -105,7 +104,6 @@
         </record>
 
         <record id="process_node_accountingstatemententries0" model="process.node">
-            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_line"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Bank Statement&quot;&quot;&quot;" name="name"/>
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index 8635b083d72..6f5526623df 100644
--- a/addons/account/process/supplier_invoice_process.xml
+++ b/addons/account/process/supplier_invoice_process.xml
@@ -72,7 +72,6 @@
         </record>
 
         <record id="process_node_supplierpaymentorder0" model="process.node">
-            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_line"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Payment Order&quot;&quot;&quot;" name="name"/>
@@ -83,7 +82,6 @@
         </record>
 
         <record id="process_node_supplierreconciliation0" model="process.node">
-            <field name="menu_id" ref="account.menu_eaction_account_moves_all"/>
             <field name="model_id" ref="account.model_account_move_reconcile"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Reconciliation&quot;&quot;&quot;" name="name"/>
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
index e989f766d7b..114c75f40af 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.xml
@@ -2,44 +2,44 @@
 <openerp>
     <data>
 
-		<record id="account_analytic_invert_balance_view" model="ir.ui.view">
-			<field name="name">Account Analytic Inverted Balance</field>
-			<field name="model">account.analytic.inverted.balance</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Select Period">
-					<group colspan="4" col="6">
-						<field name="date1"/>
-						<field name="date2"/>
-					</group>
-					<separator colspan="4"/>
-					<group colspan="4" col="6">
-						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-						<button name="check_report" string="Print" type="object" icon="gtk-print"/>
-					</group>
-				</form>
-			</field>
-		</record>
+        <record id="account_analytic_invert_balance_view" model="ir.ui.view">
+            <field name="name">Account Analytic Inverted Balance</field>
+            <field name="model">account.analytic.inverted.balance</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Select Period">
+                    <group colspan="4" col="6">
+                        <field name="date1"/>
+                        <field name="date2"/>
+                    </group>
+                    <separator colspan="4"/>
+                    <group colspan="4" col="6">
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_account_analytic_invert_balance" model="ir.actions.act_window">
-			<field name="name">Inverted Analytic Balance</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.analytic.inverted.balance</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="view_id" ref="account_analytic_invert_balance_view"/>
-			<field name="target">new</field>
-		</record>
+        <record id="action_account_analytic_invert_balance" model="ir.actions.act_window">
+            <field name="name">Inverted Analytic Balance</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.inverted.balance</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_analytic_invert_balance_view"/>
+            <field name="target">new</field>
+        </record>
 
-		<record model="ir.values" id="account_analytic_invert_balance_values">
-			<field name="model_id" ref="analytic.model_account_analytic_account" />
-			<field name="object" eval="1" />
-			<field name="name">Account Analytic Inverted Balance</field>
-			<field name="key2">client_print_multi</field>
-			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_invert_balance'))" />
-			<field name="key">action</field>
-			<field name="model">account.analytic.account</field>
-		</record>
+        <record model="ir.values" id="account_analytic_invert_balance_values">
+            <field name="model_id" ref="analytic.model_account_analytic_account" />
+            <field name="object" eval="1" />
+            <field name="name">Account Analytic Inverted Balance</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_invert_balance'))" />
+            <field name="key">action</field>
+            <field name="model">account.analytic.account</field>
+        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 5a1b8ac868b..22b04e05f39 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -79,6 +79,8 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
         #
         # Build a string like (1,2,3) for easy use in SQL query
         partner_ids = [x['id'] for x in partners]
+        if not partner_ids:
+            return []
         # This dictionary will store the debit-credit for all partners, using partner_id as key.
         move_state = ['draft','posted']
         if self.target_move == 'posted':
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index a131400948b..34d23826e80 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -108,7 +108,10 @@
         <field name="help">A tool search lets you know statistics on your analytics records that match your needs.</field>
     </record>
 
-    <menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statistic_report_statement" sequence="4"/>
+    <menuitem action="action_analytic_entries_report" 
+        id="menu_action_analytic_entries_report"
+        groups="analytic.group_analytic_accounting"
+        parent="account.menu_finance_statistic_report_statement" sequence="4"/>
 
 </data>
 </openerp>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 081328d89fb..a80fb3c3233 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -117,6 +117,9 @@
         <field name="context">{'group_by':[], 'search_default_usertype':1, 'search_default_thisyear':1, 'group_by_no_leaf':1}</field>
         <field name="help">A tool search lets you know statistics on your different financial accounts that match your needs.</field>
     </record>
-    <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" parent="account.menu_finance_statistic_report_statement" sequence="2"/>
+    <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all"
+        parent="account.menu_finance_statistic_report_statement"
+        groups="group_account_manager"
+        sequence="2"/>
 </data>
 </openerp>
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 39a1709d503..125edb0d992 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -39,7 +39,7 @@ class account_invoice_report(osv.osv):
         'uom_name': fields.char('Default UoM', size=128, readonly=True),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True),
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True),
-        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Mapping', readonly=True),
+        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
         'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
         'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 12f8b23e550..ef5a9173fd6 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -78,14 +78,14 @@
                             domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
                             help="Customer Invoices And Refunds"/>
                     <filter icon="terp-purchase"
-                            string="Vendor"
+                            string="supplier"
                             separator="1"
                             domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
-                            help="Vendor Invoices And Refunds"/>
+                            help="Supplier Invoices And Refunds"/>
                    <separator orientation="vertical"/>
                    <filter icon="terp-dolar" string="Invoice"
                             domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]"
-                            help="Customer And Vendor Invoices"/>
+                            help="Customer And Supplier Invoices"/>
                    <filter icon="terp-dolar_ok!"
                             string="Refund"
                             separator="1"
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 173cbd1e6c4..c6ff4015ea6 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -362,7 +362,7 @@
     <blockTable colWidths="120.0,410.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Fiscal Mapping Remark : </para>
+          <para style="terp_default_Bold_9">Fiscal Position: </para>
         </td>
         <td>
           <para style="terp_default_9">[[ (o.fiscal_position.note and format(o.fiscal_position and o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index f6d4ec3d88e..24265065b25 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -5,150 +5,13 @@
         <field name="name">Accounting / Invoice</field>
     </record>
 
-    <record id="group_account_user" model="res.groups">
+    <record id="group_account_user" model="res.groups" context="{'noadmin':True}">
         <field name="name">Accounting / Accountant</field>
     </record>
-
-    <record id="group_account_manager" model="res.groups">
+    <record id="group_account_manager" model="res.groups" context="{'noadmin':True}">
         <field name="name">Accounting / Manager</field>
     </record>
 
-    <record id="menu_finance_reporting" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager'), ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_legal_statement" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_receivables" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_invoice'),ref('group_account_manager'),ref('group_account_user')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_payables" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_invoice'), ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_charts" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'), ref('group_account_manager'), ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_eaction_account_moves_sale" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_eaction_account_moves_purchase" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_invoice_tree1" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_invoice_tree2" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_invoice_tree3" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_invoice_tree4" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_bank_and_cash" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_account_tree2" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_entries" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_move_journal_line_form" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_eaction_account_moves_all" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_dashboard_acc" model="ir.ui.menu">
-        <field eval="[(6, 0, [ref('group_account_user')])]" name="groups_id"/>
-    </record>
-
-    <record id="final_accounting_reports" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager'), ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_journals_report" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_tax_code_tree" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'),ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_periodical_processing" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_general_ledger" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_general_Balance_report" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_account_bs_report" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_account_pl_report" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_tax_report" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="next_id_22" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_account_invoice_report_all" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_action_account_entries_report_all" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_statistic_report_statement" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
-    </record>
-
-    <record id="menu_finance_generic_reporting" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
-    </record>
-
-    <!--record id="menu_finance_configuration" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]"  name="groups_id"/>
-    </record-->
-
-    <record id="menu_finance_entries" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
-    </record>
-
-    <!--record id="menu_analytic_accounting" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
-    </record-->
-
     <record id="account_move_comp_rule" model="ir.rule">
         <field name="name">Account Entry</field>
         <field ref="model_account_move" name="model_id"/>
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 5f5d404139a..da59388eb91 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -21,17 +21,8 @@
             <field name="context">{'journal_type':'sale','view_mode':False}</field>
             <field name="target">new</field>
         </record>
-        <menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager"/>
-
-<!--        <record id="action_account_moves_purchase_refund" model="ir.actions.act_window">-->
-<!--            <field name="name">Journal Refund Items</field>-->
-<!--            <field name="res_model">account.move.journal</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_id" ref="view_account_move_journal_form"/>-->
-<!--            <field name="context">{'journal_type':'purchase_refund'}</field>-->
-<!--            <field name="target">new</field>-->
-<!--        </record>-->
-<!--        <menuitem action="action_account_moves_purchase_refund" sequence="5" id="menu_eaction_account_moves_purchase_refund" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL"/>-->
+        <menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale"
+            parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager"/>
 
         <record id="action_account_moves_purchase" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
@@ -48,16 +39,6 @@
             sequence="16"
             groups="group_account_user,group_account_manager"/>
 
-<!--        <record id="action_account_moves_sale_refund" model="ir.actions.act_window">-->
-<!--            <field name="name">Journal Refund Items</field>-->
-<!--            <field name="res_model">account.move.journal</field>-->
-<!--            <field name="view_type">form</field>-->
-<!--            <field name="view_id" ref="view_account_move_journal_form"/>-->
-<!--            <field name="context">{'journal_type':'sale_refund'}</field>-->
-<!--            <field name="target">new</field>-->
-<!--        </record>-->
-<!--        <menuitem action="action_account_moves_sale_refund" sequence="5" id="menu_eaction_account_moves_sale_refund" parent="menu_finance_payables" icon="STOCK_JUSTIFY_FILL"/>-->
-
         <record id="action_account_moves_bank" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.journal</field>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index a80ffbc05cd..38ed195820b 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -58,8 +58,7 @@
                     <field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
                     <field name="date_p"/>
                     <field name="comment"/>
-                    <separator string="Analytic" colspan="4"/>
-                    <field name="analytic_id"/>
+                    <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
                     <group colspan="4" col="6">
                         <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
index f1c5ef35de9..68a757c6f9b 100644
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ b/addons/account/wizard/account_report_balance_sheet_view.xml
@@ -30,6 +30,7 @@
        <menuitem icon="STOCK_PRINT"
             name="Balance Sheet"
             action="action_account_bs_report"
+            groups="group_account_user"
             id="menu_account_bs_report"
             parent="final_accounting_reports"/>
 
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index b251252851c..5a6707f82de 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -56,6 +56,7 @@
             name="General Ledger"
             parent="account.final_accounting_reports"
             action="action_account_general_ledger_menu"
+            groups="group_account_manager"
             id="menu_general_ledger"
            />
 
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index 33f8e765387..c1504f6d3f5 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -34,6 +34,7 @@
         <menuitem icon="STOCK_PRINT"
             name="Partner Ledger"
             action="action_account_partner_ledger"
+            groups="group_account_manager"
             id="menu_account_partner_ledger"
             parent="account.next_id_22"/>
 
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index f60ad394857..4174285d64d 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -34,12 +34,13 @@
             <field name="target">new</field>
         </record>
 
-		<menuitem
-			icon="STOCK_INDENT"
+        <menuitem
+            icon="STOCK_INDENT"
             action="action_account_tax_chart"
             id="menu_action_tax_code_tree"
             parent="menu_finance_charts"
+            groups="group_account_user"
             sequence="12"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index e7aa4f1bbca..af1264d562c 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -23,19 +23,18 @@
     "version" : "1.1",
     "author" : "OpenERP SA",
     "category": 'Generic Modules/Accounting',
-    "description": """Account Accountant: This module makes the account as an Invoicing system but not an
-accounting one.
+    "description": """
+Give access to the admin user to all accounting features like the journal
+items and the chart of accounts.
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
     "depends" : ["account"],
     'update_xml': [
-        'account_security.xml',
-    ],
-    'demo_xml': [
-    ],
-    'test': [
+        'security/account_security.xml',
     ],
+    'demo_xml': [ ],
+    'test': [ ],
     'installable': True,
     'active': False,
     'certificate': '',
diff --git a/addons/account_accountant/account_security.xml b/addons/account_accountant/account_security.xml
deleted file mode 100644
index 429508ebabc..00000000000
--- a/addons/account_accountant/account_security.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/account_accountant/security/account_security.xml b/addons/account_accountant/security/account_security.xml
new file mode 100644
index 00000000000..9daabddfef8
--- /dev/null
+++ b/addons/account_accountant/security/account_security.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="base.user_admin" model="res.users">
+            <field name="groups_ids" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 1e717a07a33..0d0bee6232c 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -257,7 +257,7 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Payment">
+                <form string="Customer Payment">
                     <group col="6" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" string="Customer"/>
                         <field name="journal_id"
@@ -334,7 +334,7 @@
         </record>
 
         <record id="action_vendor_receipt" model="ir.actions.act_window">
-            <field name="name">Sales Payment</field>
+            <field name="name">Customer Payment</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 576bf5fa5c7..c5a2b3215c2 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -80,7 +80,7 @@
         </record>
 
         <record id="act_pay_voucher" model="ir.actions.act_window">
-            <field name="name">Sales Payment</field>
+            <field name="name">Customer Payment</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt'), ('partner_id','=',partner_id)]</field>
@@ -111,7 +111,7 @@
                                     <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/>
                                     <field name="name"/>
                                     <field name="amount" sum="Total"/>
-                                    <field name="account_analytic_id" groups="base.group_extended"/>
+                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">
@@ -153,7 +153,7 @@
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
-                        <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Sales Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
+                        <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </form>
@@ -186,6 +186,7 @@
         <menuitem id="menu_action_sale_receipt" icon="STOCK_JUSTIFY_FILL"
             action="action_sale_receipt"
             parent="account.menu_finance_receivables"
+            groups="base.group_extended"
             sequence="10"/>
 
         <!--  Purchase Vouchers -->
@@ -203,9 +204,9 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Vendor Bills">
+                <form string="Supplier Voucher">
                     <group col="6" colspan="4">
-                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Vendor" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"/>
+                        <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"/>
                         <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id)"/>
                         <field name="number"/>
                         <field name="name" colspan="4"/>
@@ -221,7 +222,7 @@
                                     <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
                                     <field name="name"/>
                                     <field name="amount"/>
-                                    <field name="account_analytic_id" groups="base.group_extended"/>
+                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">
@@ -263,7 +264,7 @@
             </field>
         </record>
         <record id="action_purchase_receipt" model="ir.actions.act_window">
-            <field name="name">Vendor Bills</field>
+            <field name="name">Supplier Vouchers</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type','in',['purchase','purchase_refund']), ('type','=','purchase')]</field>
@@ -285,7 +286,8 @@
         </record>
 
         <menuitem id="menu_action_purchase_receipt" icon="STOCK_JUSTIFY_FILL"
-        action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"/>
+            action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"
+            groups="base.group_extended"/>
 
     </data>
 </openerp>
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 6147ee3e158..2eeda3aa370 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -7,9 +7,7 @@
         <field eval="True" name="global"/>
         <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
     </record>
-    
-    <record id="group_analytic_accounting" model="res.groups">
-        <field name="name">Analytic Accounting</field>
+    <record id="group_analytic_accounting" model="res.groups" context="{'noadmin':True}">
+        <field name="name">Useability / Analytic Accounting</field>
     </record>
-    
 </data></openerp>
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index a26e5355cde..da4989756f9 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -10,93 +10,93 @@
     </record>
 
     <record model="account.account" id="auction_income_view">
-		<field name="name">Auction Adjudications</field>
-		<field name="code">A0</field>
-		<field name="type">view</field>
-		<field name="currency_id" search="[('name','=','EUR')]"/>
-		<field name="parent_id" eval="0">
-			<value search="[('type','=','view')]" model="account.account"/>
-		</field>
-		<field name="user_type" ref="account.account_type_root"/>
-	</record>
+        <field name="name">Auction Adjudications</field>
+        <field name="code">A0</field>
+        <field name="type">view</field>
+        <field name="currency_id" search="[('name','=','EUR')]"/>
+        <field name="parent_id" eval="0">
+            <value search="[('type','=','view')]" model="account.account"/>
+        </field>
+        <field name="user_type" ref="account.account_type_root"/>
+    </record>
 
     <record model="account.account" id="auction_expense_view">
-		<field name="name">Auction Adjudication Expenses</field>
-		<field name="code">A1</field>
-		<field name="type">view</field>
-		<field name="currency_id" search="[('name','=','EUR')]"/>
-		<field name="parent_id" eval="0">
-			<value search="[('type','=','view')]" model="account.account"/>
-		</field>
-		<field name="user_type" ref="account.account_type_expense"/>
-	</record>
+        <field name="name">Auction Adjudication Expenses</field>
+        <field name="code">A1</field>
+        <field name="type">view</field>
+        <field name="currency_id" search="[('name','=','EUR')]"/>
+        <field name="parent_id" eval="0">
+            <value search="[('type','=','view')]" model="account.account"/>
+        </field>
+        <field name="user_type" ref="account.account_type_expense"/>
+    </record>
 
-	<record model="account.account" id="auction_income">
-		<field name="name">Auction Adjudications</field>
-		<field name="code">A7x*</field>
+    <record model="account.account" id="auction_income">
+        <field name="name">Auction Adjudications</field>
+        <field name="code">A7x*</field>
         <field name="user_type" ref="account.account_type_income"/> 
-		<field name="type">receivable</field>
-		<field name="currency_id" search="[('name','=','EUR')]"/>
-		<field name="parent_id" eval="auction_income_view"/>
-	</record>
+        <field name="type">receivable</field>
+        <field name="currency_id" search="[('name','=','EUR')]"/>
+        <field name="parent_id" eval="auction_income_view"/>
+    </record>
 
-	<record model="account.account" id="auction_expense">
-		<field name="name">Auction Adjudication Expenses</field>
-		<field name="code">A6x*</field>
-		<field name="user_type" ref="account.account_type_expense"/>
-		<field name="type">payable</field>
-		<field name="currency_id" search="[('name','=','EUR')]"/>
-		<field name="parent_id" eval="auction_expense_view"/>
-	</record>
+    <record model="account.account" id="auction_expense">
+        <field name="name">Auction Adjudication Expenses</field>
+        <field name="code">A6x*</field>
+        <field name="user_type" ref="account.account_type_expense"/>
+        <field name="type">payable</field>
+        <field name="currency_id" search="[('name','=','EUR')]"/>
+        <field name="parent_id" eval="auction_expense_view"/>
+    </record>
 
-	<record model="account.account" id="auction_income_costs">
-		<field name="name">Auction Buyer Costs</field>
-		<field name="code">A8x*</field>
-		<field name="type">payable</field>
-		<field name="currency_id" search="[('name','=','EUR')]"/>
-		<field name="parent_id" eval="auction_income_view"/>
-		<field name="user_type" ref="account.account_type_tax"/>
-	</record>
-	<record model="account.account" id="auction_expense_costs">
-		<field name="name">Auction Seller Costs</field>
-		<field name="code">A9x*</field>
-		<field name="type">receivable</field>
-		<field name="currency_id" search="[('name','=','EUR')]"/>
-		<field name="parent_id" eval="auction_expense_view"/>
-		<field name="user_type" ref="account.account_type_tax"/>
-	</record>
+    <record model="account.account" id="auction_income_costs">
+        <field name="name">Auction Buyer Costs</field>
+        <field name="code">A8x*</field>
+        <field name="type">payable</field>
+        <field name="currency_id" search="[('name','=','EUR')]"/>
+        <field name="parent_id" eval="auction_income_view"/>
+        <field name="user_type" ref="account.account_type_tax"/>
+    </record>
+    <record model="account.account" id="auction_expense_costs">
+        <field name="name">Auction Seller Costs</field>
+        <field name="code">A9x*</field>
+        <field name="type">receivable</field>
+        <field name="currency_id" search="[('name','=','EUR')]"/>
+        <field name="parent_id" eval="auction_expense_view"/>
+        <field name="user_type" ref="account.account_type_tax"/>
+    </record>
 
-	<record model="account.tax" id="tax_buyer_author">
-		<field name="name">Author rights (4%)</field>
-		<field name="type">percent</field>
-		<field name="applicable_type">code</field>
-		<field name="amount">0.04</field>
-		<field name="domain">sabam</field>
-		<field name="account_collected_id" ref="auction_income_costs"/>
-		<field name="account_paid_id" ref="auction_income_costs"/>
-		<field name="python_applicable">result = (price_unit&gt;=1250)</field>
-	</record>
-	<record model="account.tax" id="tax_buyer">
-		<field name="name">Buyer Costs (20%)</field>
-		<field name="type">percent</field>
-		<field name="amount">0.20</field>
-		<field name="domain">auction</field>
-		<field name="account_collected_id" ref="auction_income_costs"/>
-		<field name="account_paid_id" ref="auction_income_costs"/>
-	</record>
-	<record model="account.tax" id="tax_seller">
-		<field name="name">Seller Costs (12%)</field>
-		<field name="type">percent</field>
-		<field name="amount">-0.12</field>
-		<field name="domain">auction</field>
-		<field name="account_collected_id" ref="auction_expense_costs"/>
-		<field name="account_paid_id" ref="auction_expense_costs"/>
-	</record>
-	<!--demo data for the product-->
-	<record id="product.product_product_pc2" model="product.product">
-		<field name="list_price">770.0</field>
-		<field name="standard_price">700.0</field>
-	</record>
+    <record model="account.tax" id="tax_buyer_author">
+        <field name="name">Author rights (4%)</field>
+        <field name="type">percent</field>
+        <field name="applicable_type">code</field>
+        <field name="amount">0.04</field>
+        <field name="domain">sabam</field>
+        <field name="account_collected_id" ref="auction_income_costs"/>
+        <field name="account_paid_id" ref="auction_income_costs"/>
+        <field name="python_applicable">result = (price_unit&gt;=1250)</field>
+    </record>
+    <record model="account.tax" id="tax_buyer">
+        <field name="name">Buyer Costs (20%)</field>
+        <field name="type">percent</field>
+        <field name="amount">0.20</field>
+        <field name="domain">auction</field>
+        <field name="account_collected_id" ref="auction_income_costs"/>
+        <field name="account_paid_id" ref="auction_income_costs"/>
+    </record>
+    <record model="account.tax" id="tax_seller">
+        <field name="name">Seller Costs (12%)</field>
+        <field name="type">percent</field>
+        <field name="amount">-0.12</field>
+        <field name="domain">auction</field>
+        <field name="account_collected_id" ref="auction_expense_costs"/>
+        <field name="account_paid_id" ref="auction_expense_costs"/>
+    </record>
+    <!--demo data for the product-->
+    <record id="product.product_product_pc2" model="product.product">
+        <field name="list_price">770.0</field>
+        <field name="standard_price">700.0</field>
+    </record>
 
 
     <!--demo data for the partner-->
@@ -106,39 +106,39 @@
     </record>
 
     <record id="res_partner_unknown_address_1" model="res.partner.address">
-	    <field name="city">Bruxelles1</field>
-	    <field name="name">Benoit Mortie1r1</field>
-	    <field name="zip">1030</field>
-	    <field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
-	    <field name="email">info@opensides.be</field>
-	    <field name="phone">(+32)2 211 34 83</field>
-	    <field name="street">Rue des Palais 44, bte 33</field>
-	    <field name="type">default</field>
-	    <field name="partner_id" ref="partner_record1"/>
-	</record>
+        <field name="city">Bruxelles1</field>
+        <field name="name">Benoit Mortie1r1</field>
+        <field name="zip">1030</field>
+        <field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
+        <field name="email">info@opensides.be</field>
+        <field name="phone">(+32)2 211 34 83</field>
+        <field name="street">Rue des Palais 44, bte 33</field>
+        <field name="type">default</field>
+        <field name="partner_id" ref="partner_record1"/>
+    </record>
 
-	<record id="res_partner_unknown_address_2" model="res.partner.address">
-	    <field name="city">Avignon CEDEX 091</field>
-	    <field name="name">Laurent Jacot1</field>
-	    <field name="zip">84911</field>
-	    <field name="country_id" model="res.country" search="[('name','=','France')]"/>
-	    <field name="email">contact@tecsas.fr</field>
-	    <field name="phone">(+33)4.32.74.10.57</field>
-	    <field name="street">85 rue du traite de Rome</field>
-	    <field name="type">default</field>
-	    <field name="partner_id" ref="partner_record1"/>
-	</record>
+    <record id="res_partner_unknown_address_2" model="res.partner.address">
+        <field name="city">Avignon CEDEX 091</field>
+        <field name="name">Laurent Jacot1</field>
+        <field name="zip">84911</field>
+        <field name="country_id" model="res.country" search="[('name','=','France')]"/>
+        <field name="email">contact@tecsas.fr</field>
+        <field name="phone">(+33)4.32.74.10.57</field>
+        <field name="street">85 rue du traite de Rome</field>
+        <field name="type">default</field>
+        <field name="partner_id" ref="partner_record1"/>
+    </record>
 
-	<record id="res_partner_unknown_address_3" model="res.partner.address">
-	    <field name="city">Louvain-la-Neuve</field>
-	    <field name="name">Thomas Passot</field>
-	    <field name="zip">1348</field>
-	    <field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
-	    <field name="email">info@mediapole.net</field>
-	    <field name="phone">(+32).10.45.17.73</field>
-	    <field name="street">Rue de l'Angelique, 1</field>
-	    <field name="partner_id" ref="partner_record1"/>
-	</record>
+    <record id="res_partner_unknown_address_3" model="res.partner.address">
+        <field name="city">Louvain-la-Neuve</field>
+        <field name="name">Thomas Passot</field>
+        <field name="zip">1348</field>
+        <field name="country_id" model="res.country" search="[('name','=','Belgium')]"/>
+        <field name="email">info@mediapole.net</field>
+        <field name="phone">(+32).10.45.17.73</field>
+        <field name="street">Rue de l'Angelique, 1</field>
+        <field name="partner_id" ref="partner_record1"/>
+    </record>
 
         <!-- demo data for the auction_artist object-->
 
@@ -331,33 +331,33 @@
     <!-- start == demo data for the auction_deposit-->
 
     <record model="auction.deposit" id="auction_deposit_1">
-	    <field name="date_dep" eval="time.strftime('%Y')+'-04-01'"/>
-	    <field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field>
-	    <field name="method">keep</field>
+        <field name="date_dep" eval="time.strftime('%Y')+'-04-01'"/>
+        <field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field>
+        <field name="method">keep</field>
     </record>
 
     <record model="auction.deposit" id="auction_deposit_2">
-	    <field name="date_dep" eval="time.strftime('%Y')+'-04-05'"/>
-	    <field name="partner_id" model="res.partner" search="[('name','=','China Export')]"></field>
-	    <field name="method">keep</field>
+        <field name="date_dep" eval="time.strftime('%Y')+'-04-05'"/>
+        <field name="partner_id" model="res.partner" search="[('name','=','China Export')]"></field>
+        <field name="method">keep</field>
     </record>
 
     <record model="auction.deposit" id="auction_deposit_3">
-	    <field name="date_dep" eval="time.strftime('%Y')+'-04-10'"/>
-	    <field name="partner_id" model="res.partner" search="[('name','=','Agrolait')]"></field>
-	    <field name="method">keep</field>
+        <field name="date_dep" eval="time.strftime('%Y')+'-04-10'"/>
+        <field name="partner_id" model="res.partner" search="[('name','=','Agrolait')]"></field>
+        <field name="method">keep</field>
     </record>
 
     <record model="auction.deposit" id="auction_deposit_4">
-	    <field name="date_dep" eval="time.strftime('%Y')+'-04-15'"/>
-	    <field name="partner_id" model="res.partner" search="[('name','=','Bank Wealthy and sons')]"></field>
-	    <field name="method">keep</field>
+        <field name="date_dep" eval="time.strftime('%Y')+'-04-15'"/>
+        <field name="partner_id" model="res.partner" search="[('name','=','Bank Wealthy and sons')]"></field>
+        <field name="method">keep</field>
     </record>
 
     <record model="auction.deposit" id="auction_deposit_5">
-	    <field name="date_dep" eval="time.strftime('%Y')+'-04-12'"/>
-	    <field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field>
-	    <field name="method">keep</field>
+        <field name="date_dep" eval="time.strftime('%Y')+'-04-12'"/>
+        <field name="partner_id" model="res.partner" search="[('name','=','Unknown')]"></field>
+        <field name="method">keep</field>
     </record>
 
     <record model="auction.lots" id="auction_deposit_1_lot_1">
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 3c8cb5c0278..1cda8ceba60 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -14,8 +14,8 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Artists">
-	            <field name="name"/>
-	            <field name="birth_death_dates"/>
+                <field name="name"/>
+                <field name="birth_death_dates"/>
             </tree>
         </field>
     </record>
@@ -27,10 +27,10 @@
             <form string="Artists">
                 <separator string="Author/Artist" colspan="4"/>
                 <group colspan="4" col="6">
-	                <field name="name" colspan="4" string="Name"/>
-	                <newline/>
-	                <field name="pseudo"/>
-	                <field name="birth_death_dates"/>
+                    <field name="name" colspan="4" string="Name"/>
+                    <newline/>
+                    <field name="pseudo"/>
+                    <field name="birth_death_dates"/>
                 </group>
                 <separator string="Biography" colspan="4"/>
                 <field name="biography" nolabel="1" colspan="4"/>
@@ -109,15 +109,15 @@
                     <page string="Auction Dates">
                         <group colspan="4" col="4">
                             <group colspan="2" col="2">
-		                        <separator string="Exposition Dates" colspan="4"/>
-		                        <field name="expo1"/>
-		                        <field name="expo2"/>
-		                    </group>
-		                    <group colspan="2" col="2">
-				                <separator string="Auction Dates" colspan="4"/>
-		                        <field name="auction1" select="1"/>
-		                        <field name="auction2" select="1"/>
-		                    </group>
+                                <separator string="Exposition Dates" colspan="4"/>
+                                <field name="expo1"/>
+                                <field name="expo2"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Auction Dates" colspan="4"/>
+                                <field name="auction1" select="1"/>
+                                <field name="auction2" select="1"/>
+                            </group>
                         </group>
                         <separator string="" colspan="4"/>
                         <field name="state"/>
@@ -126,16 +126,16 @@
                     <page string="Accounting" >
                         <group colspan="4" col="4">
                             <group colspan="2" col="2">
-		                        <separator string="Accounting" colspan="4"/>
-		                        <field name="acc_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-		                        <field name="acc_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-	                        </group>
-	                        <group colspan="2" col="2">
-		                        <separator string="Analytic" colspan="4"/>
-		                        <field name="journal_id"/>
-		                        <field name="journal_seller_id"/>
-		                        <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
-		                    </group>
+                                <separator string="Accounting" colspan="4"/>
+                                <field name="acc_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                <field name="acc_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Analytic" colspan="4"/>
+                                <field name="journal_id"/>
+                                <field name="journal_seller_id"/>
+                                <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                            </group>
                         </group>
                     </page>
                     <page string="Commissions">
@@ -157,14 +157,14 @@
                                 <field name="buyer_invoice_history" nolabel="1" widget="one2many_list"
                                         height="400">
                                     <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in ('cancel')" string="Invoice">
-					                    <field name="date_invoice"/>
-					                    <field name="number"/>
-					                    <field name="partner_id" groups="base.group_user"/>
-					                    <field name="name"/>
-					                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-					                    <field name="user_id"/>
-					                    <field name="date_due"/>
-					                    <field name="origin"/>
+                                        <field name="date_invoice"/>
+                                        <field name="number"/>
+                                        <field name="partner_id" groups="base.group_user"/>
+                                        <field name="name"/>
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                        <field name="user_id"/>
+                                        <field name="date_due"/>
+                                        <field name="origin"/>
                                         <field name="state"/>
                                     </tree>
                                 </field>
@@ -509,14 +509,14 @@
         <field name="arch" type="xml">
             <form string="Deposit Border Form">
                 <group colspan="4" col="6">
-	               <field name="name" string="Reference"/>
-	               <field name="date_dep"/>
-	               <field name="partner_id"/>
-	               <newline/>
-	               <field name="method"/>
-	               <field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-	               <field name="transfer"/>
-	            </group>
+                   <field name="name" string="Reference"/>
+                   <field name="date_dep"/>
+                   <field name="partner_id"/>
+                   <newline/>
+                   <field name="method"/>
+                   <field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+                   <field name="transfer"/>
+                </group>
                <notebook colspan="4">
                 <page string="General Information">
                  <field name="lot_id" colspan="4" mode="tree,graph" nolabel="1">
@@ -691,11 +691,11 @@
         <field name="arch" type="xml">
             <form string="Bids">
                 <group colspan="4" col="6">
-	                <field name="name"/>
-	                <field name="auction_id"/>
-	                <field name="contact_tel"/>
-	                <newline/>
-	                <field name="partner_id" on_change="onchange_contact(partner_id)" colspan="4"/>
+                    <field name="name"/>
+                    <field name="auction_id"/>
+                    <field name="contact_tel"/>
+                    <newline/>
+                    <field name="partner_id" on_change="onchange_contact(partner_id)" colspan="4"/>
                 </group>
                 <field name="bid_lines" colspan="4" nolabel="1">
                     <tree string="Bids Lines" editable="bottom">
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 041feb6d05c..13906abe6ba 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -25,17 +25,24 @@
           </separator>
             
           <group colspan="8">
-            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <separator string="Install Specific Industry Sector Applications" colspan="4"/>
-            <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
-            <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="account_voucher" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="account_accountant" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="marketing" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="point_of_sale" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <separator string="Install Specific Industry Applications" colspan="4"/>
+            <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
+            <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account_accountant,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
           </group>
         </data>
       </field>
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index f415447e5fb..be0dac906f2 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -27,8 +27,7 @@ class base_setup_installer(osv.osv_memory):
     _install_if = {
         ('sale','crm'): ['sale_crm'],
         ('sale','project'): ['project_mrp'],
-        ('sale',):['account_accountant']
-        }
+    }
     _columns = {
         # Generic modules
         'crm':fields.boolean('Customer Relationship Management',
@@ -51,9 +50,10 @@ class base_setup_installer(osv.osv_memory):
         'mrp':fields.boolean('Manufacturing',
             help="Helps you manage your manufacturing processes and generate "
                  "reports on those processes."),
-        'account':fields.boolean('Financial & Accounting',
-            help="Helps you handle your accounting needs, as well as create "
-                 "and track your budgets."),
+        'account_voucher':fields.boolean('Invoicing',
+            help="Allows you to create your invoices and track the payments. It is an easier version of the accounting module for managers who are not accountants."),
+        'account_accountant':fields.boolean('Accounting & Finance',
+            help="Helps you handle your accounting needs, if you are not an accountant, we suggest you to install only the Invoicing "),
         'purchase':fields.boolean('Purchase Management',
             help="Helps you manage your purchase-related processes such as "
                  "requests for quotations, supplier invoices, etc..."),
@@ -95,16 +95,7 @@ class base_setup_installer(osv.osv_memory):
         return None
 
     def _if_misc_tools(self, cr, uid, ids, context=None):
-        interface = self.pool.get('res.users').browse(cr, uid, uid, context=context).view
-        if interface == 'simple' or interface =='extended' :
-            return ['profile_tools']
-        return None
-
-    def _if_account(self, cr, uid, ids, context=None):
-        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
-               .view == 'simple':
-            return ['account_voucher']
-        return None
+        return ['profile_tools']
 
     def onchange_moduleselection(self, cr, uid, ids, *args, **kargs):
         value = {}
diff --git a/addons/product/product.py b/addons/product/product.py
index 6c1125268a9..80318895f2c 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -247,7 +247,11 @@ class product_template(osv.osv):
         'warranty': fields.float('Warranty (months)'),
         'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
         'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
-        'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'State', help="Tells the user if he can use the product or not."),
+        'state': fields.selection([('',''),
+            ('draft', 'In Development'),
+            ('sellable','Normal'),
+            ('end','End of Lifecycle'),
+            ('obsolete','Obsolete')], 'Status', help="Tells the user if he can use the product or not."),
         'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', required=True, help="Default Unit of Measure used for all stock operation."),
         'uom_po_id': fields.many2one('product.uom', 'Purchase Unit of Measure', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."),
         'uos_id' : fields.many2one('product.uom', 'Unit of Sale',
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 7e9ae7ce45e..924ad89cd10 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -110,7 +110,7 @@
                             <group colspan="2" col="2" name="uom">
                                 <separator string="Unit of Measure" colspan="2"/>
                                 <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" widget="selection"/>
-                                <field name="uom_po_id" widget="selection"/>
+                                <field name="uom_po_id" widget="selection" groups="base.group_extended"/>
                             </group>
 
                             <group colspan="2" col="2" name="uos" groups="product.group_uos">
@@ -147,13 +147,11 @@
                             <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                             <field name="list_price"/>
                             <newline/>
-                            <field name="price_margin" groups="base.group_extended"/>
-                            <field name="price_extra" groups="base.group_extended"/>
+                            <field name="price_margin" groups="group_product_variant"/>
+                            <field name="price_extra" groups="group_product_variant"/>
                             <newline/>
                             <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
-                            <field groups="base.group_extended" name="seller_id"/>
-                            <newline/>
                             <field colspan="4" name="seller_ids" nolabel="1"/>
                         </page>
                         <page string="Descriptions">
@@ -462,7 +460,6 @@
                     <field name="product_code" groups="base.group_extended"/>
                     <field name="min_qty"/>
                     <field name="product_uom" widget="selection"/>
-                    <field name="qty"/>
                     <field name="delay"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field colspan="4" groups="base.group_extended" name="pricelist_ids" nolabel="1" widget="one2many_list">
@@ -487,7 +484,7 @@
                     <field name="sequence" string="Seq"/>
                     <field name="name"/>
                     <field name="delay"/>
-                    <field name="qty"/>
+                    <field name="min_qty"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </tree>
             </field>
@@ -580,7 +577,7 @@
                             <group colspan="2" col="2" name="uom">
                                 <separator string="UOM" colspan="2"/>
                                 <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
-                                <field name="uom_po_id"/>
+                                <field name="uom_po_id" groups="base.group_extended"/>
                             </group>
 
                             <group colspan="2" col="2" name="uos" groups="product.group_uos">
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index c85088c9b53..1cf357f227c 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -270,7 +270,7 @@
                             <newline/>
                             <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
                         </page>
-           				<page string="Notes">
+                           <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
                         <page string="History" groups="base.group_extended">
@@ -310,8 +310,8 @@
                 <form string="Purchase Order Line">
                     <notebook colspan="4">
                         <page string="Order Line">
-                           	<separator colspan="4" string="General Information"/>
-                         	<field name="order_id"/>
+                               <separator colspan="4" string="General Information"/>
+                             <field name="order_id"/>
                             <field name="product_id" readonly="1" />
                             <field name="product_qty" readonly="1" />
                             <field name="product_uom" readonly="1"/>
@@ -332,7 +332,7 @@
                             <newline/>
                             <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
                         </page>
-         				<page string="Notes">
+                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
                         <page string="History" groups="base.group_extended">
@@ -349,7 +349,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
-                		<group>
+                        <group>
                         <field name="order_id"/>
                         <field name="product_id"/>
                         </group>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index ef9b833ec32..fea019a12ab 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -60,9 +60,10 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="standard_price" position="replace">
-                    <group col="4" colspan="2">
-                        <field name="standard_price" readonly="True"/>
-                        <button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute"/>
+                    <label string="Cost Price:" align="1.0" colspan="1"/>
+                    <group col="2" colspan="1">
+                        <field name="standard_price" nolabel="1" attrs="{'readonly':[('valuation','=','real_time')]}"/>
+                        <button name="%(action_view_change_standard_price)d" string="Update" type="action" icon="gtk-execute" attrs="{'invisible':[('valuation','=','manual_periodic')]}"/>
                     </group>
                 </field>
             </field>
@@ -76,8 +77,8 @@
             <field name="priority">26</field>
             <field name="arch" type="xml">
                 <field name="property_account_expense" position="after">
-                    <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
-                    <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended"/>
+                    <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended" attrs="{'invisible':[('valuation','=','manual_periodic')]}"/>
+                    <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="base.group_extended" attrs="{'invisible':[('valuation','=','manual_periodic')]}"/>
                 </field>
             </field>
         </record>
@@ -128,7 +129,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <field name="cost_method" position="after">
-                    <field name="valuation"/>
+                    <field name="valuation" groups="base.group_extended"/>
                 </field>
             </field>
         </record>