diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8fca640bdf7..bd07994bf29 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1568,7 +1568,7 @@
                     <field name="sequence"/>
                     <field name="name"/>
                     <field name="account_id"/>
-                    <field name="analytic_account_id"/>
+                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="partner_id"/>
                     <field name="debit"/>
                     <field name="credit"/>
@@ -1587,7 +1587,7 @@
                     <field colspan="4" name="name" select="1"/>
                     <field name="sequence"/>
                     <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                    <field name="analytic_account_id"/>
+                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="partner_id"/>
                     <field name="debit" select="1"/>
                     <field name="credit" select="1"/>
diff --git a/addons/account/report/account_analytic_entries_report.py b/addons/account/report/account_analytic_entries_report.py
index ec813b8ecd8..aa0c5b3ba99 100644
--- a/addons/account/report/account_analytic_entries_report.py
+++ b/addons/account/report/account_analytic_entries_report.py
@@ -38,7 +38,7 @@ class analytic_entries_report(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
-        'account_id': fields.many2one('account.analytic.account', 'Account', required=True),
+        'account_id': fields.many2one('account.analytic.account', 'Account', required=False),
         'general_account_id': fields.many2one('account.account', 'General Account', required=True),
         'journal_id': fields.many2one('account.analytic.journal', 'Journal', required=True),
         'move_id': fields.many2one('account.move.line', 'Move', required=True),
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index da08d56af0d..a131400948b 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -16,7 +16,7 @@
                 <field name="partner_id" invisible="1"/>
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="currency_id" invisible="1"/>
-                <field name="account_id" invisible="1"/>
+                <field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                 <field name="general_account_id" invisible="1"/>
                 <field name="journal_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
@@ -49,7 +49,7 @@
                             help="Analytic Entries during last 7 days"/>
                     <separator orientation="vertical"/>
                     <field name="date" />
-                    <field name="account_id" />
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id" />
                     <field name="user_id">
                     <filter icon="terp-personal" domain="[('user_id','=',uid)]" help="My Entries"/>
@@ -63,7 +63,7 @@
                     <field name="journal_id" widget="selection"/>
                     <separator orientation="vertical"/>
                     <field name="name"/>
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </group>
                 <newline/>
@@ -72,7 +72,7 @@
                     <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
-                    <filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
+                    <filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
                     <filter string="General Account" icon="terp-folder-green" context="{'group_by':'general_account_id'}"/>
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 95a39eb11e6..179c9da45ec 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <tree string="Analytic Defaults">
                     <field name="sequence"/>
-                    <field name="analytic_id" required="1" domain="[('parent_id','!=',False)]"/>
+                    <field name="analytic_id" required="0" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
@@ -25,7 +25,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Analytic Defaults">
-                    <field name="analytic_id" required="1" domain="[('parent_id','!=',False)]"/>
+                    <field name="analytic_id" required="1" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
                     <field name="sequence"/>
                     <separator string="Conditions" colspan="4"/>
                     <field name="product_id"/>
@@ -44,7 +44,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
-                    <field name="analytic_id"/>
+                    <field name="analytic_id" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
@@ -68,7 +68,7 @@
             src_model="account.account"
             context="{'search_default_account_id': [active_id]}"
             />
-            
+
 
         <act_window
             name="Analytic Rules"
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 67640c98b99..d7b4532b6e8 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -64,7 +64,7 @@ class account_analytic_plan_line(osv.osv):
         'plan_id':fields.many2one('account.analytic.plan','Analytic Plan'),
         'name': fields.char('Plan Name', size=64, required=True, select=True),
         'sequence':fields.integer('Sequence'),
-        'root_analytic_id': fields.many2one('account.analytic.account','Root Account',help="Root account of this plan.",required=True),
+        'root_analytic_id': fields.many2one('account.analytic.account','Root Account',help="Root account of this plan.",required=False),
         'min_required': fields.float('Minimum Allowed (%)'),
         'max_required': fields.float('Maximum Allowed (%)'),
     }
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index e732b483730..1b3a6c8987a 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -140,7 +140,7 @@
         <field name="arch" type="xml">
             <form string="Analytic Distribution Line">
                 <field name="plan_id"/>
-                <field name="analytic_account_id" groups="base.group_extended"/>
+                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                 <field name="rate"/>
             </form>
         </field>
@@ -153,7 +153,7 @@
         <field name="arch" type="xml">
             <tree string="Analytic Distribution Lines">
                 <field name="plan_id" select="1"/>
-                <field name="analytic_account_id" select="1" groups="base.group_extended"/>
+                <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
                 <field name="rate"/>
             </tree>
         </field>
@@ -210,7 +210,7 @@
             <form string="Analytic Plan Line">
                 <field name="name"/>
                 <field name="sequence"/>
