pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] delivery: rename 'Delivery Method' by 'Shipping Method'

Browse Source 
To be consistent with sale orders

Task : 1942231

closes odoo/odoo#31339

Signed-off-by: Simon Lejeune (sle) <sle@openerp.com>
This commit is contained in:
William Henrotin
2019-04-02 08:33:17 +00:00
parent b57a8051f2
commit 600072d8d4
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/delivery/models/delivery_carrier.py
+1 -1
View File
@@ -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
addons/delivery/views/delivery_view.xml
+1 -1
View File
@@ -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>
addons/delivery/views/res_config_settings_views.xml
+1 -1
View File
@@ -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>
addons/website_sale_delivery/views/res_config_settings_views.xml
+6 -6
View File
@@ -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>
addons/website_sale_delivery/views/website_sale_delivery_views.xml
+1 -1
View File
@@ -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>