-
+
-
+
diff --git a/addons/account/views/report_statement.xml b/addons/account/views/report_statement.xml index 39503d5ddb8..fc6a39978b2 100644 --- a/addons/account/views/report_statement.xml +++ b/addons/account/views/report_statement.xml @@ -103,7 +103,7 @@ - +
-
- % for description_line in splitted_description:
-
- ${description_line | safe} - % endfor -
-
% for attendee in object.event_id.attendee_ids:
@@ -121,6 +109,10 @@
- Join Video Call: ${object.event_id.videocall_location} % endif
Description of the event
+ ${object.event_id.description | safe} + % endif@@ -222,18 +214,6 @@ % if not object.event_id.allday and object.event_id.duration
-
- % for description_line in splitted_description:
-
- ${description_line | safe} - % endfor -
-
% for attendee in object.event_id.attendee_ids:
@@ -251,6 +231,10 @@
- Join Video Call: ${object.event_id.videocall_location} % endif
Description of the event
+ ${object.event_id.description | safe} + % endif@@ -332,18 +316,6 @@ % if not object.event_id.allday and object.event_id.duration
-
- % for description_line in splitted_description:
-
- ${description_line | safe} - % endfor -
-
% for attendee in object.event_id.attendee_ids:
@@ -361,6 +333,10 @@
- Join Video Call: ${object.event_id.videocall_location} % endif
Description of the event
+ ${object.event_id.description | safe} + % endifdiff --git a/addons/calendar/models/calendar_event.py b/addons/calendar/models/calendar_event.py index c8ee1a71b04..6ae4f68e7f8 100644 --- a/addons/calendar/models/calendar_event.py +++ b/addons/calendar/models/calendar_event.py @@ -9,13 +9,12 @@ import pytz from werkzeug.urls import url_join from odoo import api, fields, models -from odoo import tools from odoo.addons.base.models.res_partner import _tz_get from odoo.addons.calendar.models.calendar_attendee import Attendee from odoo.addons.calendar.models.calendar_recurrence import weekday_to_field, RRULE_TYPE_SELECTION, END_TYPE_SELECTION, MONTH_BY_SELECTION, WEEKDAY_SELECTION, BYDAY_SELECTION from odoo.tools.translate import _ from odoo.tools.misc import get_lang -from odoo.tools import pycompat, html_escape +from odoo.tools import pycompat, html2plaintext, is_html_empty from odoo.exceptions import UserError, ValidationError, AccessError _logger = logging.getLogger(__name__) @@ -96,7 +95,7 @@ class Meeting(models.Model): # description name = fields.Char('Meeting Subject', required=True) - description = fields.Text('Description') + description = fields.Html('Description') user_id = fields.Many2one('res.users', 'Organizer', default=lambda self: self.env.user) partner_id = fields.Many2one( 'res.partner', string='Scheduled by', related='user_id.partner_id', readonly=True) @@ -627,7 +626,7 @@ class Meeting(models.Model): if 'name' in fields: activity_values['summary'] = event.name if 'description' in fields: - activity_values['note'] = tools.plaintext2html(event.description) + activity_values['note'] = event.description if 'start' in fields: # self.start is a datetime UTC *only when the event is not allday* # activty.date_deadline is a date (No TZ, but should represent the day in which the user's TZ is) @@ -837,8 +836,12 @@ class Meeting(models.Model): event.add('dtstart').value = ics_datetime(meeting.start, meeting.allday) event.add('dtend').value = ics_datetime(meeting.stop, meeting.allday) event.add('summary').value = meeting.name - if meeting.description: - event.add('description').value = meeting.description + if not is_html_empty(meeting.description): + if 'appointment_type_id' in meeting._fields and self.appointment_type_id: + # convert_online_event_desc_to_text method for correct data formatting in external calendars + event.add('description').value = self.convert_online_event_desc_to_text(meeting.description) + else: + event.add('description').value = html2plaintext(meeting.description) if meeting.location: event.add('location').value = meeting.location if meeting.rrule: @@ -866,6 +869,23 @@ class Meeting(models.Model): return result + def convert_online_event_desc_to_text(self, description): + """ + We can sync the calendar events with google calendar, iCal and Outlook, and we + also pass the event description along with other data. This description needs + to be in plaintext to be displayed properly in above platforms. Because online + events have fixed format for the description, this method removes some specific + html tags, and converts it into readable plaintext (to be used in external + calendars). Note that for regular (offline) events, we simply use the standard + `html2plaintext` method instead. + """ + desc_str = str(description) + tags_to_replace = ["
- ", "
") + return html2plaintext(desc_str) + @api.model def _get_display_time(self, start, stop, zduration, zallday): """ Return date and time (from to from) based on duration with timezone in string. Eg : @@ -948,56 +968,3 @@ class Meeting(models.Model): 'id', 'active', 'allday', 'duration', 'user_id', 'interval', 'count', 'rrule', 'recurrence_id', 'show_as', 'privacy'} - - def description_to_html_lines(self): - """ Description could contain some structure content, depending on - its use. Notably appointment could add some structured data in it - in addition to free text. Purpose of this method is to generate a - simple html. - - Input (self.description) example: -Some free text salespeople added -as multi line - * Mobile: +320475000000 - * Email: my.email@test.example.com - * SingleLine: answer - * MultiLine: -Answer1 -Answer2 -Answer3 - * Dropdown: answer - * Radio: answer - * Checkboxes: answer1, answer2 -Some free text salespeople added -as multi line - - Output: a list of items[ -'Some free text salespeople added
as multi line', -'Mobile: +320475000000', -'Email: my.email@test.example.com', -'SingleLine: answer', -'MultiLine:
Answer1
Answer2
Answer3', -'Dropdown: answer', -'Radio: answer', -'Checkboxes: answer1, answer2', -'Some free text salespeople added
as multi line'] - - Each item of returned list is escaped so that only our intended
- are html tags. It should therefore be safe. - """ - - final_lines = [] - parsed_lines = [] - for line in self.description.split('\n'): - if not line.strip(): - continue - # new line - if line.startswith(' *'): - if parsed_lines: - final_lines.append('
'.join(html_escape(line) for line in parsed_lines)) - parsed_lines = [line.lstrip(' *')] - else: - parsed_lines.append(line) - if parsed_lines: - final_lines.append('
'.join(html_escape(line) for line in parsed_lines)) - return final_lines diff --git a/addons/calendar/models/mail_activity.py b/addons/calendar/models/mail_activity.py index 58ca5ff75d4..7f483ca27af 100644 --- a/addons/calendar/models/mail_activity.py +++ b/addons/calendar/models/mail_activity.py @@ -34,7 +34,10 @@ class MailActivity(models.Model): if feedback: for event in events: description = event.description - description = '%s\n%s%s' % (description or '', _("Feedback: "), feedback) + description = '%s
%s' % ( + description if not tools.is_html_empty(description) else '', + _('Feedback: %(feedback)s', tools.plaintext2html(feedback)) if feedback else '', + ) event.write({'description': description}) return messages, activities diff --git a/addons/calendar/tests/test_calendar.py b/addons/calendar/tests/test_calendar.py index ebece3f11de..4083877516c 100644 --- a/addons/calendar/tests/test_calendar.py +++ b/addons/calendar/tests/test_calendar.py @@ -123,7 +123,7 @@ class TestCalendar(SavepointCaseWithUserDemo): self.assertEqual(test_record.activity_ids.date_deadline, (now + timedelta(days=-2)).date()) # update event with a description that have a special character and a new line - test_description3 = 'Test & \n Description' + test_description3 = 'Test &
Description' test_note3 = '
Test &
Description
'.join(desc for desc in leads.mapped('description') if not is_html_empty(desc)), 'type': lambda fname, leads: 'opportunity' if any(lead.type == 'opportunity' for lead in leads) else 'lead', 'priority': lambda fname, leads: max(leads.mapped('priority')) if leads else False, } diff --git a/addons/crm/tests/common.py b/addons/crm/tests/common.py index f863b577c94..daa7baa5fc3 100644 --- a/addons/crm/tests/common.py +++ b/addons/crm/tests/common.py @@ -399,7 +399,7 @@ class TestCrmCommon(TestSalesCommon, MailCase): def _get_description(): values = [_find_value(lead, 'description') for lead in leads] - return '\n\n'.join(value for value in values if value) + return '
'.join(value for value in values if value) def _get_priority(): values = [_find_value(lead, 'priority') for lead in leads] diff --git a/addons/crm/tests/test_crm_lead_merge.py b/addons/crm/tests/test_crm_lead_merge.py index 97206dfec73..8d313dc47fa 100644 --- a/addons/crm/tests/test_crm_lead_merge.py +++ b/addons/crm/tests/test_crm_lead_merge.py @@ -88,7 +88,7 @@ class TestLeadMerge(TestLeadMergeCommon): # and exclude inactive leads, but that's not written anywhere ... intended ?? self.assertEqual(merge.opportunity_ids, self.leads - self.lead_w_partner_company - self.lead_w_email_lost) ordered_merge = self.lead_w_contact + self.lead_w_email + self.lead_1 + self.lead_w_partner - ordered_merge_description = '\n\n'.join(l.description for l in ordered_merge) + ordered_merge_description = '
'.join(l.description for l in ordered_merge) # merged opportunity: in this test, all input are leads. Confidence is based on stage # sequence -> lead_w_contact has a stage sequence of 30 diff --git a/addons/crm_livechat/models/mail_channel.py b/addons/crm_livechat/models/mail_channel.py index c051309c813..64313998493 100644 --- a/addons/crm_livechat/models/mail_channel.py +++ b/addons/crm_livechat/models/mail_channel.py @@ -28,9 +28,9 @@ class MailChannel(models.Model): :param key: operator input in chat ('/lead Lead about Product') """ description = ''.join( - '%s: %s\n' % (message.author_id.name or self.anonymous_name, message.body) + '%s: %s
' % (message.author_id.name or self.anonymous_name, html2plaintext(message.body)) for message in self.message_ids.sorted('id') - ) + ) # converting message body back to plaintext for correct data formating in description # if public user is part of the chat: consider lead to be linked to an # anonymous user whatever the participants. Otherwise keep only share # partners (no user or portal user) to link to the lead. @@ -48,7 +48,7 @@ class MailChannel(models.Model): 'partner_id': customers[0].id if customers else False, 'user_id': False, 'team_id': False, - 'description': html2plaintext(description), + 'description': description, 'referred': partner.name, 'source_id': utm_source and utm_source.id, }) diff --git a/addons/event/models/event_event.py b/addons/event/models/event_event.py index 0b1d957f7ec..e14899d4dab 100644 --- a/addons/event/models/event_event.py +++ b/addons/event/models/event_event.py @@ -106,7 +106,7 @@ class EventEvent(models.Model): return self.env['ir.ui.view']._render_template('event.event_default_descripton') name = fields.Char(string='Event', translate=True, required=True) - note = fields.Text(string='Note') + note = fields.Html(string='Note') description = fields.Html(string='Description', translate=html_translate, sanitize_attributes=False, sanitize_form=False, default=_default_description) active = fields.Boolean(default=True) user_id = fields.Many2one( diff --git a/addons/event_crm/models/event_lead_rule.py b/addons/event_crm/models/event_lead_rule.py index 08c5c114cb0..f5c9ec1c7e5 100644 --- a/addons/event_crm/models/event_lead_rule.py +++ b/addons/event_crm/models/event_lead_rule.py @@ -177,7 +177,7 @@ class EventLeadRule(models.Model): additionnal_description = group_registrations._get_lead_description(_("New registrations"), line_counter=True) for lead in toupdate_leads: lead.write({ - 'description': "%s\n%s" % (lead.description, additionnal_description), + 'description': "%s
%s" % (lead.description, additionnal_description), 'registration_ids': [(4, reg.id) for reg in group_registrations], }) elif group_registrations: diff --git a/addons/event_crm/models/event_registration.py b/addons/event_crm/models/event_registration.py index 033bb0d3aec..111cef325b8 100644 --- a/addons/event_crm/models/event_registration.py +++ b/addons/event_crm/models/event_registration.py @@ -132,7 +132,7 @@ class EventRegistration(models.Model): upd_description_fields = [field for field in self._get_lead_description_fields() if field in new_vals.keys()] if any(new_vals[field] != old_vals[field] for field in upd_description_fields): for lead in leads_attendee: - lead_values['description'] = "%s\n%s" % ( + lead_values['description'] = "%s
%s" % ( lead.description, registration._get_lead_description(_("Updated registrations"), line_counter=True) ) @@ -148,7 +148,7 @@ class EventRegistration(models.Model): if not lead.partner_id: lead_values['description'] = lead.registration_ids._get_lead_description(_("Participants"), line_counter=True) elif new_vals['partner_id'] != lead.partner_id.id: - lead_values['description'] = lead.description + "\n" + lead.registration_ids._get_lead_description(_("Updated registrations"), line_counter=True, line_suffix=_("(updated)")) + lead_values['description'] = lead.description + "
" + lead.registration_ids._get_lead_description(_("Updated registrations"), line_counter=True, line_suffix=_("(updated)")) if lead_values: lead.write(lead_values) @@ -232,17 +232,16 @@ class EventRegistration(models.Model): """ reg_lines = [ registration._get_lead_description_registration( - prefix="%s. " % (index + 1) if line_counter else "", line_suffix=line_suffix - ) for index, registration in enumerate(self) + ) for registration in self ] - return ("%s\n" % prefix if prefix else "") + ("\n".join(reg_lines)) + return ("%s
" % prefix if prefix else "") + ( + "
- " if line_counter else "
- ") + ("".join(reg_lines)) + ("
You just received badge ${object.badge_id.name} !
- % if object.badge_id.description + % if not is_html_empty(object.badge_id.description)
|
diff --git a/addons/gamification/models/badge.py b/addons/gamification/models/badge.py
index aa065140e8f..8517582f66d 100644
--- a/addons/gamification/models/badge.py
+++ b/addons/gamification/models/badge.py
@@ -74,7 +74,7 @@ class GamificationBadge(models.Model):
name = fields.Char('Badge', required=True, translate=True)
active = fields.Boolean('Active', default=True)
- description = fields.Text('Description', translate=True)
+ description = fields.Html('Description', translate=True)
level = fields.Selection([
('bronze', 'Bronze'), ('silver', 'Silver'), ('gold', 'Gold')],
string='Forum Badge Level', default='bronze')
diff --git a/addons/gamification/views/badge.xml b/addons/gamification/views/badge.xml
index 6193548c091..f59c5985d2a 100644
--- a/addons/gamification/views/badge.xml
+++ b/addons/gamification/views/badge.xml
@@ -144,8 +144,8 @@
-
+
@@ -192,7 +193,7 @@
' % (invoice_form.narration or '', element.text) # Informations relative to the purchase order, the contract, the agreement, # the reception phase or invoices previously transmitted diff --git a/addons/l10n_multilang/models/account.py b/addons/l10n_multilang/models/account.py index 2237207ca36..2c0e1a77a00 100644 --- a/addons/l10n_multilang/models/account.py +++ b/addons/l10n_multilang/models/account.py @@ -58,7 +58,7 @@ class AccountFiscalPosition(models.Model): _inherit = 'account.fiscal.position' name = fields.Char(translate=True) - note = fields.Text(translate=True) + note = fields.Html(translate=True) class AccountFiscalPositionTemplate(models.Model): 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 @@
' + narration # Create invoice lines from operations. for operation in repair.operations.filtered(lambda op: op.type == 'add'): diff --git a/addons/sale/models/sale_order.py b/addons/sale/models/sale_order.py index 02e27385d70..57be726b3cf 100644 --- a/addons/sale/models/sale_order.py +++ b/addons/sale/models/sale_order.py @@ -9,7 +9,7 @@ from odoo import api, fields, models, SUPERUSER_ID, _ from odoo.exceptions import AccessError, UserError, ValidationError from odoo.tools.misc import formatLang from odoo.osv import expression -from odoo.tools import float_is_zero +from odoo.tools import float_is_zero, html_keep_url, is_html_empty class SaleOrder(models.Model): @@ -111,7 +111,8 @@ class SaleOrder(models.Model): def _default_note(self): use_invoice_terms = self.env['ir.config_parameter'].sudo().get_param('account.use_invoice_terms') if use_invoice_terms and self.env.company.terms_type == "html": - return _('Terms & Conditions: %s/terms', self._default_note_url()) + baseurl = html_keep_url(self._default_note_url() + '/terms') + return _('Terms & Conditions: %s', baseurl) return use_invoice_terms and self.env.company.invoice_terms or '' @api.model @@ -225,7 +226,7 @@ class SaleOrder(models.Model): ('no', 'Nothing to Invoice') ], string='Invoice Status', compute='_get_invoice_status', store=True, readonly=True) - note = fields.Text('Terms and conditions', default=_default_note) + note = fields.Html('Terms and conditions', default=_default_note) terms_type = fields.Selection(related='company_id.terms_type') amount_untaxed = fields.Monetary(string='Untaxed Amount', store=True, readonly=True, compute='_amount_all', tracking=5) @@ -409,8 +410,9 @@ class SaleOrder(models.Model): if self.env['ir.config_parameter'].sudo().get_param('account.use_invoice_terms'): if self.terms_type == 'html' and self.env.company.invoice_terms_html: - values['note'] = _('Terms & Conditions: %s/terms', self.get_base_url()) - elif self.env.company.invoice_terms: + baseurl = html_keep_url(self.get_base_url() + '/terms') + values['note'] = _('Terms & Conditions: %s', baseurl) + elif not is_html_empty(self.env.company.invoice_terms): values['note'] = self.with_context(lang=self.partner_id.lang).env.company.invoice_terms if not self.env.context.get('not_self_saleperson') or not self.team_id: values['team_id'] = self.env['crm.team'].with_context( diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml index f9bba65dac8..0c958b339a4 100644 --- a/addons/sale/report/sale_report_templates.xml +++ b/addons/sale/report/sale_report_templates.xml @@ -198,10 +198,10 @@ - + - + Fiscal Position Remark: diff --git a/addons/sale/tests/test_sale_order.py b/addons/sale/tests/test_sale_order.py index 593bc0b3ba5..05009fd9f94 100644 --- a/addons/sale/tests/test_sale_order.py +++ b/addons/sale/tests/test_sale_order.py @@ -611,12 +611,12 @@ class TestSaleOrder(TestSaleCommon): self.env.company.terms_type = 'plain' self.env.company.invoice_terms = "Coin coin" sale_order = self._create_sale_order() - self.assertEqual(sale_order.note, "Coin coin") + self.assertEqual(sale_order.note, "Coin coin ") # Html invoice terms (/terms page) self.env.company.terms_type = 'html' sale_order = self._create_sale_order() - self.assertTrue(sale_order.note.startswith("Terms & Conditions: ")) + self.assertTrue(sale_order.note.startswith("Terms & Conditions: "))
def test_validity_days(self):
self.env['ir.config_parameter'].sudo().set_param('sale.use_quotation_validity_days', True)
diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index c0aa8604eb0..1514b4adf52 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -526,7 +526,7 @@
- |