diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py index 66a1f38f86f..f36d0508227 100644 --- a/addons/point_of_sale/models/pos_order.py +++ b/addons/point_of_sale/models/pos_order.py @@ -226,7 +226,8 @@ class PosOrder(models.Model): readonly=True) config_id = fields.Many2one('pos.config', related='session_id.config_id', string="Point of Sale", readonly=False) currency_id = fields.Many2one('res.currency', related='config_id.currency_id', string="Currency") - currency_rate = fields.Float("Currency Rate", compute='_compute_currency_rate', compute_sudo=True, store=True, readonly=True, help='The rate of the currency to the currency of rate 1 applicable at the date of the order') + currency_rate = fields.Float("Currency Rate", compute='_compute_currency_rate', compute_sudo=True, store=True, readonly=True, + help='The rate of the currency to the currency of rate applicable at the date of the order') invoice_group = fields.Boolean(related="config_id.module_account", readonly=False) state = fields.Selection( diff --git a/addons/pos_sale/models/pos_order.py b/addons/pos_sale/models/pos_order.py index d3dfe97b8cf..85feef93630 100644 --- a/addons/pos_sale/models/pos_order.py +++ b/addons/pos_sale/models/pos_order.py @@ -7,7 +7,7 @@ from odoo import api, fields, models class PosOrder(models.Model): _inherit = 'pos.order' - currency_rate = fields.Float("Currency Rate", compute='_compute_currency_rate', store=True, digits=(12, 6), readonly=True, help='The rate of the currency to the currency of rate applicable at the date of the order') + currency_rate = fields.Float(compute='_compute_currency_rate', store=True, digits=(12, 6), readonly=True) crm_team_id = fields.Many2one('crm.team', string="Sales Team") @api.model diff --git a/addons/sale/models/res_config_settings.py b/addons/sale/models/res_config_settings.py index 80f40886df8..33d7d343d85 100644 --- a/addons/sale/models/res_config_settings.py +++ b/addons/sale/models/res_config_settings.py @@ -35,8 +35,8 @@ class ResConfigSettings(models.TransientModel): ('b2c', 'Free sign up'), ], string='Customer Account', default='b2b', config_parameter='auth_signup.invitation_scope') - module_delivery = fields.Boolean("Shipping Costs") - module_delivery_dhl = fields.Boolean("DHL Connector") + module_delivery = fields.Boolean("Delivery Methods") + module_delivery_dhl = fields.Boolean("DHL USA Connector") module_delivery_fedex = fields.Boolean("FedEx Connector") module_delivery_ups = fields.Boolean("UPS Connector") module_delivery_usps = fields.Boolean("USPS Connector") diff --git a/addons/stock/models/res_config_settings.py b/addons/stock/models/res_config_settings.py index 15d2b4fb2c8..8feb5c42831 100644 --- a/addons/stock/models/res_config_settings.py +++ b/addons/stock/models/res_config_settings.py @@ -33,12 +33,12 @@ class ResConfigSettings(models.TransientModel): stock_mail_confirmation_template_id = fields.Many2one(related='company_id.stock_mail_confirmation_template_id', readonly=False) module_stock_sms = fields.Boolean("SMS Confirmation") module_delivery = fields.Boolean("Delivery Methods") - module_delivery_dhl = fields.Boolean("DHL USA") - module_delivery_fedex = fields.Boolean("FedEx") - module_delivery_ups = fields.Boolean("UPS") - module_delivery_usps = fields.Boolean("USPS") - module_delivery_bpost = fields.Boolean("bpost") - module_delivery_easypost = fields.Boolean("Easypost") + module_delivery_dhl = fields.Boolean("DHL USA Connector") + module_delivery_fedex = fields.Boolean("FedEx Connector") + module_delivery_ups = fields.Boolean("UPS Connector") + module_delivery_usps = fields.Boolean("USPS Connector") + module_delivery_bpost = fields.Boolean("bpost Connector") + module_delivery_easypost = fields.Boolean("Easypost Connector") group_stock_multi_locations = fields.Boolean('Storage Locations', implied_group='stock.group_stock_multi_locations', help="Store products in specific locations of your warehouse (e.g. bins, racks) and to track inventory accordingly.") group_stock_multi_warehouses = fields.Boolean('Multi-Warehouses', implied_group='stock.group_stock_multi_warehouses')