-                <field name="root_analytic_id"/>
+                <field name="root_analytic_id" groups="analytic.group_analytic_accounting"/>
                 <newline/>
                 <field name="min_required"/>
                 <field name="max_required"/>
@@ -226,7 +226,7 @@
             <tree string="Analytic Plan Lines">
                 <field name="name" select="1"/>
                 <field name="sequence"/>
-                <field name="root_analytic_id"/>
+                <field name="root_analytic_id" groups="analytic.group_analytic_accounting"/>
                 <field name="min_required"/>
                 <field name="max_required"/>
             </tree>
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
index 2429650a800..97df80e23fc 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
@@ -30,7 +30,7 @@ class account_crossovered_analytic(osv.osv_memory):
         'date1': fields.date('Start Date', required=True),
         'date2': fields.date('End Date', required=True),
         'journal_ids': fields.many2many('account.analytic.journal', 'crossovered_journal_rel', 'crossover_id', 'journal_id', 'Analytic Journal'),
-        'ref': fields.many2one('account.analytic.account', 'Analytic Account Reference', required=True),
+        'ref': fields.many2one('account.analytic.account', 'Analytic Account Reference', required=False),
         'empty_line': fields.boolean('Dont show empty lines'),
                 }
     _defaults = {
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index bdf915d9f98..6c496e18267 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -12,7 +12,7 @@
 				    <group col="4" colspan="6">
 					    <field name="date1"/>
 					    <field name="date2"/>
-					    <field name="ref"/>
+					    <field name="ref" groups="analytic.group_analytic_accounting"/>
 					    <field name="empty_line"/>
 					    <separator colspan="4" string="Analytic Journal"/>
 					    <field name="journal_ids" colspan="4" nolabel="1"/>
diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index 99c90badf60..74bc4dba3a2 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -238,7 +238,7 @@ class crossovered_budget_lines(osv.osv):
     _description = "Budget Line"
     _columns = {
         'crossovered_budget_id': fields.many2one('crossovered.budget', 'Budget', ondelete='cascade', select=True, required=True),
-        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account',required=True),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account',required=False),
         'general_budget_id': fields.many2one('account.budget.post', 'Budgetary Position',required=True),
         'date_from': fields.date('Start Date', required=True),
         'date_to': fields.date('End Date', required=True),
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 99083d097b6..d6c4b82e960 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -77,13 +77,13 @@
                         <page string="Budget Lines">
                             <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="graph,tree">
                                 <graph type="bar" string="Lines">
-                                    <field name="analytic_account_id" groups="base.group_extended"/>
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="planned_amount" operator="+"/>
                                     <field group="True" name="general_budget_id"/>
                                 </graph>
                                 <tree string="Budget Lines"  editable="top">
                                     <field name="crossovered_budget_id"/>
-                                    <field name="analytic_account_id" groups="base.group_extended" domain="[('parent_id','!=',False)]"/>
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                                     <field name="date_from"/>
                                     <field name="date_to"/>
                                     <field name="paid_date"/>
@@ -94,7 +94,7 @@
                                 </tree>
                                 <form string="Budget Lines">
                                     <field name="crossovered_budget_id"/>
-                                    <field name="analytic_account_id" groups="base.group_extended" domain="[('parent_id','!=',False)]" />
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
                                     <field name="date_from"/>
                                     <field name="date_to"/>
                                     <field name="paid_date"/>
@@ -125,7 +125,7 @@
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="crossovered_budget_line" colspan="4" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">
                                 <tree string="Budget Lines">
-                                    <field name="analytic_account_id" groups="base.group_extended"/>
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="general_budget_id"/>
                                     <field name="date_from"/>
                                     <field name="date_to"/>
@@ -136,7 +136,7 @@
                                     <field name="percentage"/>
                                 </tree>
                                 <form string="Budget Lines">
-                                    <field name="analytic_account_id" select="1" groups="base.group_extended"/>
+                                    <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
                                     <field name="general_budget_id" select="1"/>
                                     <field name="date_from"/>
                                     <field name="date_to"/>
@@ -213,7 +213,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Budget Lines">
-                    <field name="analytic_account_id" groups="base.group_extended"/>
+                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="general_budget_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
@@ -232,7 +232,7 @@
             <field name="arch" type="xml">
                 <form string="Budget Lines">
                     <field name="crossovered_budget_id"/>
-                    <field name="analytic_account_id" select="1" groups="base.group_extended"/>
+                    <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="general_budget_id" select="1"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 834e7e9b150..c5d1c0fa89f 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -64,7 +64,7 @@ class auction_dates(osv.osv):
         reads = self.read(cr, uid, ids, ['name', 'auction1'], context)
         name = [(r['id'], '['+r['auction1']+'] '+ r['name']) for r in reads]
         return name
-    
+
     def _get_invoice(self, cr, uid, ids, name, arg, context={}):
         lots_obj = self.pool.get('auction.lots')
         result = {}
@@ -100,7 +100,7 @@ class auction_dates(osv.osv):
         'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True),
         'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True,
                                   help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'),
-        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
+        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=False),
         'buyer_invoice_history': fields.function(_get_invoice, relation='account.invoice', method=True, string="Buyer Invoice", type='many2many', multi=True),
         'seller_invoice_history': fields.function(_get_invoice, relation='account.invoice', method=True, string="Seller Invoice", type='many2many', multi=True),
     }
