From 075cafa828f2375846b3e2d03f0eed7c49a034f7 Mon Sep 17 00:00:00 2001
From: jem-odoo <jem@openerp.com>
Date: Thu, 24 May 2018 14:27:12 +0200
Subject: [PATCH] [IMP] purchase: move settings for purchase requisition

purchase_requisition install stock, but when doing services you might
still want the option. This option was only display when stock
is installed. This commit changes this to make it visible when
purchase is installed.
The option is better visible and installing a new apps, then
hidden (or difficult to find).
---
 addons/purchase/models/res_config_settings.py    |  1 +
 .../purchase/views/res_config_settings_views.xml | 14 ++++++++++++++
 .../purchase_stock/models/res_config_settings.py |  1 -
 .../views/res_config_settings_views.xml          | 16 ----------------
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/addons/purchase/models/res_config_settings.py b/addons/purchase/models/res_config_settings.py
index 46ad2744143..d8678698ed2 100644
--- a/addons/purchase/models/res_config_settings.py
+++ b/addons/purchase/models/res_config_settings.py
@@ -24,6 +24,7 @@ class ResConfigSettings(models.TransientModel):
     group_manage_vendor_price = fields.Boolean("Vendor Pricelists",
         implied_group="purchase.group_manage_vendor_price")
     module_account_3way_match = fields.Boolean("3-way matching: purchases, receptions and bills")
+    module_purchase_requisition = fields.Boolean("Purchase Agreements")
     po_lead = fields.Float(related='company_id.po_lead')
     use_po_lead = fields.Boolean(
         string="Security Lead Time for Purchase",
diff --git a/addons/purchase/views/res_config_settings_views.xml b/addons/purchase/views/res_config_settings_views.xml
index f9fb35c8969..e702ee0d910 100644
--- a/addons/purchase/views/res_config_settings_views.xml
+++ b/addons/purchase/views/res_config_settings_views.xml
@@ -54,6 +54,20 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="col-xs-12 col-md-6 o_setting_box" title="Calls for tenders are used when you want to generate requests for quotations to several vendors for a given set of products. You can configure per product if you directly do a Request for Quotation to one vendor or if you want a Call for Tenders to compare offers from several vendors.">
+                            <div class="o_setting_left_pane">
+                                <field name="module_purchase_requisition"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="module_purchase_requisition"/>
+                                <div class="text-muted">
+                                    Manage your purchase agreements (call for tenders, blanket orders)
+                                </div>
+                                <div class="content-group" attrs="{'invisible': [('module_purchase_requisition', '=', False)]}">
+                                    <div id="use_purchase_requisition"/>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                     <h2>Invoicing</h2>
                     <div class="row mt16 o_settings_container">
diff --git a/addons/purchase_stock/models/res_config_settings.py b/addons/purchase_stock/models/res_config_settings.py
index d14045c2173..b25b6eb8e90 100644
--- a/addons/purchase_stock/models/res_config_settings.py
+++ b/addons/purchase_stock/models/res_config_settings.py
@@ -7,7 +7,6 @@ from odoo import api, fields, models
 class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
-    module_purchase_requisition = fields.Boolean("Purchase Agreements")
     module_stock_dropshipping = fields.Boolean("Dropshipping")
 
     is_installed_sale = fields.Boolean(string="Is the Sale Module Installed")
diff --git a/addons/purchase_stock/views/res_config_settings_views.xml b/addons/purchase_stock/views/res_config_settings_views.xml
index 2624b5c1a04..b49ad74900d 100644
--- a/addons/purchase_stock/views/res_config_settings_views.xml
+++ b/addons/purchase_stock/views/res_config_settings_views.xml
@@ -24,22 +24,6 @@
 					</div>
 				</div>
 			</xpath>
-			<xpath expr="//div[@name='purchase_setting_container']" position="inside">
-				<div class="col-xs-12 col-md-6 o_setting_box" title="Calls for tenders are used when you want to generate requests for quotations to several vendors for a given set of products. You can configure per product if you directly do a Request for Quotation to one vendor or if you want a Call for Tenders to compare offers from several vendors.">
-					<div class="o_setting_left_pane">
-						<field name="module_purchase_requisition"/>
-					</div>
-					<div class="o_setting_right_pane">
-						<label for="module_purchase_requisition"/>
-						<div class="text-muted">
-							Manage your purchase agreements (call for tenders, blanket orders)
-						</div>
-						<div class="content-group" attrs="{'invisible': [('module_purchase_requisition', '=', False)]}">
-							<div id="use_purchase_requisition"/>
-						</div>
-					</div>
-				</div>
-			</xpath>
 		</field>
 	</record>