From 600072d8d45b20e83e382bd5bb15717b402b1175 Mon Sep 17 00:00:00 2001
From: William Henrotin <whe@odoo.com>
Date: Tue, 2 Apr 2019 07:39:26 +0000
Subject: [PATCH] [IMP] delivery: rename 'Delivery Method' by 'Shipping Method'

To be consistent with sale orders

Task : 1942231

closes odoo/odoo#31339

Signed-off-by: Simon Lejeune (sle) <sle@openerp.com>
---
 addons/delivery/models/delivery_carrier.py           |  2 +-
 addons/delivery/views/delivery_view.xml              |  2 +-
 addons/delivery/views/res_config_settings_views.xml  |  2 +-
 .../views/res_config_settings_views.xml              | 12 ++++++------
 .../views/website_sale_delivery_views.xml            |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/delivery/models/delivery_carrier.py b/addons/delivery/models/delivery_carrier.py
index f445072e2b8..5582828920d 100644
--- a/addons/delivery/models/delivery_carrier.py
+++ b/addons/delivery/models/delivery_carrier.py
@@ -11,7 +11,7 @@ _logger = logging.getLogger(__name__)
 
 class DeliveryCarrier(models.Model):
     _name = 'delivery.carrier'
-    _description = "Delivery Methods"
+    _description = "Shipping Methods"
     _order = 'sequence, id'
 
     ''' A Shipping Provider
diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index 85075d13ab4..04da579f079 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -139,7 +139,7 @@
         </record>
 
         <record id="action_delivery_carrier_form" model="ir.actions.act_window">
-            <field name="name">Delivery Methods</field>
+            <field name="name">Shipping Methods</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">delivery.carrier</field>
             <field name="view_type">form</field>
diff --git a/addons/delivery/views/res_config_settings_views.xml b/addons/delivery/views/res_config_settings_views.xml
index fa951a8e976..a6b2abc2f05 100644
--- a/addons/delivery/views/res_config_settings_views.xml
+++ b/addons/delivery/views/res_config_settings_views.xml
@@ -9,7 +9,7 @@
             <xpath expr="//div[@id='delivery_carrier']" position="after">
                 <div class="content-group">
                     <div class="mt16" attrs="{'invisible': [('module_delivery','=',False)]}">
-                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="Delivery Methods" class="btn-link"/>
+                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="Shipping Methods" class="btn-link"/>
                     </div>
                  </div>
              </xpath>
diff --git a/addons/website_sale_delivery/views/res_config_settings_views.xml b/addons/website_sale_delivery/views/res_config_settings_views.xml
index 0802d3769e0..da5aaef3e4e 100644
--- a/addons/website_sale_delivery/views/res_config_settings_views.xml
+++ b/addons/website_sale_delivery/views/res_config_settings_views.xml
@@ -8,42 +8,42 @@
             <div id="msg_delivery_method_setting" position="after">
                 <div class="content-group" attrs="{'invisible': [('module_website_sale_delivery', '=', False)]}">
                     <div class="mt16">
-                        <button type="action" name="%(delivery.action_delivery_carrier_form)d" string="Delivery Methods" class="btn-link" icon="fa-arrow-right"/>
+                        <button type="action" name="%(delivery.action_delivery_carrier_form)d" string="Shipping Methods" class="btn-link" icon="fa-arrow-right"/>
                     </div>
                 </div>
             </div>
             <div id="website_delivery_dhl" position="after">
                 <div class="content-group">
                     <div class="mt16" attrs="{'invisible': [('module_delivery_dhl', '=', False)]}">
-                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="DHL Delivery Methods" class="btn-link" context="{'search_default_delivery_type': 'dhl'}"/>
+                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="DHL Shipping Methods" class="btn-link" context="{'search_default_delivery_type': 'dhl'}"/>
                     </div>
                 </div>
             </div>
             <div id="website_delivery_fedex" position="after">
                 <div class="content-group">
                     <div class="mt16" attrs="{'invisible': [('module_delivery_fedex', '=', False)]}">
-                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="FedEx Delivery Methods" class="btn-link" context="{'search_default_delivery_type': 'fedex'}"/>
+                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="FedEx Shipping Methods" class="btn-link" context="{'search_default_delivery_type': 'fedex'}"/>
                     </div>
                 </div>
             </div>
             <div id="website_delivery_usps" position="after">
                 <div class="content-group">
                     <div class="mt16" attrs="{'invisible': [('module_delivery_usps', '=', False)]}">
-                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="USPS Delivery Methods" class="btn-link" context="{'search_default_delivery_type': 'usps'}"/>
+                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="USPS Shipping Methods" class="btn-link" context="{'search_default_delivery_type': 'usps'}"/>
                     </div>
                 </div>
             </div>
             <div id="website_delivery_bpost" position="after">
                 <div class="content-group">
                     <div class="mt16" attrs="{'invisible': [('module_delivery_bpost', '=', False)]}">
-                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="bpost Delivery Methods" class="btn-link" context="{'search_default_delivery_type': 'bpost'}"/>
+                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="bpost Shipping Methods" class="btn-link" context="{'search_default_delivery_type': 'bpost'}"/>
                     </div>
                 </div>
             </div>
             <div id="website_delivery_easypost" position="after">
                 <div class="content-group">
                     <div class="mt16" attrs="{'invisible': [('module_delivery_easypost', '=', False)]}">
-                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="Easypost Delivery Methods" class="btn-link" context="{'search_default_delivery_type': 'easypost'}"/>
+                        <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="Easypost Shipping Methods" class="btn-link" context="{'search_default_delivery_type': 'easypost'}"/>
                     </div>
                 </div>
             </div>
diff --git a/addons/website_sale_delivery/views/website_sale_delivery_views.xml b/addons/website_sale_delivery/views/website_sale_delivery_views.xml
index bf230100925..6a6662ca0e6 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery_views.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery_views.xml
@@ -48,7 +48,7 @@
     <menuitem
         id="menu_ecommerce_delivery"
         parent="website_sale.menu_ecommerce_settings"
-        name="Delivery Methods"
+        name="Shipping Methods"
         action="delivery.action_delivery_carrier_form"/>
 
 </odoo>