[IMP] uom: Remove parentheses on uom names

Purpose
=======

Parentheses in the label of units of measure sometimes make
reading needlessly uncomfortable.

Specification
=============

Remove parentheses in the name of every standard uom.uom and hardcoded
occurence on views/field names.

TaskID: 2030444

closes odoo/odoo#34492

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>

24 files changed, 64 insertions, 63 deletions

diff --git a/addons/account/models/account_payment_term.py b/addons/account/models/account_payment_term.py
index 9fe71bad31c..ff757ae9c78 100644
--- a/addons/account/models/account_payment_term.py
+++ b/addons/account/models/account_payment_term.py
@@ -93,7 +93,7 @@ class AccountPaymentTermLine(models.Model):
     days = fields.Integer(string='Number of Days', required=True, default=0)
     day_of_the_month = fields.Integer(string='Day of the month', help="Day of the month on which the invoice must come to its term. If zero or negative, this value will be ignored, and no specific day will be set. If greater than the last day of a month, this number will instead select the last day of this month.")
     option = fields.Selection([
-            ('day_after_invoice_date', "day(s) after the invoice date"),
+            ('day_after_invoice_date', "days after the invoice date"),
             ('day_following_month', "of the following month"),
             ('day_current_month', "of the current month"),
         ],
diff --git a/addons/base_import/static/csv/o2m_purchase_order_lines.csv b/addons/base_import/static/csv/o2m_purchase_order_lines.csv
index 744f13f8fab..100f93e47fc 100644
--- a/addons/base_import/static/csv/o2m_purchase_order_lines.csv
+++ b/addons/base_import/static/csv/o2m_purchase_order_lines.csv
@@ -1,6 +1,6 @@
 "Order Date","Order Reference",Vendor,"Order Lines / Product","Order Lines / Description","Order Lines / Quantity","Order Lines / Product Unit of Measure","Order Lines / Unit Price","Order Lines / Scheduled Date"
-2016-12-15,PO00008,ASUSTeK,ADPT,ADPT,20.0,"Unit(s)",13.0,2016-12-15
-,,,CARD,CARD,30,"Unit(s)",876.0,2016-12-15
-,,,C-Case,C-Case,40,"Unit(s)",20.0,2016-12-15
-2016-12-15,PO00009,Camptocamp,CD,CD,5,"Unit(s)",18.4,2016-12-15
-,,,CPUa8,CPUa8,15,"Unit(s)",1910.0,2016-12-15
+2016-12-15,PO00008,ASUSTeK,ADPT,ADPT,20.0,"Units",13.0,2016-12-15
+,,,CARD,CARD,30,"Units",876.0,2016-12-15
+,,,C-Case,C-Case,40,"Units",20.0,2016-12-15
+2016-12-15,PO00009,Camptocamp,CD,CD,5,"Units",18.4,2016-12-15
+,,,CPUa8,CPUa8,15,"Units",1910.0,2016-12-15
diff --git a/addons/calendar/data/calendar_data.xml b/addons/calendar/data/calendar_data.xml
index 5485326fd14..5c9d3daf616 100644
--- a/addons/calendar/data/calendar_data.xml
+++ b/addons/calendar/data/calendar_data.xml
@@ -8,43 +8,43 @@
             <field name="default" eval="False"/>
         </record>
         <record id="alarm_notif_1" model="calendar.alarm">
-            <field name="name">Notification - 15 Minute(s)</field>
+            <field name="name">Notification - 15 Minutes</field>
             <field name="duration" eval="15" />
             <field name="interval">minutes</field>
             <field name="alarm_type">notification</field>
         </record>
         <record id="alarm_notif_2" model="calendar.alarm">
-            <field name="name">Notification - 30 Minute(s)</field>
+            <field name="name">Notification - 30 Minutes</field>
             <field name="duration" eval="30" />
             <field name="interval">minutes</field>
             <field name="alarm_type">notification</field>
         </record>
         <record id="alarm_notif_3" model="calendar.alarm">
-            <field name="name">Notification - 1 Hour(s)</field>
+            <field name="name">Notification - 1 Hours</field>
             <field name="duration" eval="1" />
             <field name="interval">hours</field>
             <field name="alarm_type">notification</field>
         </record>
         <record id="alarm_notif_4" model="calendar.alarm">
-            <field name="name">Notification - 2 Hour(s)</field>
+            <field name="name">Notification - 2 Hours</field>
             <field name="duration" eval="2" />
             <field name="interval">hours</field>
             <field name="alarm_type">notification</field>
         </record>
         <record id="alarm_notif_5" model="calendar.alarm">
-            <field name="name">Notification - 1 Day(s)</field>
+            <field name="name">Notification - 1 Days</field>
             <field name="duration" eval="1" />
             <field name="interval">days</field>
             <field name="alarm_type">notification</field>
         </record>
         <record id="alarm_mail_1" model="calendar.alarm">
-            <field name="name">Email - 3 Hour(s)</field>
+            <field name="name">Email - 3 Hours</field>
             <field name="duration" eval="3" />
             <field name="interval">hours</field>
             <field name="alarm_type">email</field>
         </record>
         <record id="alarm_mail_2" model="calendar.alarm">
-            <field name="name">Email - 6 Hour(s)</field>
+            <field name="name">Email - 6 Hours</field>
             <field name="duration" eval="6" />
             <field name="interval">hours</field>
             <field name="alarm_type">email</field>
diff --git a/addons/calendar/models/calendar.py b/addons/calendar/models/calendar.py
index ebe10ac7e32..7355600e601 100644
--- a/addons/calendar/models/calendar.py
+++ b/addons/calendar/models/calendar.py
@@ -492,7 +492,7 @@ class Alarm(models.Model):
             else:
                 alarm.duration_minutes = 0
 
-    _interval_selection = {'minutes': 'Minute(s)', 'hours': 'Hour(s)', 'days': 'Day(s)'}
+    _interval_selection = {'minutes': 'Minutes', 'hours': 'Hours', 'days': 'Days'}
 
     name = fields.Char('Name', translate=True, required=True)
     alarm_type = fields.Selection([('notification', 'Notification'), ('email', 'Email')], string='Type', required=True, default='email', oldname='type')
@@ -807,10 +807,10 @@ class Meeting(models.Model):
     # RECURRENCE FIELD
     rrule = fields.Char('Recurrent Rule', compute='_compute_rrule', inverse='_inverse_rrule', store=True)
     rrule_type = fields.Selection([
-        ('daily', 'Day(s)'),
-        ('weekly', 'Week(s)'),
-        ('monthly', 'Month(s)'),
-        ('yearly', 'Year(s)')
+        ('daily', 'Days'),
+        ('weekly', 'Weeks'),
+        ('monthly', 'Months'),
+        ('yearly', 'Years')
     ], string='Recurrence', states={'done': [('readonly', True)]}, help="Let the event automatically repeat at that interval")
     recurrency = fields.Boolean('Recurrent', help="Recurrent Meeting")
     recurrent_id = fields.Integer('Recurrent ID')
diff --git a/addons/crm/models/crm_lead.py b/addons/crm/models/crm_lead.py
index fab4eef4d45..290068944e9 100644
--- a/addons/crm/models/crm_lead.py
+++ b/addons/crm/models/crm_lead.py
@@ -1071,7 +1071,7 @@ class Lead(models.Model):
         meet_date = fields.Datetime.from_string(meeting_date)
         meeting_usertime = fields.Datetime.to_string(fields.Datetime.context_timestamp(self, meet_date))
         html_time = "<time datetime='%s+00:00'>%s</time>" % (meeting_date, meeting_usertime)
-        message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (html_time, meeting_subject, duration)
+        message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hours") % (html_time, meeting_subject, duration)
         return self.message_post(body=message)
 
     # ----------------------------------------
diff --git a/addons/event/models/event_mail.py b/addons/event/models/event_mail.py
index 43d16c8cb4a..eb423012af5 100644
--- a/addons/event/models/event_mail.py
+++ b/addons/event/models/event_mail.py
@@ -32,8 +32,8 @@ class EventTypeMail(models.Model):
     interval_nbr = fields.Integer('Interval', default=1)
     interval_unit = fields.Selection([
         ('now', 'Immediately'),
-        ('hours', 'Hour(s)'), ('days', 'Day(s)'),
-        ('weeks', 'Week(s)'), ('months', 'Month(s)')],
+        ('hours', 'Hours'), ('days', 'Days'),
+        ('weeks', 'Weeks'), ('months', 'Months')],
         string='Unit', default='hours', required=True)
     interval_type = fields.Selection([
         ('after_sub', 'After each registration'),
@@ -59,8 +59,8 @@ class EventMailScheduler(models.Model):
     interval_nbr = fields.Integer('Interval', default=1)
     interval_unit = fields.Selection([
         ('now', 'Immediately'),
-        ('hours', 'Hour(s)'), ('days', 'Day(s)'),
-        ('weeks', 'Week(s)'), ('months', 'Month(s)')],
+        ('hours', 'Hours'), ('days', 'Days'),
+        ('weeks', 'Weeks'), ('months', 'Months')],
         string='Unit', default='hours', required=True)
     interval_type = fields.Selection([
         ('after_sub', 'After each registration'),
diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py
index ec194dcb1b3..4685e543a0c 100644
--- a/addons/hr_holidays/models/hr_leave.py
+++ b/addons/hr_holidays/models/hr_leave.py
@@ -431,7 +431,7 @@ class HolidaysRequest(models.Model):
                 (float_round(leave.number_of_hours_display, precision_digits=2)
                 if leave.leave_type_request_unit == 'hour'
                 else float_round(leave.number_of_days_display, precision_digits=2)),
-                _('hour(s)') if leave.leave_type_request_unit == 'hour' else _('day(s)'))
+                _('hours') if leave.leave_type_request_unit == 'hour' else _('days'))
 
     @api.multi
     @api.depends('state', 'employee_id', 'department_id')
@@ -507,9 +507,9 @@ class HolidaysRequest(models.Model):
         for leave in self:
             if self.env.context.get('short_name'):
                 if leave.leave_type_request_unit == 'hour':
-                    res.append((leave.id, _("%s : %.2f hour(s)") % (leave.name or leave.holiday_status_id.name, leave.number_of_hours_display)))
+                    res.append((leave.id, _("%s : %.2f hours") % (leave.name or leave.holiday_status_id.name, leave.number_of_hours_display)))
                 else:
-                    res.append((leave.id, _("%s : %.2f day(s)") % (leave.name or leave.holiday_status_id.name, leave.number_of_days)))
+                    res.append((leave.id, _("%s : %.2f days") % (leave.name or leave.holiday_status_id.name, leave.number_of_days)))
             else:
                 if leave.holiday_type == 'company':
                     target = leave.mode_company_id.name
@@ -522,13 +522,13 @@ class HolidaysRequest(models.Model):
                 if leave.leave_type_request_unit == 'hour':
                     res.append(
                         (leave.id,
-                        _("%s on %s : %.2f hour(s)") %
+                        _("%s on %s : %.2f hours") %
                         (target, leave.holiday_status_id.name, leave.number_of_hours_display))
                     )
                 else:
                     res.append(
                         (leave.id,
-                        _("%s on %s: %.2f day(s)") %
+                        _("%s on %s: %.2f days") %
                         (target, leave.holiday_status_id.name, leave.number_of_days))
                     )
         return res
diff --git a/addons/hr_holidays/models/hr_leave_allocation.py b/addons/hr_holidays/models/hr_leave_allocation.py
index ee6b48266d0..6b87fb8c8f6 100644
--- a/addons/hr_holidays/models/hr_leave_allocation.py
+++ b/addons/hr_holidays/models/hr_leave_allocation.py
@@ -118,13 +118,13 @@ class HolidaysAllocation(models.Model):
     number_per_interval = fields.Float("Number of unit per interval", readonly=True, states={'draft': [('readonly', False)], 'confirm': [('readonly', False)]}, default=1)
     interval_number = fields.Integer("Number of unit between two intervals", readonly=True, states={'draft': [('readonly', False)], 'confirm': [('readonly', False)]}, default=1)
     unit_per_interval = fields.Selection([
-        ('hours', 'Hour(s)'),
-        ('days', 'Day(s)')
+        ('hours', 'Hours'),
+        ('days', 'Days')
         ], string="Unit of time added at each interval", default='hours', readonly=True, states={'draft': [('readonly', False)], 'confirm': [('readonly', False)]})
     interval_unit = fields.Selection([
-        ('weeks', 'Week(s)'),
-        ('months', 'Month(s)'),
-        ('years', 'Year(s)')
+        ('weeks', 'Weeks'),
+        ('months', 'Months'),
+        ('years', 'Years')
         ], string="Unit of time between two intervals", default='weeks', readonly=True, states={'draft': [('readonly', False)], 'confirm': [('readonly', False)]})
     nextcall = fields.Date("Date of the next accrual allocation", default=False, readonly=True)
     max_leaves = fields.Float(compute='_compute_leaves')
diff --git a/addons/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py
index 4ae5ad004f8..ab1507d5a75 100644
--- a/addons/hw_escpos/controllers/main.py
+++ b/addons/hw_escpos/controllers/main.py
@@ -308,13 +308,13 @@ class EscposDriver(Thread):
         eprint.set(align='center')
         for line in receipt['orderlines']:
             pricestr = price(line['price_display'])
-            if line['discount'] == 0 and line['unit_name'] == 'Unit(s)' and line['quantity'] == 1:
+            if line['discount'] == 0 and line['unit_name'] == 'Units' and line['quantity'] == 1:
                 eprint.text(printline(line['product_name'],pricestr,ratio=0.6))
             else:
                 eprint.text(printline(line['product_name'],ratio=0.6))
                 if line['discount'] != 0:
                     eprint.text(printline('Discount: '+str(line['discount'])+'%', ratio=0.6, indent=2))
-                if line['unit_name'] == 'Unit(s)':
+                if line['unit_name'] == 'Units':
                     eprint.text( printline( quantity(line['quantity']) + ' x ' + price(line['price']), pricestr, ratio=0.6, indent=2))
                 else:
                     eprint.text( printline( quantity(line['quantity']) + line['unit_name'] + ' x ' + price(line['price']), pricestr, ratio=0.6, indent=2))
diff --git a/addons/mrp/models/mrp_workcenter.py b/addons/mrp/models/mrp_workcenter.py
index 5679ccf6733..44d48928fea 100644
--- a/addons/mrp/models/mrp_workcenter.py
+++ b/addons/mrp/models/mrp_workcenter.py
@@ -48,10 +48,10 @@ class MrpWorkcenter(models.Model):
         ('done', 'In Progress')], 'Workcenter Status', compute="_compute_working_state", store=True)
     blocked_time = fields.Float(
         'Blocked Time', compute='_compute_blocked_time',
-        help='Blocked hour(s) over the last month', digits=(16, 2))
+        help='Blocked hours over the last month', digits=(16, 2))
     productive_time = fields.Float(
         'Productive Time', compute='_compute_productive_time',
-        help='Productive hour(s) over the last month', digits=(16, 2))
+        help='Productive hours over the last month', digits=(16, 2))
     oee = fields.Float(compute='_compute_oee', help='Overall Equipment Effectiveness, based on the last month')
     oee_target = fields.Float(string='OEE Target', help="OEE Target in percentage", default=90)
     performance = fields.Integer('Performance', compute='_compute_performance', help='Performance over the last month')