@@ -621,14 +621,14 @@ class auction_lots(osv.osv):
                     taxes.append(lot.author_right.id)
 
                 inv_line= {
-                    'invoice_id': inv_id, 
-                    'quantity': 1, 
-                    'product_id': lot.product_id.id, 
-                    'name': 'proforma'+'['+str(lot.obj_num)+'] '+ lot.name, 
-                    'invoice_line_tax_id': [(6, 0, taxes)], 
-                    'account_analytic_id': lot.auction_id.account_analytic_id.id, 
-                    'account_id': lot.auction_id.acc_income.id, 
-                    'price_unit': lot.obj_price, 
+                    'invoice_id': inv_id,
+                    'quantity': 1,
+                    'product_id': lot.product_id.id,
+                    'name': 'proforma'+'['+str(lot.obj_num)+'] '+ lot.name,
+                    'invoice_line_tax_id': [(6, 0, taxes)],
+                    'account_analytic_id': lot.auction_id.account_analytic_id.id,
+                    'account_id': lot.auction_id.acc_income.id,
+                    'price_unit': lot.obj_price,
                 }
                 inv_line_obj.create(cr, uid, inv_line, context)
             inv_ref.button_compute(cr, uid, invoices.values())
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index c3068753a6e..3c8cb5c0278 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -134,7 +134,7 @@
 		                        <separator string="Analytic" colspan="4"/>
 		                        <field name="journal_id"/>
 		                        <field name="journal_seller_id"/>
-		                        <field name="account_analytic_id" groups="base.group_extended"/>
+		                        <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
 		                    </group>
                         </group>
                     </page>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 79c0d5513f0..41f87a991c3 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -13,7 +13,7 @@
                     <field name="date_value"/>
                     <field name="name"/>
                     <field name="ref"/>
-                    <field domain="[('type','=','normal'), ('parent_id','!=',False)]" name="analytic_account" groups="base.group_extended"/>
+                    <field domain="[('type','=','normal'), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
                     <field name="unit_amount"/>
                     <field name="unit_quantity"/>
                     <field name="total_amount"/>
@@ -30,8 +30,8 @@
                     <field name="employee_id"/>
                     <field name="user_id" invisible="1"/>
                     <field name="department_id" groups="base.group_extended"/>
-                    <field name="name"/> 
-                    <field name="date"/>                                       
+                    <field name="name"/>
+                    <field name="date"/>
                     <field name="ref"/>
                     <field name="amount"/>
                     <field name="state"/>
@@ -98,7 +98,7 @@
                             <group col="6" colspan="2">
                                 <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
                                 <button name="cancel" states="cancel" string="Cancel" type="workflow" icon="gtk-cancel"/>
-                                <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert"/>                                                                
+                                <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert"/>
                                 <button name="validate" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
                                 <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-execute"/>
                                 <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager" />
@@ -139,7 +139,7 @@
                       <filter icon="terp-check" domain="[('state','=','accepted')]" string="To Pay"
                         help="Expenses to Invoice"/>
                       <filter icon="terp-go-month" string="This Month" name="this"
-                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>                        
+                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
                       <separator orientation="vertical"/>
                       <field name="name" select='1'/>
                       <field name="date" select='1'/>
@@ -151,8 +151,8 @@
                 </group>
                 <newline />
                 <group expand="0" string="Group By...">
-                    <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>                                    
-                    <separator orientation="vertical"/>                    
+                    <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 0037831391a..9549e6df576 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -15,7 +15,7 @@
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="invoice_id" invisible="1"/>
-                <field name="analytic_account" invisible="1"/>
+                <field name="analytic_account" invisible="1" groups="analytic.group_analytic_accounting"/>
                 <field name="department_id" invisible="1"/>
                 <field name="company_id" invisible="1"/>
                 <field name="currency_id" invisible="1"/>
@@ -93,9 +93,9 @@
                 <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
                 <separator orientation="vertical"/>
                 <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                <separator orientation="vertical"/>
-                <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}"/>
-                <separator orientation="vertical"/>
+                <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
+                <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
+                <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                 <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                 <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                 <separator orientation="vertical"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 468fa0cee98..ab9c16a45b5 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -296,7 +296,7 @@
                     <group col="6" colspan="4">
                         <field name="name" colspan="4" select="1"/>
                         <field name="code" select="1"/>
