From 5ce7ad709c3e87c56a19f63091d1f0b60d60c8e1 Mon Sep 17 00:00:00 2001 From: dht-odoo Date: Wed, 5 May 2021 11:51:31 +0000 Subject: [PATCH] [IMP] hr: improves field type from text to html Replace text fields to html fields as we have our own 'OdooEditor'. Indeed, it gives more options to users in the way they format their content without weighting too much on the UI (tools appear on demand and not by default). Models -> Fields 1) fleet.vehicle -> description 2) fleet.vehicle.log.contract -> notes 3) hr.job -> description 4) hr.contract -> note 5) hr.leave.allocation -> notes 6) hr.applicant -> description 7) lunch.product -> description 8) lunch.order -> product_description 9) lunch.product.report -> description Task Id: 2499504 X-original-commit: afe52b050a7667f3f20696cd48cd922f635a941c --- addons/fleet/models/fleet_vehicle.py | 2 +- addons/fleet/models/fleet_vehicle_log_contract.py | 2 +- addons/hr/models/hr_job.py | 2 +- addons/hr_contract/models/hr_contract.py | 2 +- addons/hr_holidays/models/hr_leave_allocation.py | 2 +- addons/hr_recruitment/models/hr_recruitment.py | 2 +- addons/lunch/models/lunch_order.py | 2 +- addons/lunch/models/lunch_product.py | 2 +- addons/lunch/report/lunch_product_report.py | 2 +- addons/lunch/views/lunch_product_views.xml | 7 ++++--- .../views/website_hr_recruitment_templates.xml | 4 ++-- 11 files changed, 15 insertions(+), 14 deletions(-) diff --git a/addons/fleet/models/fleet_vehicle.py b/addons/fleet/models/fleet_vehicle.py index 5ac7259de62..0ee1d3005f9 100644 --- a/addons/fleet/models/fleet_vehicle.py +++ b/addons/fleet/models/fleet_vehicle.py @@ -18,7 +18,7 @@ class FleetVehicle(models.Model): return state if state and state.id else False name = fields.Char(compute="_compute_vehicle_name", store=True) - description = fields.Text("Vehicle Description") + description = fields.Html("Vehicle Description") active = fields.Boolean('Active', default=True, tracking=True) company_id = fields.Many2one('res.company', 'Company', default=lambda self: self.env.company) currency_id = fields.Many2one('res.currency', related='company_id.currency_id') diff --git a/addons/fleet/models/fleet_vehicle_log_contract.py b/addons/fleet/models/fleet_vehicle_log_contract.py index 0f9db7c3110..6ac0b181a38 100644 --- a/addons/fleet/models/fleet_vehicle_log_contract.py +++ b/addons/fleet/models/fleet_vehicle_log_contract.py @@ -46,7 +46,7 @@ class FleetVehicleLogContract(models.Model): help='Choose whether the contract is still valid or not', tracking=True, copy=False) - notes = fields.Text('Terms and Conditions', help='Write here all supplementary information relative to this contract', copy=False) + notes = fields.Html('Terms and Conditions', help='Write here all supplementary information relative to this contract', copy=False) cost_generated = fields.Monetary('Recurring Cost') cost_frequency = fields.Selection([ ('no', 'No'), diff --git a/addons/hr/models/hr_job.py b/addons/hr/models/hr_job.py index 51271f4170d..00614d374ff 100644 --- a/addons/hr/models/hr_job.py +++ b/addons/hr/models/hr_job.py @@ -20,7 +20,7 @@ class Job(models.Model): no_of_hired_employee = fields.Integer(string='Hired Employees', copy=False, help='Number of hired employees for this job position during recruitment phase.') employee_ids = fields.One2many('hr.employee', 'job_id', string='Employees', groups='base.group_user') - description = fields.Text(string='Job Description') + description = fields.Html(string='Job Description') requirements = fields.Text('Requirements') department_id = fields.Many2one('hr.department', string='Department', domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]") company_id = fields.Many2one('res.company', string='Company', default=lambda self: self.env.company) diff --git a/addons/hr_contract/models/hr_contract.py b/addons/hr_contract/models/hr_contract.py index b4fa362ac11..03d629ef99c 100644 --- a/addons/hr_contract/models/hr_contract.py +++ b/addons/hr_contract/models/hr_contract.py @@ -33,7 +33,7 @@ class Contract(models.Model): default=lambda self: self.env.company.resource_calendar_id.id, copy=False, index=True, domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]") wage = fields.Monetary('Wage', required=True, tracking=True, help="Employee's monthly gross wage.") - notes = fields.Text('Notes') + notes = fields.Html('Notes') state = fields.Selection([ ('draft', 'New'), ('open', 'Running'), diff --git a/addons/hr_holidays/models/hr_leave_allocation.py b/addons/hr_holidays/models/hr_leave_allocation.py index 8650f18310e..4b317233418 100644 --- a/addons/hr_holidays/models/hr_leave_allocation.py +++ b/addons/hr_holidays/models/hr_leave_allocation.py @@ -66,7 +66,7 @@ class HolidaysAllocation(models.Model): 'hr.employee', compute='_compute_from_holiday_type', store=True, string='Employee', index=True, readonly=False, ondelete="restrict", tracking=True, states={'cancel': [('readonly', True)], 'refuse': [('readonly', True)], 'validate1': [('readonly', True)], 'validate': [('readonly', True)]}) manager_id = fields.Many2one('hr.employee', compute='_compute_from_employee_id', store=True, string='Manager') - notes = fields.Text('Reasons', readonly=True, states={'draft': [('readonly', False)], 'confirm': [('readonly', False)]}) + notes = fields.Html('Reasons', readonly=True, states={'draft': [('readonly', False)], 'confirm': [('readonly', False)]}) # duration number_of_days = fields.Float( 'Number of Days', compute='_compute_from_holiday_status_id', store=True, readonly=False, tracking=True, default=1, diff --git a/addons/hr_recruitment/models/hr_recruitment.py b/addons/hr_recruitment/models/hr_recruitment.py index 395470d9b0d..07749c4f0af 100644 --- a/addons/hr_recruitment/models/hr_recruitment.py +++ b/addons/hr_recruitment/models/hr_recruitment.py @@ -99,7 +99,7 @@ class Applicant(models.Model): name = fields.Char("Subject / Application Name", required=True, help="Email subject for applications sent via email") active = fields.Boolean("Active", default=True, help="If the active field is set to false, it will allow you to hide the case without removing it.") - description = fields.Text("Description") + description = fields.Html("Description") email_from = fields.Char("Email", size=128, help="Applicant email", compute='_compute_partner_phone_email', inverse='_inverse_partner_email', store=True) probability = fields.Float("Probability") diff --git a/addons/lunch/models/lunch_order.py b/addons/lunch/models/lunch_order.py index e25a550723a..25adf1eb681 100644 --- a/addons/lunch/models/lunch_order.py +++ b/addons/lunch/models/lunch_order.py @@ -41,7 +41,7 @@ class LunchOrder(models.Model): display_toppings = fields.Text('Extras', compute='_compute_display_toppings', store=True) - product_description = fields.Text('Description', related='product_id.description') + product_description = fields.Html('Description', related='product_id.description') topping_label_1 = fields.Char(related='product_id.category_id.topping_label_1') topping_label_2 = fields.Char(related='product_id.category_id.topping_label_2') topping_label_3 = fields.Char(related='product_id.category_id.topping_label_3') diff --git a/addons/lunch/models/lunch_product.py b/addons/lunch/models/lunch_product.py index 5f06283062c..78b8d768aaa 100644 --- a/addons/lunch/models/lunch_product.py +++ b/addons/lunch/models/lunch_product.py @@ -111,7 +111,7 @@ class LunchProduct(models.Model): name = fields.Char('Product Name', required=True, translate=True) category_id = fields.Many2one('lunch.product.category', 'Product Category', check_company=True, required=True) - description = fields.Text('Description', translate=True) + description = fields.Html('Description', translate=True) price = fields.Float('Price', digits='Account', required=True) supplier_id = fields.Many2one('lunch.supplier', 'Vendor', check_company=True, required=True) active = fields.Boolean(default=True) diff --git a/addons/lunch/report/lunch_product_report.py b/addons/lunch/report/lunch_product_report.py index d07ac841289..b2080022daa 100644 --- a/addons/lunch/report/lunch_product_report.py +++ b/addons/lunch/report/lunch_product_report.py @@ -15,7 +15,7 @@ class LunchProductReport(models.Model): product_id = fields.Many2one('lunch.product', 'Product') name = fields.Char('Product Name', related='product_id.name') category_id = fields.Many2one('lunch.product.category', 'Product Category') - description = fields.Text('Description', related='product_id.description') + description = fields.Html('Description', related='product_id.description') price = fields.Float('Price') supplier_id = fields.Many2one('lunch.supplier', 'Vendor') company_id = fields.Many2one('res.company') diff --git a/addons/lunch/views/lunch_product_views.xml b/addons/lunch/views/lunch_product_views.xml index 99f002c958d..f9ff3a6883d 100644 --- a/addons/lunch/views/lunch_product_views.xml +++ b/addons/lunch/views/lunch_product_views.xml @@ -84,9 +84,10 @@ - +