diff --git a/addons/mrp/tests/test_traceability.py b/addons/mrp/tests/test_traceability.py
index 61aaa9c045b..493ec3ba133 100644
--- a/addons/mrp/tests/test_traceability.py
+++ b/addons/mrp/tests/test_traceability.py
@@ -104,7 +104,7 @@ class TestTraceability(TestMrpCommon):
             for line in lines:
                 tracking = line['columns'][1].split(' ')[1]
                 self.assertEqual(
-                    line['columns'][-1], "1.000 Unit(s)", 'Part with tracking type "%s", should have quantity = 1' % (tracking)
+                    line['columns'][-1], "1.000 Units", 'Part with tracking type "%s", should have quantity = 1' % (tracking)
                 )
                 unfoldable = False if tracking == 'none' else True
                 self.assertEqual(
diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml
index d9a2c68d7c7..d092dbf0f6e 100644
--- a/addons/mrp/views/mrp_workcenter_views.xml
+++ b/addons/mrp/views/mrp_workcenter_views.xml
@@ -300,13 +300,13 @@
                             </button>
                             <button name="%(mrp_workcenter_productivity_report_blocked)d" type="action" class="oe_stat_button" icon="fa-bar-chart">
                                 <div class="o_field_widget o_stat_info">
-                                    <span class="o_stat_value"><field name="blocked_time" widget="statinfo" nolabel="1"/> hour(s)</span>
+                                    <span class="o_stat_value"><field name="blocked_time" widget="statinfo" nolabel="1"/> hours</span>
                                     <span class="o_stat_text">Lost</span>
                                 </div>
                             </button>
                             <button name="%(action_mrp_workcenter_load_report_graph)d" type="action" class="oe_stat_button" icon="fa-bar-chart" context="{'search_default_workcenter_id': active_id}">
                                 <div class="o_field_widget o_stat_info">
-                                    <span class="o_stat_value"><field name="workcenter_load" widget="statinfo" nolabel="1"/> minute(s)</span>
+                                    <span class="o_stat_value"><field name="workcenter_load" widget="statinfo" nolabel="1"/> minutes</span>
                                     <span class="o_stat_text">Work Center Load</span>
                                 </div>
                             </button>
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 63efb729576..9c1ecadc838 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -797,7 +797,7 @@
 
             <div class='orderlines' line-ratio='0.6'>
                 <t t-foreach='receipt.orderlines' t-as='line'>
-                    <t t-set='simple' t-value='(line.discount === 0 and line.unit_name === "Unit(s)" and line.quantity === 1 and !discount_to_show and !(line.display_discount_policy == "without_discount" &amp;&amp; line.price != line.price_lst))' />
+                    <t t-set='simple' t-value='(line.discount === 0 and line.unit_name === "Units" and line.quantity === 1 and !discount_to_show and !(line.display_discount_policy == "without_discount" &amp;&amp; line.price != line.price_lst))' />
                     <t t-if='simple'>
                         <line>
                             <left><t t-esc='line.product_name_wrapped[0]' /></left>
@@ -846,7 +846,7 @@
                                 <value t-att-value-decimals='pos.dp["Product Unit of Measure"]' value-autoint='on'>
                                     <t t-esc='line.quantity' />
                                 </value>
-                                <t t-if='line.unit_name !== "Unit(s)"'>
+                                <t t-if='line.unit_name !== "Units"'>
                                     <t t-esc='line.unit_name' />
                                 </t>
                                 x
@@ -969,7 +969,7 @@
                             <value value-decimals='2' value-autoint='on'>
                                 <t t-esc='line.quantity' />
                             </value>
-                            <t t-if='line.uom !== "Unit(s)"'>
+                            <t t-if='line.uom !== "Units"'>
                                 <t t-esc='line.uom' />
                             </t>
                         </right>
diff --git a/addons/point_of_sale/views/report_saledetails.xml b/addons/point_of_sale/views/report_saledetails.xml
index 8f4d721dc90..d2921a12060 100644
--- a/addons/point_of_sale/views/report_saledetails.xml
+++ b/addons/point_of_sale/views/report_saledetails.xml
@@ -26,7 +26,7 @@
                     <td><t t-esc="internal_reference" /><t t-esc="line['product_name']" /></td>
                     <td>
                         <t t-esc="line['quantity']" />
-                        <t t-if='line["uom"] != "Unit(s)"'>
+                        <t t-if='line["uom"] != "Units"'>
                             <t t-esc='line["uom"]' /> 
                         </t>
                     </td>
diff --git a/addons/pos_restaurant/static/src/xml/printbill.xml b/addons/pos_restaurant/static/src/xml/printbill.xml
index 4134c7acc78..97de809b4e9 100644
--- a/addons/pos_restaurant/static/src/xml/printbill.xml
+++ b/addons/pos_restaurant/static/src/xml/printbill.xml
@@ -75,7 +75,7 @@
 
             <div line-ratio='0.6'>
                 <t t-foreach='receipt.orderlines' t-as='line'>
-                    <t t-set='simple' t-value='line.discount === 0 and line.unit_name === "Unit(s)" and line.quantity === 1' />
+                    <t t-set='simple' t-value='line.discount === 0 and line.unit_name === "Units" and line.quantity === 1' />
                     <t t-if='simple'>
                         <line>
                             <left><t t-esc='line.product_name' /></left>
@@ -92,7 +92,7 @@
                                 <value value-decimals='3' value-autoint='on'>
                                     <t t-esc='line.quantity' />
                                 </value>
-                                <t t-if='line.unit_name !== "Unit(s)"'>
+                                <t t-if='line.unit_name !== "Units"'>
                                     <t t-esc='line.unit_name' />
                                 </t>
                                 x
diff --git a/addons/purchase_stock/tests/test_onchange_product.py b/addons/purchase_stock/tests/test_onchange_product.py
index fe7a239a607..74361778fd5 100644
--- a/addons/purchase_stock/tests/test_onchange_product.py
+++ b/addons/purchase_stock/tests/test_onchange_product.py
@@ -27,7 +27,7 @@ class TestOnchangeProductId(TransactionCase):
 
     def test_onchange_product_id(self):
 
-        uom_id = self.product_uom_model.search([('name', '=', 'Unit(s)')])[0]
+        uom_id = self.product_uom_model.search([('name', '=', 'Units')])[0]
 
         partner_id = self.res_partner_model.create(dict(name="George"))
         tax_include_id = self.tax_model.create(dict(name="Include tax",
diff --git a/addons/sale/tests/test_onchange.py b/addons/sale/tests/test_onchange.py
index cb3c06eaddb..5e1f39036b0 100644
--- a/addons/sale/tests/test_onchange.py
+++ b/addons/sale/tests/test_onchange.py
@@ -26,7 +26,7 @@ class TestOnchangeProductId(TransactionCase):
 
     def test_onchange_product_id(self):
 
-        uom_id = self.product_uom_model.search([('name', '=', 'Unit(s)')])[0]
+        uom_id = self.product_uom_model.search([('name', '=', 'Units')])[0]
         pricelist = self.pricelist_model.search([('name', '=', 'Public Pricelist')])[0]
 
         partner_id = self.res_partner_model.create(dict(name="George"))
diff --git a/addons/stock/models/stock_warehouse.py b/addons/stock/models/stock_warehouse.py
index 9431c879c49..f5939e7aae7 100644
--- a/addons/stock/models/stock_warehouse.py
+++ b/addons/stock/models/stock_warehouse.py
@@ -983,7 +983,7 @@ class Orderpoint(models.Model):
         'Lead Time', default=1,
         help="Number of days after the orderpoint is triggered to receive the products or to order to the vendor")
     lead_type = fields.Selection(
-        [('net', 'Day(s) to get the products'), ('supplier', 'Day(s) to purchase')], 'Lead Type',
+        [('net', 'Days to get the products'), ('supplier', 'Days to purchase')], 'Lead Type',
         required=True, default='supplier')
     allowed_location_ids = fields.One2many(comodel_name='stock.location', compute='_compute_allowed_location_ids')
 
diff --git a/addons/stock/views/stock_rule_views.xml b/addons/stock/views/stock_rule_views.xml
index 947c5181d10..aec1b35eb68 100644
--- a/addons/stock/views/stock_rule_views.xml
+++ b/addons/stock/views/stock_rule_views.xml
@@ -106,7 +106,7 @@
                                 <field name="propagate_date"/>
                                 <label for="propagate_date_minimum_delta" attrs="{'invisible': [('propagate_date', '=', False)]}"/>
                                 <div attrs="{'invisible': [('propagate_date', '=', False)]}">
-                                    <field name="propagate_date_minimum_delta" class="oe_inline"/> day(s)
+                                    <field name="propagate_date_minimum_delta" class="oe_inline"/> days
                                 </div>
                             </group>
                         </group>
diff --git a/addons/stock_landed_costs/tests/test_stock_landed_costs_rounding.py b/addons/stock_landed_costs/tests/test_stock_landed_costs_rounding.py
index 916debcf046..59f2e901781 100644
--- a/addons/stock_landed_costs/tests/test_stock_landed_costs_rounding.py
+++ b/addons/stock_landed_costs/tests/test_stock_landed_costs_rounding.py
@@ -17,7 +17,7 @@ class TestStockLandedCostsRounding(TestStockLandedCostsCommon):
         # Define undivisible units
         product_uom_unit_round_1 = self.env.ref('uom.product_uom_unit')
         product_uom_unit_round_1.write({
-            'name': 'Undivisible Unit(s)',
+            'name': 'Undivisible Units',
             'rounding': 1.0,
         })
 
diff --git a/addons/uom/data/uom_data.xml b/addons/uom/data/uom_data.xml
index e46a7de9c35..5021eb495ba 100644
--- a/addons/uom/data/uom_data.xml
+++ b/addons/uom/data/uom_data.xml
@@ -29,13 +29,13 @@
         -->
         <record id="product_uom_unit" model="uom.uom">
             <field name="category_id" ref="product_uom_categ_unit"/>
-            <field name="name">Unit(s)</field>
+            <field name="name">Units</field>
             <field name="factor" eval="1.0"/>
             <field name="rounding" eval="0.001"/>
         </record>
        <record id="product_uom_dozen" model="uom.uom">
             <field name="category_id" ref="uom.product_uom_categ_unit"/>
-            <field name="name">Dozen(s)</field>
+            <field name="name">Dozens</field>
             <field name="factor_inv" eval="12"/>
             <field name="uom_type">bigger</field>
         </record>
@@ -53,12 +53,12 @@
             <field name="uom_type">smaller</field>
         </record>
         <record id="product_uom_day" model="uom.uom">
-            <field name="name">Day(s)</field>
+            <field name="name">Days</field>
             <field eval="uom_categ_wtime" name="category_id"/>
             <field name="factor" eval="1.0"/>
         </record>
         <record id="product_uom_hour" model="uom.uom">
-            <field name="name">Hour(s)</field>
+            <field name="name">Hours</field>
             <field eval="uom_categ_wtime" name="category_id"/>
             <field name="factor" eval="8.0"/>
             <field name="uom_type">smaller</field>
@@ -89,26 +89,26 @@
             <field name="uom_type">smaller</field>
         </record>
         <record id="product_uom_litre" model="uom.uom">
-            <field name="name">Liter(s)</field>
+            <field name="name">Liters</field>
             <field name="category_id" ref="product_uom_categ_vol"/>
             <field name="factor">1.0</field>
         </record>
 
         <!--Americanization of units of measure-->
         <record id="product_uom_lb" model="uom.uom">
-            <field name="name">lb(s)</field>
+            <field name="name">lbs</field>
             <field name="category_id" ref="product_uom_categ_kgm"/>
             <field name="factor">2.20462</field>
             <field name="uom_type">smaller</field>
         </record>
         <record id="product_uom_oz" model="uom.uom">
-            <field name="name">oz(s)</field>
+            <field name="name">ozs</field>
             <field name="category_id" ref="product_uom_categ_kgm"/>
             <field name="factor">35.274</field>
             <field name="uom_type">smaller</field>
         </record>
         <record id="product_uom_inch" model="uom.uom">
-            <field name="name">inch(es)</field>
+            <field name="name">inches</field>
             <field name="category_id" ref="uom_categ_length"/>
             <field name="factor">39.3701</field>
             <field name="uom_type">smaller</field>
@@ -120,7 +120,7 @@
             <field name="uom_type">smaller</field>
         </record>
         <record id="product_uom_mile" model="uom.uom">
-            <field name="name">mile(s)</field>
+            <field name="name">miles</field>
             <field name="category_id" ref="uom_categ_length"/>
             <field name="factor_inv" eval="1609.34"/>
             <field name="uom_type">bigger</field>
@@ -138,7 +138,7 @@
             <field name="uom_type">smaller</field>
         </record>
         <record id="product_uom_gal" model="uom.uom">
-            <field name="name">gal(s)</field>
+            <field name="name">gals</field>
             <field name="category_id" ref="product_uom_categ_vol"/>
             <field name="factor_inv" eval="3.78541"/>
             <field name="uom_type">bigger</field>
diff --git a/addons/web/static/src/js/tools/debug_manager_backend.js b/addons/web/static/src/js/tools/debug_manager_backend.js
index d8b462e5bd4..f9be341d3ec 100644
--- a/addons/web/static/src/js/tools/debug_manager_backend.js
+++ b/addons/web/static/src/js/tools/debug_manager_backend.js
@@ -8,6 +8,7 @@ var startClickEverywhere = require('web.clickEverywhere');
 var config = require('web.config');
 var core = require('web.core');
 var Dialog = require('web.Dialog');
+var field_utils = require('web.field_utils');
 var SystrayMenu = require('web.SystrayMenu');
 var utils = require('web.utils');
 var WebClient = require('web.WebClient');
diff --git a/addons/web_editor/static/tests/wysiwyg_keyboard_tests.js b/addons/web_editor/static/tests/wysiwyg_keyboard_tests.js
index 6c08fec0d98..d2b79b3e969 100644
--- a/addons/web_editor/static/tests/wysiwyg_keyboard_tests.js
+++ b/addons/web_editor/static/tests/wysiwyg_keyboard_tests.js
@@ -4309,7 +4309,7 @@ var keyboardTestsDeleteDOM = [
     '                <strong>Virtual Interior Design</strong><br>On Site ',
     '            </td>',
     '            <td width="100px" align="right">',
-    '                10 Hour(s)',
+    '                10 Hours',
     '            </td>',
     '        </tr>',
     '    </tbody></table>',
diff --git a/addons/website_sale/views/res_config_settings_views.xml b/addons/website_sale/views/res_config_settings_views.xml
index 51da1a1df51..5dc7508987f 100644
--- a/addons/website_sale/views/res_config_settings_views.xml
+++ b/addons/website_sale/views/res_config_settings_views.xml
@@ -338,7 +338,7 @@
                                 <div class="row mt16">
                                     <div class="col-12">
                                       <label for="cart_abandoned_delay" string="Cart is abandoned after" class="o_light_label"/>
-                                      <field class="col-2" name="cart_abandoned_delay"/> hour(s).
+                                      <field class="col-2" name="cart_abandoned_delay"/> hours.
                                     </div>
                                 </div>
                             </div>