-                        <field name="account_id" select="1" groups="base.group_extended"/>
+                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                         <field name="company_id"/>
                     </group>
                     <notebook colspan="4">
@@ -361,7 +361,7 @@
                     <field name="amount_type"/>
                     <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
                     <field name="account_id"/>
-                    <field name="analytic_account_id" groups="base.group_extended"/>
+                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                 </tree>
             </field>
         </record>
@@ -389,7 +389,7 @@
                     <group col="2" colspan="2">
                         <separator colspan="4" string="Accounting Informations"/>
                         <field name="account_id"/>
-                        <field name="analytic_account_id" groups="base.group_extended"/>
+                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                         <separator colspan="4" string="Company contribution"/>
                         <field name="company_contrib"/>
                     </group>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index b308aa69cc8..9b990556218 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -27,7 +27,7 @@ class hr_so_project(osv.osv_memory):
     _name = 'hr.sign.out.project'
     _description = 'Sign Out By Project'
     _columns = {
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, domain=[('type','=','normal')]),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('type','=','normal')]),
         'info': fields.char('Work Description', size=256, required=True),
         'date_start': fields.datetime('Starting Date', readonly=True),
         'date': fields.datetime('Closing Date'),
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 73c01c9c54f..99d9230a188 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -70,7 +70,7 @@
                         <field name="date_start"/>
                         <field name="server_date"/>
                         <separator string="Work done in the last period" colspan="4" />
-                        <field name="account_id" colspan="2"/>
+                        <field name="account_id" colspan="2" groups="analytic.group_analytic_accounting"/>
                         <field name="info" colspan="2"/>
                         <field name="date"/>
                         <label string="(Keep empty for current_time)" colspan="2"/>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index c0f82b0475b..33b92d09241 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -13,7 +13,7 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet Line" type="bar">
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="quantity" operator="+"/>
                     <field group="True" name="user_id"/>
                 </graph>
@@ -33,7 +33,7 @@
                     <field name="user_id" invisible="1"/>
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
-                    <field name="account_id" invisible="1"/>
+                    <field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                     <field name="product_id" invisible="1"/>
                     <field name="invoice_id" invisible="1"/>
                 </tree>
@@ -66,7 +66,7 @@
                               help="Non Assigned timesheets to users"
                               domain="[('user_id','=',False)]"/>
                       </field>
-                      <field name="account_id"/>
+                      <field name="account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="product_id"/>
                     </group>
                     <newline/>
@@ -192,7 +192,7 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet by invoice">
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="amount_invoice" operator="+"/>
                 </graph>
             </field>
@@ -204,7 +204,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Timesheet by invoice">
-                    <field name="account_id" select="1"/>
+                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="manager_id" select="1"/>
                     <field name="user_id" select="1"/>
                 </form>
@@ -218,7 +218,7 @@
             <field name="arch" type="xml">
                 <search string="Timesheet by invoice">
                     <separator orientation="vertical"/>
-                    <field name="account_id" select="1"/>
+                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="manager_id" select="1"/>
                     <field name="user_id" select="1"/>
                 </search>
@@ -232,7 +232,7 @@
             <field name="arch" type="xml">
                 <tree string="Timesheets to invoice">
                     <field name="user_id"/>
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="manager_id"/>
                     <field name="quantity"/>
                     <field name="amount_invoice"/>
@@ -259,7 +259,7 @@
                 <tree string="Daily timesheet per account">
                     <field name="name"/>
                     <field name="month" select="1"/>
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="user_id"/>
                     <field name="quantity"/>
                 </tree>
@@ -271,7 +271,7 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Daily timesheet per account">
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="quantity" operator="+"/>
                     <field group="True" name="user_id"/>
                 </graph>
@@ -286,7 +286,7 @@
                 <form string="Daily timesheet by account">
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="account_id" select="1"/>
+                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="user_id" select="1"/>
                     <field name="quantity"/>
                 </form>
@@ -306,7 +306,7 @@
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="month" select="1"/>
-                        <field name="account_id" select="1"/>
+                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                         <field name="user_id" select="1"/>
                     </group>
                 </search>
@@ -332,7 +332,7 @@
                 <tree string="Timesheet per account">
                     <field name="name"/>
                     <field name="month" />
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="user_id"/>
                     <field name="quantity"/>
                 </tree>
@@ -344,7 +344,7 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Timesheet per account">
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="quantity" operator="+"/>
                     <field group="True" name="user_id"/>
                 </graph>
@@ -359,7 +359,7 @@
                 <form string="Timesheet by account">
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="account_id" select="1"/>
+                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="user_id" select="1"/>
                     <field name="quantity"/>
                 </form>
@@ -379,7 +379,7 @@
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
                         <field name="month" select="1"/>
