From b8dea9ec32d238ee6da90b875fa83f6264068dba Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 3 Apr 2012 09:31:28 +0200
Subject: [PATCH] [IMP] account.config.settings: remove redundant group 'Dates
 and Periods'

bzr revid: rco@openerp.com-20120403073128-nwngudl2z6sync1z
---
 addons/account/account_invoice_view.xml      | 8 ++++----
 addons/account/res_config.py                 | 3 ---
 addons/account/res_config_view.xml           | 1 -
 addons/account/security/account_security.xml | 4 ----
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 07fb69f7820..07443b58974 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="account.group_dates_periods"/>
+                    <field name="period_id" invisible="1" groups="account.group_account_user"/>
                     <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="account.group_dates_periods" widget="selection"/>
+                        <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" 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="account.group_dates_periods" widget="selection"/>
+                    <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" 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"/>
@@ -371,7 +371,7 @@
                     <newline/>
                     <group>
                         <field name="journal_id" widget="selection"/>
-                        <field name="period_id" string="Period" groups="account.group_dates_periods"/>
+                        <field name="period_id" string="Period"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 0aaad711040..64e6d05cd1a 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -115,9 +115,6 @@ class account_config_settings(osv.osv_memory):
                     * draw horizontal lines and put page breaks.
                 This installs the module account_invoice_layout."""),
 
-        'group_dates_periods': fields.boolean('Allow 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='account.group_proforma_invoices',
             help="Allows you to put invoices in pro-forma state."),
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 06a522a728c..3604a8e3b57 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -54,7 +54,6 @@
                             <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"/>
                             <field name="module_account_accountant"/>
                             <field name="module_account_asset"/>
-                            <field name="group_dates_periods"/>
                         </group>
                         <group colspan="2" col="2">
                             <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"/>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index d83773f6aae..dd83885f468 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -16,10 +16,6 @@
         <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
     </record>
 
-    <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="group_proforma_invoices" model="res.groups">
         <field name="name">Pro-forma Invoices</field>
         <field name="category_id" ref="base.module_category_hidden"/>