From 70bb0dd8109a5fba81ebb13175a3c03398d7a73a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 12 Dec 2011 15:51:28 +0100
Subject: [PATCH] [IMP] base_contact, event, knowledge, product, project,
 sale_mrp: avoid redefinition of sale groups

bzr revid: rco@openerp.com-20111212145128-zx64v0uwf8n0lwyu
---
 addons/base_contact/__openerp__.py            |  1 -
 .../security/base_contact_security.xml        | 16 -----------
 addons/event/__openerp__.py                   |  1 -
 addons/event/security/event_security.xml      | 27 -------------------
 .../knowledge/security/knowledge_security.xml |  5 ----
 addons/product/security/product_security.xml  |  9 -------
 addons/project/security/project_security.xml  |  5 ----
 addons/sale_mrp/__openerp__.py                |  1 -
 .../sale_mrp/security/sale_mrp_security.xml   | 16 -----------
 9 files changed, 81 deletions(-)
 delete mode 100644 addons/base_contact/security/base_contact_security.xml
 delete mode 100644 addons/event/security/event_security.xml
 delete mode 100644 addons/sale_mrp/security/sale_mrp_security.xml

diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index f5969b6e309..74720eb3011 100644
--- a/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -45,7 +45,6 @@ Pay attention that this module converts the existing addresses into "addresses +
     'depends': ['base','process'],
     'init_xml': [],
     'update_xml': [
-        'security/base_contact_security.xml',
         'security/ir.model.access.csv',
         'base_contact_view.xml',
         'base_contact_installer_view.xml',
diff --git a/addons/base_contact/security/base_contact_security.xml b/addons/base_contact/security/base_contact_security.xml
deleted file mode 100644
index 29b16893ef2..00000000000
--- a/addons/base_contact/security/base_contact_security.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="0">
-
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-    
-</data>
-</openerp>
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index abd3f6393b5..283bd03ce30 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -42,7 +42,6 @@ Note that:
     'depends': ['crm', 'base_contact', 'account', 'marketing', 'mail'],
     'init_xml': [],
     'update_xml': [
-        'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_confirm_registration_view.xml',
         'wizard/event_confirm_view.xml',
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
deleted file mode 100644
index 091aaef03a1..00000000000
--- a/addons/event/security/event_security.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-  <data>
-
-    <record id="marketing.group_marketing_user" model="res.groups">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_marketing"/>
-    </record>
-
-    <record id="marketing.group_marketing_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_marketing"/>
-        <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-  </data>
-</openerp>
-
diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index 80bce33e7e4..560fdce0506 100644
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -2,11 +2,6 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-
     <record id="base.group_document_user" model="res.groups">
         <field name="name">User</field>
         <field name="category_id" ref="base.module_category_knowledge_management"/>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 59d93fd2b3d..5c993b9cd61 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -7,15 +7,6 @@
         <field name="category_id" ref="base.module_category_usability"/>
     </record>
 
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-
     <record id="product_comp_rule" model="ir.rule">
         <field name="name" >Product multi-company</field>
         <field name="model_id" ref="model_product_template"/>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 69f4dff9a83..f1e3a6e9b74 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -13,11 +13,6 @@
         <field name="implied_ids" eval="[(4, ref('group_project_user'))]"/>
     </record>
 
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-
     <record model="ir.ui.menu" id="menu_definitions">
         <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
     </record>
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index 7d4443a3cce..4900834f7b0 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -39,7 +39,6 @@ It adds sales name and sales Reference on production order.
     'depends': ['mrp', 'sale'],
     'init_xml': [],
     'update_xml': [
-        'security/sale_mrp_security.xml',
         'security/ir.model.access.csv',
         'sale_mrp_view.xml',
     ],
diff --git a/addons/sale_mrp/security/sale_mrp_security.xml b/addons/sale_mrp/security/sale_mrp_security.xml
deleted file mode 100644
index 7b5d00c55fc..00000000000
--- a/addons/sale_mrp/security/sale_mrp_security.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="0">
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-    
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
-    </record>
-
-</data>
-</openerp>