-                        <field name="account_id" select="1"/>
+                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                         <field name="user_id" select="1"/>
                     </group>
                 </form>
@@ -395,33 +395,33 @@
             <field name="search_view_id" ref="view_timesheet_account_search"/>
         </record>
 
-        <act_window 
+        <act_window
         context="{'search_default_user_id': [active_id]}"
-        id="act_res_users_2_report_timesheet_user" 
-        name="Timesheets per day" 
-        res_model="report_timesheet.user" 
-        src_model="res.users"/>
-        
-
-        <act_window 
-        context="{'search_default_user_id': [active_id]}"
-        id="act_res_users_2_report_timehsheet_account" 
-        name="Timesheets per account" 
-        res_model="report_timesheet.account" 
+        id="act_res_users_2_report_timesheet_user"
+        name="Timesheets per day"
+        res_model="report_timesheet.user"
         src_model="res.users"/>
 
-        <act_window 
+
+        <act_window
+        context="{'search_default_user_id': [active_id]}"
+        id="act_res_users_2_report_timehsheet_account"
+        name="Timesheets per account"
+        res_model="report_timesheet.account"
+        src_model="res.users"/>
+
+        <act_window
         context="{'search_default_account_id': [active_id]}"
-        id="act_account_analytic_account_2_report_timehsheet_account" 
-        name="Timesheets" 
-        res_model="report_timesheet.account" 
+        id="act_account_analytic_account_2_report_timehsheet_account"
+        name="Timesheets"
+        res_model="report_timesheet.account"
         src_model="account.analytic.account"/>
 
-        <act_window 
+        <act_window
         context="{'search_default_manager_id': [active_id]}"
-        id="act_res_users_2_report_timesheet_invoice" 
-        name="Costs to invoice" 
-        res_model="report_timesheet.invoice" 
+        id="act_res_users_2_report_timesheet_invoice"
+        name="Costs to invoice"
+        res_model="report_timesheet.invoice"
         src_model="res.users"/>
 
 
@@ -433,7 +433,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Random Timesheets">
-                    <field name="analytic_account_id" select="1" groups="base.group_extended"/>
+                    <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="name" select="1"/>
                     <field name="quantity" select="2" />
                     <field name="date" select="1"/>
@@ -486,7 +486,7 @@
                     <field name="name" select="1"/>
                     <field name="quantity" />
                     <field name="product_id" select="1"/>
-                    <field name="analytic_account_id" select="1" groups="base.group_extended"/>
+                    <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="uom_id" />
                     <field name="amount" />
                     <field name="to_invoice" select="1"/>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index f5573a394ef..6b06ce4fcde 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Expired analytic accounts">
-                    <field name="name" select="1"/>
+                    <field name="name" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="partner_id" select="1"/>
                     <field name="quantity" select="1"/>
                     <field name="state" select="1"/>
@@ -26,7 +26,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Expired analytic accounts">
-                    <field name="name"/>
+                    <field name="name" groups="analytic.group_analytic_accounting"/>
                     <field name="partner_id"/>
                     <field name="state"/>
                     <field name="quantity"/>
@@ -66,7 +66,7 @@
                 <form string="Analytic Lines to Invoice">
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="account_id" select="1"/>
+                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <newline/>
                     <field name="product_id" select="1"/>
                     <field name="product_uom_id"/>
@@ -86,7 +86,7 @@
                     <field name="name"/>
                     <field name="month"/>
                     <field name="product_id"/>
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="amount"/>
                     <field name="sale_price"/>
                     <field name="unit_amount"/>
@@ -120,7 +120,7 @@
                         <field name="name" select="1"/>
                         <field name="month" select="1"/>
                         <field name="product_id" select="1"/>
-                        <field name="account_id" select="1"/>
+                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                    </group>
                </search>
             </field>
@@ -134,12 +134,12 @@
             <field name="search_view_id" ref="account_analytic_line_to_invoice_view_filter"/>
         </record>
 
-        <act_window 
+        <act_window
         domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]"
-        context="{'search_default_account_id': [active_id]}" 
-        id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" 
-        name="Lines to Invoice" 
-        res_model="account.analytic.line" 
+        context="{'search_default_account_id': [active_id]}"
+        id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice"
+        name="Lines to Invoice"
+        res_model="account.analytic.line"
         src_model="account.analytic.account"/>
 
     </data>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index d71b385c1f8..a0b20e5ff97 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -20,7 +20,7 @@
 				            <separator string="Force to use a specific product" colspan="4"/>
 				            <field name="product"/>
 				        </page>
