diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index ce4721db9cc..07fb69f7820 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -122,7 +122,7 @@
                     <field name="reference" invisible="1"/>
                     <field name="name" invisible="1"/>
                     <field name="journal_id" invisible="1"/>
-                    <field name="period_id" invisible="1" groups="base.group_dates_periods"/>
+                    <field name="period_id" invisible="1" groups="account.group_dates_periods"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field name="user_id"/>
                     <field name="date_due"/>
@@ -157,7 +157,7 @@
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
                         <field name="date_invoice"/>
-                        <field name="period_id" domain="[('state', '=', 'draft')]" groups="base.group_dates_periods" widget="selection"/>
+                        <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_dates_periods" widget="selection"/>
                         <group colspan="2" col="1" groups="account.group_account_user">
                             <label align="0.0" string="(keep empty to use the current period)"/>
                         </group>
@@ -267,7 +267,7 @@
                     <field name="fiscal_position" groups="base.group_extended" widget="selection" options='{"quick_create": false}'/>
                     <newline/>
                     <field name="date_invoice"/>
-                    <field name="period_id" domain="[('state', '=', 'draft')]" groups="base.group_dates_periods" widget="selection"/>
+                    <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_dates_periods" widget="selection"/>
                     <field name="payment_term" widget="selection"/>
                     <newline/>
                     <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
@@ -306,7 +306,7 @@
                                     <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                     <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="base.group_proforma_invoices"/>
+                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_proforma_invoices"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
                                     <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
                                 </group>
@@ -355,7 +355,7 @@
                 <search string="Search Invoice">
                    <group>
                         <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
-                        <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="base.group_proforma_invoices"/>
+                        <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
                         <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
                         <separator orientation="vertical"/>
                         <filter name="unpaid" icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
@@ -371,7 +371,7 @@
                     <newline/>
                     <group>
                         <field name="journal_id" widget="selection"/>
-                        <field name="period_id" string="Period" groups="base.group_dates_periods"/>
+                        <field name="period_id" string="Period" groups="account.group_dates_periods"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index f96060bfaa8..bd7a5bb8642 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -114,10 +114,10 @@ class account_config_settings(osv.osv_memory):
                 This installs the module account_invoice_layout."""),
 
         'group_dates_periods': fields.boolean('Allow dates/periods',
-            implied_group='base.group_dates_periods',
+            implied_group='account.group_dates_periods',
             help="Allows you to keep the period same as your invoice date when you validate the invoice."),
         'group_proforma_invoices': fields.boolean('Allow Pro-forma Invoices',
-            implied_group='base.group_proforma_invoices',
+            implied_group='account.group_proforma_invoices',
             help="Allows you to put invoices in pro-forma state."),
 
         'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax'),
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index d3ceb7d52e1..d83773f6aae 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -16,11 +16,11 @@
         <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
     </record>
 
-    <record id="base.group_dates_periods" model="res.groups">
+    <record id="group_dates_periods" model="res.groups">
         <field name="name">Dates and Periods</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
-    <record id="base.group_proforma_invoices" model="res.groups">
+    <record id="group_proforma_invoices" model="res.groups">
         <field name="name">Pro-forma Invoices</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>