From 787c165eb5c5a561bce6c16d7d69a625f2a7a9a8 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 28 Sep 2012 15:07:59 +0530
Subject: [PATCH] [IMP] Sale : Moved field group_sale_delivery_address in
 sale_stock configuration

bzr revid: rpr@tinyerp.com-20120928093759-6wkr6mwns2p8h9ic
---
 addons/sale/res_config.py             | 3 ---
 addons/sale/res_config_view.xml       | 4 ----
 addons/sale_stock/res_config.py       | 3 +++
 addons/sale_stock/res_config_view.xml | 6 ++++++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 843e1fd3343..814d473a1a2 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -48,9 +48,6 @@ class sale_configuration(osv.osv_memory):
         'group_uom':fields.boolean("Allow using different units of measures",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
-        'group_sale_delivery_address': fields.boolean("Allow a different address for delivery and invoicing ",
-            implied_group='sale.group_delivery_invoice_address',
-            help="Allows you to specify different delivery and invoice addresses on a sale order."),
         'group_discount_per_so_line': fields.boolean("Allow setting a discount on the sale order lines",
             implied_group='sale.group_discount_per_so_line',
             help="Allows you to apply some discount per sale order line."),
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 10b8d82b53a..daf396d302b 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -33,10 +33,6 @@
                     </group>
                 </div>
                 <div name="Customer Features" position="inside">
-                    <div>
-                        <field name="group_sale_delivery_address" class="oe_inline"/>
-                        <label for="group_sale_delivery_address"/>
-                    </div>
                     <div>
                         <field name="group_sale_pricelist" class="oe_inline"/>
                         <label for="group_sale_pricelist"/>
diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py
index 22b47833190..43e1cfc6778 100644
--- a/addons/sale_stock/res_config.py
+++ b/addons/sale_stock/res_config.py
@@ -27,6 +27,9 @@ class sale_configuration(osv.osv_memory):
     _inherit = 'sale.config.settings'
 
     _columns = {
+        'group_sale_delivery_address': fields.boolean("Allow a different address for delivery and invoicing ",
+            implied_group='sale.group_delivery_invoice_address',
+            help="Allows you to specify different delivery and invoice addresses on a sale order."),
         'group_invoice_deli_orders': fields.boolean('Generate invoices after and based on delivery orders',
             implied_group='sale_stock.group_invoice_deli_orders',
             help="To allow your salesman to make invoices for Delivery Orders using the menu 'Deliveries to Invoice'."),
diff --git a/addons/sale_stock/res_config_view.xml b/addons/sale_stock/res_config_view.xml
index dc0edef4dbf..aa15be1d090 100644
--- a/addons/sale_stock/res_config_view.xml
+++ b/addons/sale_stock/res_config_view.xml
@@ -9,6 +9,12 @@
              <field name="inherit_id" ref="sale.view_sales_config"/>
              <field name="arch" type="xml">
                  <data>
+                     <xpath expr="//div[@name='Customer Features']" position="inside">
+                         <div>
+                              <field name="group_sale_delivery_address" class="oe_inline"/>
+                              <label for="group_sale_delivery_address"/>
+                         </div>
+                     </xpath>
                      <xpath expr="//div[@name='group_invoice_so_lines']" position="replace">
                          <div>
                              <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>