-				        <page string="Filter on Accounts" groups="base.group_extended">
+				        <page string="Filter on Accounts" groups="analytic.group_analytic_accounting">
 				            <separator string="Choose accounts you want to invoice" colspan="4"/>
 				            <field name="accounts" colspan="4" nolabel="1"/>
 				        </page>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index f078be2dbe1..42f09e22648 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -39,7 +39,7 @@
             <field name="arch" type="xml">
                 <form string="Timesheet by Accounts">
                     <field name="sheet_id" select="1"/>
-                    <field name="name" select="1" groups="base.group_extended"/>
+                    <field name="name" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="total" sum="Total"/>
                     <field name="invoice_rate"/>
                 </form>
@@ -53,7 +53,7 @@
             <field name="arch" type="xml">
                 <tree string="Timesheet by Accounts">
                     <field name="sheet_id"/>
-                    <field name="name" groups="base.group_extended"/>
+                    <field name="name" groups="analytic.group_analytic_accounting"/>
                     <field name="total" sum="Total"/>
                     <field name="invoice_rate"/>
                 </tree>
@@ -290,26 +290,26 @@
             </field>
         </record>
 
-        <act_window 
+        <act_window
         context="{'search_default_sheet_id': [active_id]}"
-        id="act_hr_timesheet_sheet_sheet_by_day" 
-        name="Timesheet by Account" 
-        res_model="hr_timesheet_sheet.sheet.account" 
+        id="act_hr_timesheet_sheet_sheet_by_day"
+        name="Timesheet by Account"
+        res_model="hr_timesheet_sheet.sheet.account"
         src_model="hr_timesheet_sheet.sheet"/>
 
-        <act_window 
+        <act_window
         context="{'search_default_sheet_id': [active_id]}"
-        id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet" 
-        name="Timesheet Lines" 
-        res_model="hr.analytic.timesheet" 
+        id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet"
+        name="Timesheet Lines"
+        res_model="hr.analytic.timesheet"
         src_model="hr_timesheet_sheet.sheet"/>
-        
 
-        <act_window 
+
+        <act_window
         context="{'search_default_sheet_id': [active_id]}"
-        id="act_hr_timesheet_sheet_sheet_2_hr_attendance" 
-        name="Attendances" 
-        res_model="hr.attendance" 
+        id="act_hr_timesheet_sheet_sheet_2_hr_attendance"
+        name="Attendances"
+        res_model="hr.attendance"
         src_model="hr_timesheet_sheet.sheet"/>
 
         <record id="hr_timesheet_sheet_tree_simplified" model="ir.ui.view">
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 9c0588f618e..05cba7f1e49 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -26,7 +26,7 @@
                     <field name="company_id" invisible="1"/>
                     <field name="journal_id" invisible="1"/>
                     <field name="product_id" invisible="1"/>
-                    <field name="account_id" invisible="1"/>
+                    <field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                     <field name="general_account_id" invisible="1"/>
 
                     <field name="quantity" sum="Hours"/>
@@ -54,8 +54,8 @@
                             domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
                             help="Timesheet of last month"/>
                         <separator orientation="vertical"/>
-                            <field name="account_id"/>
-                            <field name="user_id" />
+                            <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                            <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters..." groups="base.group_extended">
@@ -71,8 +71,8 @@
                     <group expand="1" string="Group By...">
                         <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
+                        <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
+                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
                         <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <separator orientation="vertical"/>
@@ -80,7 +80,7 @@
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
                         <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
                     </group>
-                    
+
                 </search>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 08abc6db63b..ce317f948e5 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -29,7 +29,7 @@
                     <field name="company_id" invisible="1"/>
                     <field name="to_invoice" invisible="1"/>
                     <field name="product_id" invisible="1"/>
-                    <field name="account_id" invisible="1"/>
+                    <field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                     <field name="general_account_id" invisible="1"/>
                     <field name="year" invisible="1"/>
                     <field name="day" invisible="1"/>
@@ -71,7 +71,7 @@
                                     string="Done"
                                     domain="[('state','=','done')]"/>
                         <separator orientation="vertical"/>
-                        <field name="account_id"/>
+                        <field name="account_id" groups="analytic.group_analytic_accounting"/>
                       <field name="user_id" />
                     </group>
                     <newline/>
@@ -97,7 +97,7 @@
                         <separator orientation="vertical"/>
                         <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
+                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
                         <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 615b5cee009..39ecec5ad95 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -163,7 +163,7 @@
                                 <field name="time_stop" widget="float_time"/>
                             </group>
                         </page>
