Skip to content
Snippets Groups Projects
Commit a1ea321f authored by Martin Trigaux's avatar Martin Trigaux
Browse files

[FIX] *: unify field labels


Avoid double definition of the same field with different string or
help parameters. These parameters are translatable. If one has a
different value depending of the installed module, it is not possible
to properly translate it.
This problem is similar as the menu renaming debate at
odoo/enterprise@cfd4da43ee974

closes odoo/odoo#42777

Related: odoo/enterprise#7623
Signed-off-by: default avatarMartin Trigaux (mat) <mat@odoo.com>
parent 5baa00e8
Branches
Tags
No related merge requests found
......@@ -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(
......
......@@ -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
......
......@@ -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")
......
......@@ -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')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment