From aed7afe1d174ce29821513383b226b370c4fe5c8 Mon Sep 17 00:00:00 2001
From: Gaurav Panchal <gan@openerp.com>
Date: Wed, 12 Aug 2015 09:46:17 +0200
Subject: [PATCH] [IMP] purchase_requisition: groups and config update

Remove custom Purchase Requisition category, as well as purchase_requisition
user and manager groups. Those groups are not used except in one view as
purchase groups are already used for access rights. We now use purchase user
and manager groups instead of the purchase requisition groups.
---
 .../purchase_requisition_demo.xml             |  2 +-
 .../purchase_requisition_view.xml             |  2 +-
 .../security/purchase_tender.xml              | 22 -------------------
 .../test/purchase_requisition_users.yml       |  4 ++--
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml
index 22c090fe44a..1702ab079de 100644
--- a/addons/purchase_requisition/purchase_requisition_demo.xml
+++ b/addons/purchase_requisition/purchase_requisition_demo.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
 
         <record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('group_purchase_requisition_user'))]" name="groups_id"/>
+            <field eval="[(4, ref('purchase.group_purchase_user'))]" name="groups_id"/>
         </record>
 
         <record id="product.product_product_13" model="product.product">
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index f1018eb3c09..d73f50f095b 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -56,7 +56,7 @@
                 </div>
                 <group>
                     <group>
-                        <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'purchase_requisition.group_purchase_requisition_user', 'purchase.group_purchase_user', 'account.group_account_invoice']}" attrs="{'readonly': [('state','not in',('draft'))]}"/>
+                        <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'purchase.group_purchase_user', 'account.group_account_invoice']}" attrs="{'readonly': [('state','not in',('draft'))]}"/>
                         <field name="exclusive" attrs="{'readonly': [('state','not in',('draft'))]}"/>
                         <field name="account_analytic_id" colspan="2" groups="purchase.group_analytic_accounting" attrs="{'readonly': [('state','not in',('draft'))]}"/>
                         <field name="multiple_rfq_per_supplier" attrs="{'readonly': [('state','not in',('draft'))]}"/>
diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
index f365643a8fe..d778ec8a02a 100644
--- a/addons/purchase_requisition/security/purchase_tender.xml
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -1,27 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data noupdate="0">
-
-    <record model="ir.module.category" id="module_category_purchase_requisition">
-        <field name="name">Purchase Requisition</field>
-        <field name="parent_id" ref="base.module_category_purchase_management"/>
-        <field name="sequence">9</field>
-    </record>
-
-    <record id="group_purchase_requisition_user" model="res.groups">
-        <field name="name">User</field>
-        <field name="implied_ids" eval="[(4, ref('purchase.group_purchase_user'))]"/>
-        <field name="category_id" ref="module_category_purchase_requisition"/>
-    </record>
-
-    <record id="group_purchase_requisition_manager" model="res.groups">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="module_category_purchase_requisition"/>
-        <field name="implied_ids" eval="[(4, ref('group_purchase_requisition_user'))]"/>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
-
-</data>
 <data noupdate="1">
 
     <record model="ir.rule" id="purchase_requisition_comp_rule">
diff --git a/addons/purchase_requisition/test/purchase_requisition_users.yml b/addons/purchase_requisition/test/purchase_requisition_users.yml
index 61f9c0952cb..7c707ffa493 100644
--- a/addons/purchase_requisition/test/purchase_requisition_users.yml
+++ b/addons/purchase_requisition/test/purchase_requisition_users.yml
@@ -11,7 +11,7 @@
 -
   !record {model: res.users, id: res_users_purchase_requisition_manager}:
     groups_id:
-      - purchase_requisition.group_purchase_requisition_manager
+      - purchase.group_purchase_manager
 -
   Create a user as 'Purchase Requisition User'
 -
@@ -25,4 +25,4 @@
 -
   !record {model: res.users, id: res_users_purchase_requisition_user}:
     groups_id:
-      - purchase_requisition.group_purchase_requisition_user
+      - purchase.group_purchase_user