-                        <page string="Analytic Accounting" groups="base.group_extended">
+                        <page string="Analytic Accounting" groups="analytic.group_analytic_accounting">
                             <field name="costs_hour"/>
                             <field name="costs_hour_account_id"/>
                             <field name="costs_cycle"/>
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 729a8ee6bbb..cf22a90aceb 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -215,7 +215,7 @@ class report_account_analytic_planning_line(osv.osv):
         return result
 
     _columns = {
-        'account_id': fields.many2one('account.analytic.account', 'Analytic account', required=True),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic account'),
         'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True, ondelete='cascade'),
         'user_id': fields.many2one('res.users', 'User'),
         'amount': fields.float('Quantity', required=True),
@@ -577,7 +577,7 @@ WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.i
         'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
         'user_id': fields.many2one('res.users', 'User'),
         'manager_id': fields.many2one('res.users', 'Manager'),
-        'account_id': fields.many2one('account.analytic.account', 'Account', required=True),
+        'account_id': fields.many2one('account.analytic.account', 'Account'),
         'sum_amount': fields.float('Planned Days', required=True),
         'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
         'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks'),
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 9363413e4a2..ff354c69ccd 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -54,7 +54,7 @@
                         <field colspan="4" name="planning_account"
                                 nolabel="1" widget="one2many_list" readonly="1">
                             <tree string="Planning By Account (in Days)">
-                                <field name="account_id" groups="base.group_extended"/>
+                                <field name="account_id" groups="analytic.group_analytic_accounting"/>
                                 <field name="tasks" sum="Total Remaining Tasks"/>
                                 <field name="plan_tasks" sum="Total Time Allocation of Tasks"/>
                                 <field name="plan_open" sum="Total Time Allocation without Tasks"/>
@@ -68,7 +68,7 @@
                                 <tree editable="bottom"
                                     string="Planning Lines">
                                     <field name="user_id"/>
-                                    <field name="account_id" groups="base.group_extended"/>
+                                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="amount" />
                                     <field name="amount_unit" />
                                     <field name="task_ids" />
@@ -78,7 +78,7 @@
                                 </tree>
                                 <form string="Planning Lines">
                                     <field name="user_id" domain="[('id','child_of',[parent.user_id])]"/>
-                                    <field name="account_id" groups="base.group_extended"/>
+                                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="amount" />
                                     <field name="amount_unit" />
                                        <field name="task_ids" colspan="4" nolabel="1" mode="tree,form">
@@ -180,7 +180,7 @@
                 <tree string="Planning Line">
                     <field name="planning_id"/>
                     <field name="user_id"/>
-                    <field name="account_id" groups="base.group_extended"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="amount" />
                     <field name="amount_unit" />
                     <field name="note" select="1"/>
@@ -197,7 +197,7 @@
                 <form string="Planning Line">
                     <field name="planning_id" select="1"/>
                     <field name="user_id" select="1"/>
-                    <field name="account_id" select="1" groups="base.group_extended"/>
+                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     <field name="amount" />
                     <field name="amount_unit" />
                     <separator string="Notes" colspan="4" />
@@ -233,7 +233,7 @@
                 <form string="Planning statistics">
                     <field name="planning_id" select="1" />
                     <field name="user_id" select="1" />
-                    <field name="account_id" select="1" groups="base.group_extended"/>
+                    <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                 </form>
             </field>
         </record>
@@ -248,7 +248,7 @@
                     <field name="planning_id" />
                     <field name="user_id" />
                     <field name="manager_id" />
-                    <field name="account_id" groups="base.group_extended"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="sum_amount" />
                     <field name="sum_amount_real" />
                     <field name="sum_amount_tasks" />
@@ -262,7 +262,7 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Planning statistics" type="bar">
-                    <field name="account_id"/>
+                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="sum_amount" operator="+" />
                     <field name="sum_amount_real" operator="+" />
                     <field name="sum_amount_tasks" operator="+" />
@@ -281,7 +281,7 @@
                         <separator orientation="vertical"/>
                         <field name="planning_id" select="1"/>
                         <field name="user_id" select="1"/>
-                        <field name="account_id" select="1" groups="base.group_extended"/>
+                        <field name="account_id" select="1" groups="analytic.group_analytic_accounting"/>
                     </group>
                 </search>
             </field>
@@ -324,7 +324,7 @@
                             <tree editable="bottom"
                                     string="Planning Lines">
                                     <field name="user_id"/>
-                                    <field name="account_id" groups="base.group_extended"/>
+                                    <field name="account_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="amount" />
                                     <field name="amount_unit" />
                                     <field name="task_ids" />
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index e151cdc56f9..c85088c9b53 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -190,7 +190,7 @@
                      <separator orientation="vertical"/>
                     <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     <filter string="Expected Date" icon="terp-go-month" domain="[]" context="{'group_by':'minimum_planned_date'}"/>
-                    
+
                 </group>
               </search>
             </field>
@@ -257,7 +257,7 @@
                             <field name="date_planned" widget="date"/>
                             <field name="price_unit"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="base.group_extended" domain="[('parent_id','!=',False)]" />
+                            <field name="account_analytic_id" colspan="4" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
                             <group colspan="4" col="4" groups="base.group_extended">
                                 <separator colspan="4" string="Taxes"/>
                                 <field colspan="4" nolabel="1" name="taxes_id"
@@ -276,7 +276,7 @@
                         <page string="History" groups="base.group_extended">
                                <separator colspan="4" string="Stock Moves"/>
                                <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
-                        </page>                        
+                        </page>
                     </notebook>
                 </form>
             </field>
@@ -319,7 +319,7 @@
                             <field name="date_planned" widget="date"  readonly="1"/>
                             <field name="price_unit"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="account_analytic_id" colspan="4" groups="base.group_extended" domain="[('parent_id','!=',False)]"/>
+                            <field name="account_analytic_id" colspan="4" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                             <group colspan="4" col="4" groups="base.group_extended">
                                 <separator colspan="4" string="Taxes"/>
                                 <field colspan="4" nolabel="1" name="taxes_id"
@@ -338,7 +338,7 @@
                         <page string="History" groups="base.group_extended">
                                <separator colspan="4" string="Stock Moves"/>
                                <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
-                        </page>                        
+                        </page>
                     </notebook>
                 </form>
             </field>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index b914e2b2d4b..aaf4cd3e69c 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -26,7 +26,7 @@
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay" sum="Commitment Delay"/>
                 <field name="state" invisible="1"/>
-                <field name="analytic_account_id" invisible="1" groups="base.group_extended"/>
+                <field name="analytic_account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
             </tree>
         </field>
     </record>
@@ -101,9 +101,9 @@
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                     <filter string="Default UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
                     <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}"/>
-                    <separator orientation="vertical"/>
+                    <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
+                    <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
+                    <separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index be0d254debd..db1818602ce 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -19,7 +19,7 @@
                     <separator colspan="4" string="Accounting"/>
                     <field name="payment_default_id"/>
                     <field domain="[('type','=','sale')]" name="pricelist_id" select="1"/>
-                    <field name="project_id" select="1"/>
+                    <field name="project_id" select="1" groups="analytic.group_analytic_accounting"/>
                 </form>
             </field>
         </record>
@@ -32,7 +32,7 @@
                     <field name="name"/>
                     <field name="warehouse_id"/>
                     <field name="pricelist_id"/>
-                    <field name="project_id"/>
+                    <field name="project_id" groups="analytic.group_analytic_accounting"/>
                 </tree>
             </field>
         </record>
@@ -115,7 +115,7 @@
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended"/>
                             <field name="project_id"
                                 context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"
-                                groups="base.group_extended" domain="[('parent_id','!=',False)]" />
+                                groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
                             <newline/>
                             <field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sale Order Lines">
@@ -451,7 +451,7 @@ to your configuration: from the sales order, from the pickings, etc.
                         name="sale order"
                         help="Confirmed Sale Order Lines"
                         />
-                    <separator orientation="vertical"/>    
+                    <separator orientation="vertical"/>
                     <filter icon="terp-accessories-archiver" string="Shipped"
                         domain="[('state','=','done')]"
                         name="unshipped"
@@ -501,19 +501,19 @@ to your configuration: from the sales order, from the pickings, etc.
             <field name="filter" eval="True"/>
         </record>
 
-        <act_window 
-        context="{'search_default_partner_id': [active_id]}" 
-        id="act_res_partner_2_sale_order" 
-        name="Sales" 
-        res_model="sale.order" 
+        <act_window
+        context="{'search_default_partner_id': [active_id]}"
+        id="act_res_partner_2_sale_order"
+        name="Sales"
+        res_model="sale.order"
         src_model="res.partner"/>
 
-        <act_window 
-        context="{'search_default_product_id': [active_id]}" 
-        id="action_order_line_product_tree" 
-        name="Product sales" 
-        res_model="sale.order.line" 
-        src_model="product.product" 
+        <act_window
+        context="{'search_default_product_id': [active_id]}"
+        id="action_order_line_product_tree"
+        name="Product sales"
+        res_model="sale.order.line"
+        src_model="product.product"
         groups="base.group_extended"/>
 
         <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5"/>
@@ -549,7 +549,7 @@ to your configuration: from the sales order, from the pickings, etc.
                   <field name="step"/>
                 </group>
                 <xpath expr='//button[@name="action_skip"]' position='replace'/>
-               
+
               </data>
             </field>
         </record>
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index c6b589145c7..d6de441f582 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -13,7 +13,7 @@
                     <group colspan="4">
                         <field name="partner_id" required="1"/>
                         <field name="shop_id" required="1" widget="selection"/>
-                        <field name="analytic_account" domain="[('parent_id','!=',False)]" />
+                        <field name="analytic_account" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting" />
                         <field name="close" required="1"/>
                     	</group>
                             <field colspan="4" mode="tree,form,graph" name="sale_order_line" nolabel="1" widget="one2many_list">