From 085f6e0e6872cbfe2e4ee2c8db92bef0f1f23b8c Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Tue, 8 Dec 2015 15:45:09 +0100 Subject: [PATCH 001/117] [FIX] mail: multiple clicks on navbar needactions icon Clicking on this icon redirects to the client action (for now at least). By quickly clicking several times on it, we try to restore the scroll position of a channel that not yet exists. This rev. prevents from getting a traceback in that case. --- addons/mail/static/src/js/client_action.js | 4 +++- addons/mail/static/src/js/systray.js | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/mail/static/src/js/client_action.js b/addons/mail/static/src/js/client_action.js index fc9d73fbfb7..e06abc5a9de 100644 --- a/addons/mail/static/src/js/client_action.js +++ b/addons/mail/static/src/js/client_action.js @@ -120,7 +120,9 @@ var ChatAction = Widget.extend(ControlPanelMixin, { }, on_attach_callback: function () { - this.thread.scroll_to({offset: this.channels_scrolltop[this.channel.id]}); + if (this.channel) { + this.thread.scroll_to({offset: this.channels_scrolltop[this.channel.id]}); + } }, on_detach_callback: function () { this.channels_scrolltop[this.channel.id] = this.thread.get_scrolltop(); diff --git a/addons/mail/static/src/js/systray.js b/addons/mail/static/src/js/systray.js index c5d34f179bc..19e225c364f 100644 --- a/addons/mail/static/src/js/systray.js +++ b/addons/mail/static/src/js/systray.js @@ -29,11 +29,14 @@ var NotificationTopButton = Widget.extend({ }, on_click: function (event) { event.preventDefault(); + this.discuss_redirect(); + }, + discuss_redirect: _.debounce(function () { var discuss_ids = chat_manager.get_discuss_ids(); this.do_action(discuss_ids.action_id, {clear_breadcrumbs: true}).then(function () { core.bus.trigger('change_menu_section', discuss_ids.menu_id); }); - }, + }, 1000, true), }); SystrayMenu.Items.push(NotificationTopButton); From 6cf8ebab3d549e9ea28d662d1caf6cb2ccb1db82 Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Wed, 9 Dec 2015 10:37:24 +0100 Subject: [PATCH 002/117] [FIX] mail: escape user and channel names to prevent xss However, users shouldn't be allowed to have xss in their name, imo. --- addons/mail/static/src/js/chat_manager.js | 2 +- addons/mail/static/src/js/client_action.js | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js index 2261b961410..9c2787e18ce 100644 --- a/addons/mail/static/src/js/chat_manager.js +++ b/addons/mail/static/src/js/chat_manager.js @@ -98,7 +98,7 @@ function add_message (data, options) { if (!query.is_displayed) { var title = _t('New message'); if (msg.author_id[1]) { - title += _t(' from ') + msg.author_id[1]; + title += _t(' from ') + _.escape(msg.author_id[1]); } var trunc_text = function (t, limit) { return (t.length > limit) ? t.substr(0, limit-1)+'…' : t; diff --git a/addons/mail/static/src/js/client_action.js b/addons/mail/static/src/js/client_action.js index e06abc5a9de..c26ee8fb60c 100644 --- a/addons/mail/static/src/js/client_action.js +++ b/addons/mail/static/src/js/client_action.js @@ -76,7 +76,7 @@ var PartnerInviteDialog = Dialog.extend({ var ChannelModel = new Model('mail.channel'); return ChannelModel.call('channel_invite', [], {ids : [this.channel_id], partner_ids: _.pluck(data, 'id')}) .then(function(){ - var names = _.pluck(data, 'text').join(', '); + var names = _.escape(_.pluck(data, 'text').join(', ')); var notification = _.str.sprintf(_t('You added %s to the conversation.'), names); self.do_notify(_t('New people'), notification); }); @@ -293,9 +293,10 @@ var ChatAction = Widget.extend(ControlPanelMixin, { return Channel.call('channel_search_to_join', [search_val]).then(function(result){ var values = []; _.each(result, function(channel){ + var escaped_name = _.escape(channel.name); values.push(_.extend(channel, { - 'value': channel.name, - 'label': channel.name, + 'value': escaped_name, + 'label': escaped_name, })); }); return values; @@ -307,9 +308,10 @@ var ChatAction = Widget.extend(ControlPanelMixin, { return Partner.call('im_search', [search_val, 20]).then(function(result){ var values = []; _.each(result, function(user){ + var escaped_name = _.escape(user.name); values.push(_.extend(user, { - 'value': user.name, - 'label': user.name, + 'value': escaped_name, + 'label': escaped_name, })); }); return values; From bff2fcde3cdb4adfdd501da9999ea5f6901edf76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Wed, 9 Dec 2015 10:39:21 +0100 Subject: [PATCH 003/117] [FIX] mail: correctly handle message on star/unread updates --- addons/mail/static/src/js/chat_manager.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js index 9c2787e18ce..852f1903429 100644 --- a/addons/mail/static/src/js/chat_manager.js +++ b/addons/mail/static/src/js/chat_manager.js @@ -450,6 +450,10 @@ function on_toggle_star_notification (data) { message.is_starred = data.starred; if (!message.is_starred) { remove_message_from_channel("channel_starred", message); + } else { + add_to_cache(message, []); + var channel_starred = chat_manager.get_channel('channel_starred'); + channel_starred.cache = _.pick(channel_starred.cache, "[]"); } chat_manager.bus.trigger('update_message', message); } @@ -487,8 +491,12 @@ function on_mark_as_unread_notification (data) { if (message) { invalidate_caches(message.channel_ids); add_channel_to_message(message, 'channel_inbox'); + add_to_cache(message, []); } }); + var channel_inbox = chat_manager.get_channel('channel_inbox'); + channel_inbox.cache = _.pick(channel_inbox.cache, "[]"); + _.each(data.channel_ids, function (channel_id) { var channel = chat_manager.get_channel(channel_id); if (channel) { From ad1486290739231696a39cdebeef78e209846f0b Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Tue, 8 Dec 2015 16:00:33 +0100 Subject: [PATCH 004/117] [FIX] mail: various ui improvements/fixes - display full content of messages in Discuss - no content helpers in inbox and starred improved - mark as read tooltip instead of mark ad done - decrease font size in chat windows - increase chat windows dimensions - display avatars in chat windows - chat window background is now white - notes are displayed with a darker background --- addons/mail/static/src/js/chat_window.js | 3 +-- addons/mail/static/src/js/client_action.js | 3 ++- addons/mail/static/src/js/thread.js | 1 + addons/mail/static/src/js/window_manager.js | 2 +- addons/mail/static/src/less/chat_window.less | 12 +++++++++--- addons/mail/static/src/less/thread.less | 5 +++++ addons/mail/static/src/xml/thread.xml | 16 ++++++++-------- 7 files changed, 27 insertions(+), 15 deletions(-) diff --git a/addons/mail/static/src/js/chat_window.js b/addons/mail/static/src/js/chat_window.js index e9fcaa9fe09..e7b841cc972 100644 --- a/addons/mail/static/src/js/chat_window.js +++ b/addons/mail/static/src/js/chat_window.js @@ -33,7 +33,6 @@ return Widget.extend({ this.thread = new ChatThread(this, { channel_id: this.channel_id, - display_avatar: false, display_needactions: false, display_stars: this.options.display_stars, }); @@ -64,7 +63,7 @@ return Widget.extend({ fold: function () { this.update_header(); this.$el.animate({ - height: this.folded ? "28px" : "333px" + height: this.folded ? "28px" : "400px" }); }, toggle_fold: function (fold) { diff --git a/addons/mail/static/src/js/client_action.js b/addons/mail/static/src/js/client_action.js index c26ee8fb60c..d4d2cb69d4f 100644 --- a/addons/mail/static/src/js/client_action.js +++ b/addons/mail/static/src/js/client_action.js @@ -164,7 +164,8 @@ var ChatAction = Widget.extend(ControlPanelMixin, { this.composer = new ChatComposer(this); this.thread = new ChatThread(this, { - display_help: true + display_help: true, + shorten_messages: false, }); this.$buttons = $(QWeb.render("mail.chat.ControlButtons", {})); diff --git a/addons/mail/static/src/js/thread.js b/addons/mail/static/src/js/thread.js index 86b34255cf7..5381c9f89c3 100644 --- a/addons/mail/static/src/js/thread.js +++ b/addons/mail/static/src/js/thread.js @@ -51,6 +51,7 @@ var Thread = Widget.extend({ display_stars: true, display_document_link: true, display_avatar: true, + shorten_messages: true, squash_close_messages: true, }); }, diff --git a/addons/mail/static/src/js/window_manager.js b/addons/mail/static/src/js/window_manager.js index 5a62c15ed8b..fe60dff4bd5 100644 --- a/addons/mail/static/src/js/window_manager.js +++ b/addons/mail/static/src/js/window_manager.js @@ -11,7 +11,7 @@ var web_client = require('web.web_client'); // chat window management //---------------------------------------------------------------- var chat_sessions = []; -var CHAT_WINDOW_WIDTH = 260; +var CHAT_WINDOW_WIDTH = 300; function open_chat (session) { if (!_.findWhere(chat_sessions, {id: session.id})) { diff --git a/addons/mail/static/src/less/chat_window.less b/addons/mail/static/src/less/chat_window.less index b911ef467ed..ee6ea89b539 100644 --- a/addons/mail/static/src/less/chat_window.less +++ b/addons/mail/static/src/less/chat_window.less @@ -1,11 +1,12 @@ -@o-chat-window-bg: lighten(lightgray, 13%); +@o-chat-window-bg: white; .o_chat_window { .o-flex-display(); .o-flex-flow(column, nowrap); position: fixed; - width: 260px; - height: 333px; + width: 300px; + height: 400px; + font-size: 12px; background-color: @o-chat-window-bg; border: 1px solid gray; border-radius: 3px; @@ -44,6 +45,11 @@ background-color: @o-chat-window-bg; } } + .o_thread_message { + .o_thread_message_sidebar { + margin-right: 5px; + } + } } .o_chat_input > input { diff --git a/addons/mail/static/src/less/thread.less b/addons/mail/static/src/less/thread.less index e28b949bd5d..f2971dcf17e 100644 --- a/addons/mail/static/src/less/thread.less +++ b/addons/mail/static/src/less/thread.less @@ -1,6 +1,7 @@ @mail-thread-avatar-size: 36px; @mail-thread-icon-opacity: 0.6; @mail-thread-side-date-opacity: 0.6; +@mail-thread-note: @gray-lighter; .o_mail_thread { .o_thread_show_more { @@ -97,6 +98,10 @@ .o_thread_message_core { .o-flex(1, 1, auto); + &.o_mail_note { + background-color: @gray-lighter; + } + .o_mail_subject { font-style: italic; } diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index f1a364999b5..0e7777dda1a 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -21,12 +21,12 @@
-
Congratulation, your inbox is empty
-
New messages will appear here.
+
Congratulations, your inbox is empty
+
New messages appear here.
 -
No message starred
-
You can mark any message as 'starred', and it will show up in this channel.
+
No starred message
+
You can mark any message as 'starred', and it shows up in this channel.
@@ -67,7 +67,7 @@ t-att-class="'fa o_thread_message_star ' + (message.is_starred ? 'fa-star' : 'fa-star-o')" t-att-data-message-id="message.id" t-att-title="_t('Mark as Todo')"/> -
+

Note by @@ -102,7 +102,7 @@ t-att-data-message-id="message.id" t-att-title="_t('Mark as Todo')"/> + t-att-data-message-id="message.id" t-att-title="_t('Mark as Read')"/>

@@ -113,7 +113,7 @@

Subject:

- +
@@ -121,7 +121,7 @@
- + From afa28f075abdbe865f35d41b72c15646718626a7 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Wed, 9 Dec 2015 11:32:38 +0100 Subject: [PATCH 005/117] [FIX] website_quote: message if SO not confirmed Commit 486cd3309 was not correctly forward ported. We also add a specific message if the quotation is in state 'draft'. Fixes #9226 --- addons/website_quote/static/src/js/website_quotation.js | 3 ++- addons/website_quote/views/website_quotation.xml | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/website_quote/static/src/js/website_quotation.js b/addons/website_quote/static/src/js/website_quotation.js index f4e17c92bed..ef0389e187a 100644 --- a/addons/website_quote/static/src/js/website_quotation.js +++ b/addons/website_quote/static/src/js/website_quotation.js @@ -102,8 +102,9 @@ if(!$('.o_website_quote').length) { 'signer': signer_name, 'sign': signature?JSON.stringify(signature[1]):false, }).then(function (data) { + var message_id = (data) ? 3 : 4; self.$el.modal('hide'); - window.location.href = '/quote/'+order_id.toString()+'/'+token+'?message=3'; + window.location.href = '/quote/'+order_id.toString()+'/'+token+'?message='+message_id; }); return false; } diff --git a/addons/website_quote/views/website_quotation.xml b/addons/website_quote/views/website_quotation.xml index 5cd9545d17e..be4fe376270 100644 --- a/addons/website_quote/views/website_quotation.xml +++ b/addons/website_quote/views/website_quotation.xml @@ -227,9 +227,10 @@
- This order has already been - cancelled - validated + This order + has not yet been sent + has already been cancelled + has already been validated ! You can contact us for any question.
From c867927b2eac9747a814e8888bf2f45cfdf100b6 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Tue, 1 Dec 2015 17:10:57 +0100 Subject: [PATCH 006/117] [FIX] mail: sanitize incoming mail to remove unwanted class + add test some incoming mail containing class like "fa-spin" or "modal in" have an unwanted behavior in Odoo, incoming mail should not have special classes, so we remove all the class that are not in the whitelist. --- openerp/addons/base/tests/test_mail.py | 7 ++++ .../addons/base/tests/test_mail_examples.py | 37 +++++++++++++++++-- openerp/tools/mail.py | 20 +++++++++- 3 files changed, 60 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/tests/test_mail.py b/openerp/addons/base/tests/test_mail.py index ec9877f895d..8186674b964 100644 --- a/openerp/addons/base/tests/test_mail.py +++ b/openerp/addons/base/tests/test_mail.py @@ -330,6 +330,13 @@ class TestCleaner(unittest.TestCase): for ext in test_mail_examples.BUG_3_OUT: self.assertNotIn(ext, new_html, 'html_email_cleaner did not removed invalid content') + def test_80_remove_classes(self): + new_html = html_email_clean(test_mail_examples.REMOVE_CLASS, remove=True) + for ext in test_mail_examples.REMOVE_CLASS_IN: + self.assertIn(ext, new_html, 'html_email_cleaner wrongly removed classes') + for ext in test_mail_examples.REMOVE_CLASS_OUT: + self.assertNotIn(ext, new_html, 'html_email_cleaner did not removed correctly unwanted classes') + def test_90_misc(self): # False boolean for text must return empty string new_html = html_email_clean(False) diff --git a/openerp/addons/base/tests/test_mail_examples.py b/openerp/addons/base/tests/test_mail_examples.py index 97a34c45e55..3342876bf73 100644 --- a/openerp/addons/base/tests/test_mail_examples.py +++ b/openerp/addons/base/tests/test_mail_examples.py @@ -91,12 +91,12 @@ OERP_WEBSITE_HTML_1 = """ OERP_WEBSITE_HTML_1_IN = [ 'Manage your company most important asset: People', - 'img class="img-rounded img-responsive" src="/website/static/src/img/china_thumb.jpg"', + 'src="/website/static/src/img/china_thumb.jpg"', ] OERP_WEBSITE_HTML_1_OUT = [ 'Break down information silos.', 'Keep track of the vacation days accrued by each employee', - 'img class="img-rounded img-responsive" src="/website/static/src/img/deers_thumb.jpg', + 'src="/website/static/src/img/deers_thumb.jpg', ] OERP_WEBSITE_HTML_2 = """ @@ -205,7 +205,7 @@ OERP_WEBSITE_HTML_2_IN = [ ] OERP_WEBSITE_HTML_2_OUT = [ 'Make every employee feel more connected', - 'img class="img-responsive shadow" src="/website/static/src/img/text_image.png', + 'src="/website/static/src/img/text_image.png', ] TEXT_1 = """I contact you about our meeting tomorrow. Here is the schedule I propose: @@ -1173,3 +1173,34 @@ BUG_3_IN = [ BUG_3_OUT = [ 'New kanban view of documents' ] + +REMOVE_CLASS = """ +
+
Hello
+
I have just installed Odoo 9 and I've got the following error:
+
 
+
+ +
+
+ +
+""" + +REMOVE_CLASS_IN = [ + 'An error occured in a modal and I will send you back the html to try opening one on your end' +] +REMOVE_CLASS_OUT = [ + '
' +] \ No newline at end of file diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py index 5f82df93af9..2e44cfc7395 100644 --- a/openerp/tools/mail.py +++ b/openerp/tools/mail.py @@ -26,6 +26,7 @@ _logger = logging.getLogger(__name__) tags_to_kill = ["script", "head", "meta", "title", "link", "style", "frame", "iframe", "base", "object", "embed"] tags_to_remove = ['html', 'body'] +whitelist_classes = set(['WordSection1', 'MsoNormal', 'SkyDrivePlaceholder', 'oe_mail_expand', 'stopSpelling']) # allow new semantic HTML5 tags allowed_tags = clean.defs.tags | frozenset('article section header footer hgroup nav aside figure main'.split() + [etree.Comment]) @@ -292,6 +293,11 @@ def html_email_clean(html, remove=False, shorten=False, max_length=300, expand_o if expand_options is None: expand_options = {} + whitelist_classes_local = whitelist_classes.copy() + if expand_options.get('oe_expand_container_class'): + whitelist_classes_local.add(expand_options.get('oe_expand_container_class')) + if expand_options.get('oe_expand_a_class'): + whitelist_classes_local.add(expand_options.get('oe_expand_a_class')) if not html or not isinstance(html, basestring): return html @@ -336,6 +342,7 @@ def html_email_clean(html, remove=False, shorten=False, max_length=300, expand_o quoted = False quote_begin = False overlength = False + replace_class = False overlength_section_id = None overlength_section_count = 0 cur_char_nbr = 0 @@ -347,6 +354,17 @@ def html_email_clean(html, remove=False, shorten=False, max_length=300, expand_o # do not take into account multiple spaces that are displayed as max 1 space in html node_text = ' '.join((node.text and node.text.strip(' \t\r\n') or '').split()) + # remove unwanted classes from node + if node.get('class'): + sanitize_classes = [] + for _class in node.get('class').split(' '): + if _class in whitelist_classes_local: + sanitize_classes.append(_class) + else: + sanitize_classes.append('cleaned_'+_class) + replace_class = True + node.set('class', ' '.join(sanitize_classes)) + # root: try to tag the client used to write the html if 'WordSection1' in node.get('class', '') or 'MsoNormal' in node.get('class', ''): root.set('msoffice', '1') @@ -448,7 +466,7 @@ def html_email_clean(html, remove=False, shorten=False, max_length=300, expand_o node_class = node.get('class', '') + ' oe_mail_cleaned' node.set('class', node_class) - if not overlength and not quote_begin and not quoted: + if not overlength and not quote_begin and not quoted and not replace_class: return html # html: \n that were tail of elements have been encapsulated into -> back to \n From 96d316fdf47a175c88eaa8cb9a2df1118c67eb27 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Wed, 9 Dec 2015 12:49:53 +0100 Subject: [PATCH 007/117] [FIX] website_sale: recompute fiscal position at checkout Method refactored by commit 94716a3 and 198164d --- addons/website_sale/controllers/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index 256857fbfce..c5244b5a7d9 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -625,6 +625,7 @@ class website_sale(http.Controller): partner_id = orm_partner.create(cr, SUPERUSER_ID, billing_info, context=context) order.write({'partner_id': partner_id, 'partner_invoice_id': partner_id}) order_obj.onchange_partner_id(cr, SUPERUSER_ID, [order.id], context=context) + order_obj.onchange_partner_shipping_id(cr, SUPERUSER_ID, [order.id], context=context) # create a new shipping partner if checkout.get('shipping_id') == -1: From 895536380894e27d397fa8e6de43baf0f3dcfded Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 9 Dec 2015 13:37:43 +0100 Subject: [PATCH 008/117] [FIX] web: /web/image - backwards-compatibility The QWeb image widget allows passing either max_width, max_height or both, but the controller required both. We'll consider a 0px dimension request as meaning: "appropriate value according to ratio". --- addons/web/controllers/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 8de78aebc2f..290e89e14e3 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1104,13 +1104,13 @@ class Binary(http.Controller): elif status != 200 and download: return request.not_found() - if content and width and height: + if content and (width or height): # resize maximum 500*500 if width > 500: width = 500 if height > 500: height = 500 - content = openerp.tools.image_resize_image(base64_source=content, size=(width, height), encoding='base64', filetype='PNG') + content = openerp.tools.image_resize_image(base64_source=content, size=(width or None, height or None), encoding='base64', filetype='PNG') image_base64 = content and base64.b64decode(content) or self.placeholder() headers.append(('Content-Length', len(image_base64))) From 2d54310096956265577b32918bc33dd539269524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Wed, 9 Dec 2015 13:32:12 +0100 Subject: [PATCH 009/117] [FIX] mail: use correct formview on redirection this prevents the following problem: clicking on a message generated by an opportunity in discuss leads to the lead form view. --- addons/mail/static/src/js/chat_manager.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js index 852f1903429..74b16f22486 100644 --- a/addons/mail/static/src/js/chat_manager.js +++ b/addons/mail/static/src/js/chat_manager.js @@ -746,13 +746,13 @@ var chat_manager = { */ redirect: function (res_model, res_id, dm_redirection_callback) { var self = this; - var redirect_to_document = function (res_model, res_id) { + var redirect_to_document = function (res_model, res_id, view_id) { web_client.do_action({ type:'ir.actions.act_window', view_type: 'form', view_mode: 'form', res_model: res_model, - views: [[false, 'form']], + views: [[view_id || false, 'form']], res_id: res_id, }); }; @@ -766,7 +766,9 @@ var chat_manager = { } }); } else { - redirect_to_document(res_model, res_id); + new Model(res_model).call('get_formview_id', [res_id, session.context]).then(function (view_id) { + redirect_to_document(res_model, res_id, view_id); + }); } }, }; From 33e759fa0d5818283c3c86430755b7ca7b5191c6 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Wed, 9 Dec 2015 14:15:23 +0100 Subject: [PATCH 010/117] [FIX] auth_signup: context is none Regression introduced in aae980b458f6f8807e2dd5d6122d33a7b2c21480 When attempting to use the context, always check that it is set first. It was no longer possible to reset a password from the login form opw-659017 --- addons/auth_signup/res_users.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py index 92ebcb093b0..4d3babfb988 100644 --- a/addons/auth_signup/res_users.py +++ b/addons/auth_signup/res_users.py @@ -256,6 +256,8 @@ class res_users(osv.Model): def action_reset_password(self, cr, uid, ids, context=None): """ create signup token for each user, and send their signup url by email """ # prepare reset password signup + if not context: + context = {} create_mode = bool(context.get('create_user')) res_partner = self.pool.get('res.partner') partner_ids = [user.partner_id.id for user in self.browse(cr, uid, ids, context)] From 5d32755548039391801970fa7f289f6e9db6cb90 Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Thu, 3 Dec 2015 15:42:48 +0100 Subject: [PATCH 011/117] [FIX] analytic, sale: timesheet access rights A user with employee rights should be able to create a timesheet line. opw:658083 --- addons/account/models/account_analytic_line.py | 2 +- addons/sale/sale_analytic.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account/models/account_analytic_line.py b/addons/account/models/account_analytic_line.py index 0152730f22f..6b8fcdc17aa 100644 --- a/addons/account/models/account_analytic_line.py +++ b/addons/account/models/account_analytic_line.py @@ -17,7 +17,7 @@ class AccountAnalyticLine(models.Model): ref = fields.Char(string='Ref.') currency_id = fields.Many2one('res.currency', related='move_id.currency_id', string='Account Currency', store=True, help="The related account currency if not equal to the company one.", readonly=True) amount_currency = fields.Monetary(related='move_id.amount_currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True) - partner_id = fields.Many2one('res.partner', related='account_id.partner_id', string='Partner', store=True) + partner_id = fields.Many2one('res.partner', related='account_id.partner_id', string='Partner', store=True, readonly=True) @api.v8 @api.onchange('product_id', 'product_uom_id', 'unit_amount', 'currency_id') diff --git a/addons/sale/sale_analytic.py b/addons/sale/sale_analytic.py index d324495df39..37f437b3158 100644 --- a/addons/sale/sale_analytic.py +++ b/addons/sale/sale_analytic.py @@ -108,16 +108,16 @@ class AccountAnalyticLine(models.Model): lines = super(AccountAnalyticLine, self).write(values) for line in self: - res = line._get_sale_order_line(vals=values) + res = line.sudo()._get_sale_order_line(vals=values) super(AccountAnalyticLine, line).write(res) - self.mapped('so_line')._compute_analytic() + self.mapped('so_line').sudo()._compute_analytic() return lines @api.model def create(self, values): line = super(AccountAnalyticLine, self).create(values) - res = line._get_sale_order_line(vals=values) + res = line.sudo()._get_sale_order_line(vals=values) line.with_context(create=True).write(res) - line.mapped('so_line')._compute_analytic() + line.mapped('so_line').sudo()._compute_analytic() return line From 5fd3a0446b0b69dd7f95dc22f6bf66424cb5a66a Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Wed, 9 Dec 2015 14:52:00 +0100 Subject: [PATCH 012/117] [FIX] mail: remove classes from short_body and body likewise --- addons/mail/models/mail_message.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py index d4e2e8ac514..e7b40727029 100644 --- a/addons/mail/models/mail_message.py +++ b/addons/mail/models/mail_message.py @@ -329,6 +329,7 @@ class Message(models.Model): 'tracking_value_ids': tracking_value_ids, }) body_short = tools.html_email_clean(message_dict['body'], shorten=True, remove=True) + message_dict['body'] = tools.html_email_clean(message_dict['body'], shorten=False, remove=False) message_dict['body_short'] = body_short != message_dict['body'] and body_short or False return True From c01c10c4bd8adc13a0a043bd50e7157f89fec229 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Wed, 9 Dec 2015 15:36:33 +0100 Subject: [PATCH 013/117] [FIX] base: override default int converter from werkzeug Default IntConverter (as well as Float, ...) doesn't support negative value by default with werkzeug. http://werkzeug.pocoo.org/docs/0.11/routing/ --- openerp/addons/base/ir/ir_http.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_http.py b/openerp/addons/base/ir/ir_http.py index 9f08d09f170..9432c463045 100644 --- a/openerp/addons/base/ir/ir_http.py +++ b/openerp/addons/base/ir/ir_http.py @@ -54,12 +54,26 @@ class ModelsConverter(werkzeug.routing.BaseConverter): def to_url(self, value): return ",".join(i.id for i in value) +class SignedIntConverter(werkzeug.routing.BaseConverter): + def __init__(self, url_map): + super(SignedIntConverter, self).__init__(url_map) + + def to_python(self, value): + try: + return int(value) + except ValueError: + raise werkzeug.routing.ValidationError() + + def to_url(self, value): + return value + + class ir_http(osv.AbstractModel): _name = 'ir.http' _description = "HTTP routing" def _get_converters(self): - return {'model': ModelConverter, 'models': ModelsConverter} + return {'model': ModelConverter, 'models': ModelsConverter, 'int': SignedIntConverter} def _find_handler(self, return_rule=False): return self.routing_map().bind_to_environ(request.httprequest.environ).match(return_rule=return_rule) From e0297244032130531afc6b2eb029895c67f5beda Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 9 Dec 2015 16:10:53 +0100 Subject: [PATCH 014/117] [FIX] web_calendar: safer evaluation of color filters In some loading cases, the all_filters may not be loaded yet so fail at the evaluation. Making it safer and check the content. opw 659052 --- addons/web_calendar/static/src/js/web_calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js index 4c4cc67afa5..f522e9e3164 100644 --- a/addons/web_calendar/static/src/js/web_calendar.js +++ b/addons/web_calendar/static/src/js/web_calendar.js @@ -630,7 +630,7 @@ var CalendarView = View.extend({ r.className = 'o_calendar_color_'+ this.get_color(color_key); } } else { // if form all, get color -1 - r.className = 'o_calendar_color_'+ self.all_filters[-1].color; + r.className = 'o_calendar_color_'+ self.all_filters[-1] ? self.all_filters[-1].color : 1; } return r; }, From 97b5e52a1a25e61d15d4e59b1a1720fe60e98fc6 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Wed, 9 Dec 2015 16:22:07 +0100 Subject: [PATCH 015/117] [FIX] base: override default int converter from werkzeug This reverts commit c01c10c4bd8adc13a0a043bd50e7157f89fec229. --- openerp/addons/base/ir/ir_http.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/openerp/addons/base/ir/ir_http.py b/openerp/addons/base/ir/ir_http.py index 9432c463045..9f08d09f170 100644 --- a/openerp/addons/base/ir/ir_http.py +++ b/openerp/addons/base/ir/ir_http.py @@ -54,26 +54,12 @@ class ModelsConverter(werkzeug.routing.BaseConverter): def to_url(self, value): return ",".join(i.id for i in value) -class SignedIntConverter(werkzeug.routing.BaseConverter): - def __init__(self, url_map): - super(SignedIntConverter, self).__init__(url_map) - - def to_python(self, value): - try: - return int(value) - except ValueError: - raise werkzeug.routing.ValidationError() - - def to_url(self, value): - return value - - class ir_http(osv.AbstractModel): _name = 'ir.http' _description = "HTTP routing" def _get_converters(self): - return {'model': ModelConverter, 'models': ModelsConverter, 'int': SignedIntConverter} + return {'model': ModelConverter, 'models': ModelsConverter} def _find_handler(self, return_rule=False): return self.routing_map().bind_to_environ(request.httprequest.environ).match(return_rule=return_rule) From 02174099e2d8b6727751a06527e9ac6c057a0b2f Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Wed, 9 Dec 2015 16:31:06 +0100 Subject: [PATCH 016/117] [FIX] gamification: goal definition for models without inherits When attempting to define a goal using a model that does not have any `inherits` - which happens most the time-, it was not possible to choose the `Field to Sum` and the `Date Field`, due to the domain set in the view which is no longer working in 9.0. The domain is no longer working because: - The onchange result for a one2many for which the value is set to `[(6, 0, [])]` is now `[]`, while, in 8.0, the tuple with the command `6` and the empty list was preserved - the empty list `model_inherited_model_ids` is considered as `True` by py.js, and therefore it fallbacks to `model_inherited_model_ids[0]`, but as this is an empty list, it crashes. The solution proposed in this revision solves the issue, while making the domain applied on these fields less fragile. opw-658892 --- addons/gamification/models/goal.py | 14 +++++++++----- addons/gamification/views/goal.xml | 13 ++----------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py index 5934c9a445b..2903814f9ba 100644 --- a/addons/gamification/models/goal.py +++ b/addons/gamification/models/goal.py @@ -2,7 +2,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from openerp import SUPERUSER_ID -from openerp.osv import fields, osv +from openerp.osv import fields, osv, expression from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF from openerp.tools.safe_eval import safe_eval from openerp.tools.translate import _ @@ -64,6 +64,8 @@ class gamification_goal_definition(osv.Model): 'model_id': fields.many2one('ir.model', string='Model', help='The model object for the field to evaluate'), + # model_inherited_model_ids can be removed in master. + # It was only used to force a domain in the form view which is now set by `on_change_model_id` 'model_inherited_model_ids': fields.related('model_id', 'inherited_model_ids', type="many2many", obj="ir.model", string="Inherited models", readonly="True"), 'field_id': fields.many2one('ir.model.fields', @@ -146,12 +148,14 @@ class gamification_goal_definition(osv.Model): return res def on_change_model_id(self, cr, uid, ids, model_id, context=None): - """Prefill field model_inherited_model_ids""" + """Force domain for the `field_id` and `field_date_id` fields""" if not model_id: - return {'value': {'model_inherited_model_ids': []}} + return {'domain': {'field_id': expression.FALSE_DOMAIN, 'field_date_id': expression.FALSE_DOMAIN}} model = self.pool['ir.model'].browse(cr, uid, model_id, context=context) - # format (6, 0, []) to construct the domain ('model_id', 'in', m and m[0] and m[0][2]) - return {'value': {'model_inherited_model_ids': [(6, 0, [m.id for m in model.inherited_model_ids])]}} + model_fields_domain = ['|', ('model_id', '=', model_id), ('model_id', 'in', model.inherited_model_ids.ids)] + model_date_fields_domain = expression.AND([[('ttype', 'in', ('date', 'datetime'))], model_fields_domain]) + return {'domain': {'field_id': model_fields_domain, 'field_date_id': model_date_fields_domain}} + class gamification_goal(osv.Model): """Goal instance for a user diff --git a/addons/gamification/views/goal.xml b/addons/gamification/views/goal.xml index 6c19e960cff..2b57c2aa071 100644 --- a/addons/gamification/views/goal.xml +++ b/addons/gamification/views/goal.xml @@ -246,18 +246,9 @@ - - + attrs="{'invisible':[('computation_mode','!=','sum')], 'required':[('computation_mode','=','sum')]}"/> + From 800ae13712e0e986f690f29ed3940410b5a750d5 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Wed, 9 Dec 2015 17:01:22 +0100 Subject: [PATCH 017/117] [FIX] base: override default int converter from werkzeug Default IntConverter (as well as Float, ...) doesn't support negative value by default with werkzeug. http://werkzeug.pocoo.org/docs/0.11/routing/ --- openerp/addons/base/ir/ir_http.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_http.py b/openerp/addons/base/ir/ir_http.py index 9f08d09f170..38e01d25b99 100644 --- a/openerp/addons/base/ir/ir_http.py +++ b/openerp/addons/base/ir/ir_http.py @@ -54,12 +54,26 @@ class ModelsConverter(werkzeug.routing.BaseConverter): def to_url(self, value): return ",".join(i.id for i in value) +class SignedIntConverter(werkzeug.routing.BaseConverter): + def __init__(self, url_map): + super(SignedIntConverter, self).__init__(url_map) + + def to_python(self, value): + try: + return int(value) + except ValueError: + raise werkzeug.routing.ValidationError() + + def to_url(self, value): + return str(value) + + class ir_http(osv.AbstractModel): _name = 'ir.http' _description = "HTTP routing" def _get_converters(self): - return {'model': ModelConverter, 'models': ModelsConverter} + return {'model': ModelConverter, 'models': ModelsConverter, 'int': SignedIntConverter} def _find_handler(self, return_rule=False): return self.routing_map().bind_to_environ(request.httprequest.environ).match(return_rule=return_rule) From 3e6f7c1e152d7b93fd7505046917d7b59552bee4 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Wed, 9 Dec 2015 18:44:05 +0100 Subject: [PATCH 018/117] [FIX] calendar: user multiple times in event attendees When creating a new event, with just you as attendee, then edit again the event and add someone else, the user is twice in the attendee of the event. This reverts the part done in `calendar.py` of revision 8483ca5 Even when you create an event for a job interview, this is not mandatory to set yourself as attendee. You can maybe be added by default, but you cannot force the user to be set as an attendee of the event. e.g. An HR officer can schedule a meeting for a job interview, with the department manager and the job applicant alone, without himself, thus. opw-658528 --- addons/calendar/calendar.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py index 642cb0e6007..596bdc5677f 100644 --- a/addons/calendar/calendar.py +++ b/addons/calendar/calendar.py @@ -1081,17 +1081,6 @@ class calendar_event(osv.Model): if self.pool['calendar.attendee']._send_mail_to_attendees(cr, uid, att_id, email_from=mail_from, context=context): self.message_post(cr, uid, event.id, body=_("An invitation email has been sent to attendee %s") % (partner.name,), subtype="calendar.subtype_invitation", context=context) - if current_user.partner_id.id not in new_att_partner_ids: - access_token = self.new_invitation_token(cr, uid, event, current_user.partner_id.id) - values = { - 'partner_id': current_user.partner_id.id, - 'event_id': event.id, - 'access_token': access_token, - 'email': current_user.partner_id.email, - } - current_user_att_id = self.pool['calendar.attendee'].create(cr, uid, values, context=context) - new_attendees.append(current_user_att_id) - new_att_partner_ids.append(current_user.partner_id.id) if new_attendees: self.write(cr, uid, [event.id], {'attendee_ids': [(4, att) for att in new_attendees]}, context=context) if new_att_partner_ids: From e86372c504a388e09aa2163e9eb4f6580754f1e4 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 9 Dec 2015 11:15:00 +0100 Subject: [PATCH 019/117] [FIX] website_blog: active text translation for blog content If translate=True AND if sanitize=True (By default sanitize=True) the html field use automatically html_translate method. --- addons/website_blog/models/website_blog.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/website_blog/models/website_blog.py b/addons/website_blog/models/website_blog.py index 49e1e0fbf23..cb2743b9652 100644 --- a/addons/website_blog/models/website_blog.py +++ b/addons/website_blog/models/website_blog.py @@ -9,6 +9,7 @@ from openerp import SUPERUSER_ID from openerp.addons.website.models.website import slug from openerp.osv import osv, fields from openerp.tools.translate import _ +from openerp.tools.translate import html_translate class Blog(osv.Model): @@ -103,7 +104,7 @@ class BlogPost(osv.Model): 'tag_ids': fields.many2many( 'blog.tag', string='Tags', ), - 'content': fields.html('Content', translate=True, sanitize=False), + 'content': fields.html('Content', translate=html_translate, sanitize=False), 'website_message_ids': fields.one2many( 'mail.message', 'res_id', domain=lambda self: [ From a93bd0fb68ddd207cbf218ac20c029c17bd54a7e Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 9 Dec 2015 16:55:42 +0100 Subject: [PATCH 020/117] [FIX] website_sale: active text translation for product description If translate=True AND if sanitize=True (By default sanitize=True) the html field use automatically html_translate method. --- addons/website_sale/models/product.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py index e88a02c61fd..201e4f48dd4 100644 --- a/addons/website_sale/models/product.py +++ b/addons/website_sale/models/product.py @@ -4,6 +4,7 @@ import openerp from openerp import tools from openerp.osv import osv, fields +from openerp.tools.translate import html_translate class product_style(osv.Model): _name = "product.style" @@ -105,7 +106,7 @@ class product_template(osv.Model): ], string='Website Comments', ), - 'website_description': fields.html('Description for the website', sanitize=False, translate=True), + 'website_description': fields.html('Description for the website', sanitize=False, translate=html_translate), 'alternative_product_ids': fields.many2many('product.template','product_alternative_rel','src_id','dest_id', string='Suggested Products', help='Appear on the product page'), 'accessory_product_ids': fields.many2many('product.product','product_accessory_rel','src_id','dest_id', string='Accessory Products', help='Appear on the shopping cart'), 'website_size_x': fields.integer('Size X'), From 5257721bef578d6a1121a0a0c9e3d4119da8def4 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 9 Dec 2015 17:00:17 +0100 Subject: [PATCH 021/117] [FIX] web_editor: translation feature for all string fields on website * add the branding in translation mode * change javascript to add the lang in the context (automatically removed in the rte => allow to create record and edit when use an other default language of en_US) * avoid double saved --- addons/web_editor/models/ir_qweb.py | 7 ++++ addons/web_editor/static/src/js/translator.js | 34 ++++++++++++++----- openerp/addons/base/ir/ir_qweb.py | 4 ++- 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/addons/web_editor/models/ir_qweb.py b/addons/web_editor/models/ir_qweb.py index e45167e0f17..5fdbd4ae209 100644 --- a/addons/web_editor/models/ir_qweb.py +++ b/addons/web_editor/models/ir_qweb.py @@ -28,6 +28,7 @@ from openerp.osv import orm, fields from openerp.tools import ustr, DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT from openerp.tools import html_escape as escape from openerp.addons.base.ir import ir_qweb +from openerp.tools.translate import translate REMOTE_CONNECTION_TIMEOUT = 2.5 @@ -82,6 +83,12 @@ class Field(orm.AbstractModel): if placeholder: attrs.append(('placeholder', placeholder)) + if context and context.get('edit_translations') and context.get('translatable') and field.type in ('char', 'text') and field.translate: + name = "%s,%s" % (record._model._name, field_name) + domain = [('name', '=', name), ('res_id', '=', record.id), ('type', '=', 'model'), ('lang', '=', context.get('lang'))] + translation = record.env['ir.translation'].search(domain, limit=1) + attrs.append(('data-oe-translation-state', translation and translation.state or 'to_translate')) + return itertools.chain( super(Field, self).attributes(cr, uid, field_name, record, options, source_element, g_att, t_att, diff --git a/addons/web_editor/static/src/js/translator.js b/addons/web_editor/static/src/js/translator.js index 0d41699c3f3..e170b1fddea 100644 --- a/addons/web_editor/static/src/js/translator.js +++ b/addons/web_editor/static/src/js/translator.js @@ -37,10 +37,12 @@ $.fn.extend({ var RTE_Translate = rte.Class.extend({ saveElement: function ($el, context) { // remove multi edition + var key = $el.data('oe-translation-id') ? 'translation:'+$el.data('oe-translation-id') : + ($el.data('oe-model') ? $el.data('oe-model')+":"+$el.data('oe-id')+":"+$el.data('oe-field')+":"+$el.data('oe-type')+":"+$el.data('oe-expression') : false); + if (!key || this.__saved[key]) return true; + this.__saved[key] = true; + if ($el.data('oe-translation-id')) { - var key = 'translation:'+$el.data('oe-translation-id'); - if (this.__saved[key]) return true; - this.__saved[key] = true; var translation_content = this.getEscapedElement($el).html(); return ajax.jsonRpc('/web/dataset/call', 'call', { @@ -48,13 +50,24 @@ var RTE_Translate = rte.Class.extend({ method: 'write', args: [ [+$el.data('oe-translation-id')], - {value: translation_content, state: 'translated'}, + {'value': translation_content, 'state': 'translated'}, + context || base.get_context() + ], + }); + } else { + var markup = this.getEscapedElement($el).prop('outerHTML'); + + return ajax.jsonRpc('/web/dataset/call', 'call', { + model: 'ir.ui.view', + method: 'save', + args: [ + $el.data('oe-id'), + markup, + $el.data('oe-xpath') || null, context || base.get_context() ], }); } - - return this._super.apply(this, arguments); }, }); @@ -107,7 +120,10 @@ var Translate = Widget.extend({ return this.edit(); }, setTarget: function ($target) { - this.$target = $target.find('[data-oe-translation-id], [data-oe-model][data-oe-id][data-oe-field]'); + var $edit = $target.find('[data-oe-translation-id], [data-oe-model][data-oe-id][data-oe-field]'); + $edit.filter(':has([data-oe-translation-id], [data-oe-model][data-oe-id][data-oe-field])').attr('data-oe-readonly', true); + + this.$target = $edit.not('[data-oe-readonly]'); // attributes @@ -192,7 +208,7 @@ var Translate = Widget.extend({ } event.preventDefault(); event.stopPropagation(); - if (event.type !== 'click') { + if (event.type !== 'mousedown') { return; } @@ -302,6 +318,8 @@ if (edit_translations) { $('form[action*=edit_translations]').each(function () { this.action = this.action.replace(/[$?]edit_translations[^&?]+/, ''); }); + + $('title').html($('title').html().replace(/<span data-oe-translation-id.+?>(.+?)<\/span>/, '\$1')); }); } diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py index 939af0c5286..c71ad97d313 100644 --- a/openerp/addons/base/ir/ir_qweb.py +++ b/openerp/addons/base/ir/ir_qweb.py @@ -635,7 +635,9 @@ class FieldConverter(osv.AbstractModel): if not inherit_branding and context and context.get('inherit_branding_auto'): inherit_branding = self.pool['ir.model.access'].check(cr, uid, record._name, 'write', False, context=context) - if inherit_branding: + translate = context and context.get('edit_translations') and context.get('translatable') and record._columns[field_name].translate + + if inherit_branding or translate: # add branding attributes g_att += ''.join( _build_attribute(name, value) From 2e074cb3051f5b439bfc809a81c41a9eb4fe3721 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 9 Dec 2015 17:01:53 +0100 Subject: [PATCH 022/117] [FIX] web_editor: don't display translation modal for attribute on tag who have content --- addons/web_editor/static/src/js/translator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_editor/static/src/js/translator.js b/addons/web_editor/static/src/js/translator.js index e170b1fddea..b9ed671020d 100644 --- a/addons/web_editor/static/src/js/translator.js +++ b/addons/web_editor/static/src/js/translator.js @@ -129,7 +129,7 @@ var Translate = Widget.extend({ var attrs = ['placeholder', 'title', 'alt']; _.each(attrs, function (attr) { - $target.find('['+attr+'*="data-oe-translation-id="]').each(function () { + $target.find('['+attr+'*="data-oe-translation-id="]').filter(':empty, input, select, textarea, img').each(function () { var $node = $(this); var translation = $node.data('translation') || {}; var trans = $node.attr(attr); From d8e5cdec7d5f4192fd48c2a74d0ce19cb051f1f9 Mon Sep 17 00:00:00 2001 From: Daniel Dico Date: Wed, 9 Dec 2015 18:22:38 -0500 Subject: [PATCH 023/117] [FIX] fix various Lucida misspellings closes #9997 --- addons/account/data/invoice_action_data.xml | 2 +- addons/calendar/calendar_data.xml | 42 +++++++++---------- addons/portal_sale/portal_sale_data.xml | 4 +- addons/purchase/data/mail_template_data.xml | 4 +- addons/sale/data/mail_template_data.xml | 2 +- .../data/website_quotation_data.xml | 2 +- openerp/addons/base/tests/test_mail.py | 2 +- .../addons/base/tests/test_mail_examples.py | 2 +- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/addons/account/data/invoice_action_data.xml b/addons/account/data/invoice_action_data.xml index 69380567fef..73339ca4809 100644 --- a/addons/account/data/invoice_action_data.xml +++ b/addons/account/data/invoice_action_data.xml @@ -16,7 +16,7 @@ Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''} ${object.partner_id.lang} +

Hello ${object.partner_id.name},

A new invoice is available for you:

diff --git a/addons/calendar/calendar_data.xml b/addons/calendar/calendar_data.xml index 3526e338aa3..d0bfb57cd1e 100644 --- a/addons/calendar/calendar_data.xml +++ b/addons/calendar/calendar_data.xml @@ -113,14 +113,14 @@ % if object.event_id.location: -
+
Where
% endif % if object.event_id.location: -
+
: ${object.event_id.location} (View Map) @@ -132,14 +132,14 @@ % if object.event_id.description : -
+
What
% endif % if object.event_id.description : -
+
: ${object.event_id.description}
% endif @@ -149,21 +149,21 @@ % if not object.event_id.allday and object.event_id.duration: -
+
Duration
% endif % if not object.event_id.allday and object.event_id.duration: -
+
: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
% endif - +
Attendees
@@ -238,14 +238,14 @@ % if object.event_id.location: -
+
Where
% endif % if object.event_id.location: -
+
: ${object.event_id.location} (View Map) @@ -257,14 +257,14 @@ % if object.event_id.description : -
+
What
% endif % if object.event_id.description : -
+
: ${object.event_id.description}
% endif @@ -274,21 +274,21 @@ % if not object.event_id.allday and object.event_id.duration: -
+
Duration
% endif % if not object.event_id.allday and object.event_id.duration: -
+
: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
% endif - +
Attendees
@@ -362,14 +362,14 @@ % if object.event_id.location: -
+
Where
% endif % if object.event_id.location: -
+
: ${object.event_id.location} (View Map) @@ -381,14 +381,14 @@ % if object.event_id.description : -
+
What
% endif % if object.event_id.description : -
+
: ${object.event_id.description}
% endif @@ -398,21 +398,21 @@ % if not object.event_id.allday and object.event_id.duration: -
+
Duration
% endif % if not object.event_id.allday and object.event_id.duration: -
+
: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
% endif - +
Attendees
diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml index 97416fd3f15..6ee95291fda 100644 --- a/addons/portal_sale/portal_sale_data.xml +++ b/addons/portal_sale/portal_sale_data.xml @@ -16,7 +16,7 @@ ${object.partner_id.lang} +

Hello ${object.partner_id.name},

@@ -98,7 +98,7 @@ Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''} ${object.partner_id.lang} +

Hello ${object.partner_id.name},

diff --git a/addons/purchase/data/mail_template_data.xml b/addons/purchase/data/mail_template_data.xml index 52cad8083e3..34184bd0dc6 100644 --- a/addons/purchase/data/mail_template_data.xml +++ b/addons/purchase/data/mail_template_data.xml @@ -14,7 +14,7 @@ RFQ_${(object.name or '').replace('/','_')} ${object.partner_id.lang} +

Hello ${object.partner_id.name},

@@ -77,7 +77,7 @@ PO_${(object.name or '').replace('/','_')} ${object.partner_id.lang} +

Hello ${object.partner_id.name},

diff --git a/addons/sale/data/mail_template_data.xml b/addons/sale/data/mail_template_data.xml index 8eb14889c3d..694d676b965 100644 --- a/addons/sale/data/mail_template_data.xml +++ b/addons/sale/data/mail_template_data.xml @@ -14,7 +14,7 @@ ${(object.name or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''} ${object.partner_id.lang} +

Hello ${object.partner_id.name},

diff --git a/addons/website_quote/data/website_quotation_data.xml b/addons/website_quote/data/website_quotation_data.xml index 4de0cd21482..d559befc5ea 100644 --- a/addons/website_quote/data/website_quotation_data.xml +++ b/addons/website_quote/data/website_quotation_data.xml @@ -102,7 +102,7 @@ ${object.partner_id.lang} +

Hello ${object.partner_id.name},

diff --git a/openerp/addons/base/tests/test_mail.py b/openerp/addons/base/tests/test_mail.py index 8186674b964..b9bfa5f9a79 100644 --- a/openerp/addons/base/tests/test_mail.py +++ b/openerp/addons/base/tests/test_mail.py @@ -102,7 +102,7 @@ class TestSanitizer(unittest.TestCase): def test_edi_source(self): html = html_sanitize(test_mail_examples.EDI_LIKE_HTML_SOURCE) - self.assertIn('div style="font-family: \'Lucica Grande\', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF;', html, + self.assertIn('div style="font-family: \'Lucida Grande\', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF;', html, 'html_sanitize removed valid style attribute') self.assertIn('', html, 'html_sanitize removed valid style attribute') diff --git a/openerp/addons/base/tests/test_mail_examples.py b/openerp/addons/base/tests/test_mail_examples.py index 3342876bf73..a78a5f45fc6 100644 --- a/openerp/addons/base/tests/test_mail_examples.py +++ b/openerp/addons/base/tests/test_mail_examples.py @@ -19,7 +19,7 @@ test12

test link """ -EDI_LIKE_HTML_SOURCE = """
+EDI_LIKE_HTML_SOURCE = """

Hello ${object.partner_id.name},

A new invoice is available for you:

From 12dad005089d158df7d03361ea13dd1186b487c0 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Tue, 8 Dec 2015 10:17:43 +0100 Subject: [PATCH 024/117] [FIX] account: fix problem with round_globally method in tax calculation When rounding globally, we should not round the tax with the currency rounding since it might introduce some errors. Also add the field on the company view for user to change the computation method as they want. --- addons/account/models/account.py | 5 ++++- addons/account/views/company_view.xml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/account/models/account.py b/addons/account/models/account.py index 7bf41e6ed3f..7c88e088c14 100644 --- a/addons/account/models/account.py +++ b/addons/account/models/account.py @@ -638,7 +638,10 @@ class AccountTax(models.Model): continue tax_amount = tax._compute_amount(base, price_unit, quantity, product, partner) - tax_amount = currency.round(tax_amount) + if company_id.tax_calculation_rounding_method == 'round_globally': + tax_amount = round(tax_amount, prec) + else: + tax_amount = currency.round(tax_amount) if tax_amount: if tax.price_include: diff --git a/addons/account/views/company_view.xml b/addons/account/views/company_view.xml index 06e1648b4a3..fe6bebbd2fa 100644 --- a/addons/account/views/company_view.xml +++ b/addons/account/views/company_view.xml @@ -13,6 +13,7 @@ + From 055f47ef416a47b3b3a62e22f954561fe0aff0ef Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Thu, 10 Dec 2015 08:49:17 +0100 Subject: [PATCH 025/117] [FIX] mrp: wizard Removes unnecessary separator and newline which prevent the product quantity to be displayed. opw-658281 --- addons/mrp/wizard/change_production_qty_view.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml index de72bc4fc87..ebe2bfd9585 100644 --- a/addons/mrp/wizard/change_production_qty_view.xml +++ b/addons/mrp/wizard/change_production_qty_view.xml @@ -10,8 +10,6 @@

- -
From 088db5896791d8bac74717a6be8d67d4531e05ab Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 10 Dec 2015 11:52:24 +0100 Subject: [PATCH 026/117] [FIX] account: when trying to reconcile an entry, if label is empty, by default it should be the name of the line It was the case in Saas-6 and prevent many mistakes --- addons/account/static/src/js/account_reconciliation_widgets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/static/src/js/account_reconciliation_widgets.js b/addons/account/static/src/js/account_reconciliation_widgets.js index 94ea596218f..bb815c653e0 100644 --- a/addons/account/static/src/js/account_reconciliation_widgets.js +++ b/addons/account/static/src/js/account_reconciliation_widgets.js @@ -1767,8 +1767,8 @@ var bankStatementReconciliationLine = abstractReconciliationLine.extend({ /** Creating */ initializeCreateForm: function() { - this.label_field.set("value", this.st_line.name); this._super(); + this.label_field.set("value", this.st_line.name); }, From 6ff9015ae6af9360f25e67498b584354ea665229 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 10 Dec 2015 12:27:42 +0100 Subject: [PATCH 027/117] [FIX] crm: Leads analysis graph view there is no longer any graph view with as type "pivot". Manual forward-port of 74b4f5d2eaa7f241d7954cabe772b43fd964e58f which has been forgotten in previous forward-port. --- addons/crm/report/crm_activity_report_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/report/crm_activity_report_view.xml b/addons/crm/report/crm_activity_report_view.xml index 5ba2f13e8e2..b38a5afd277 100644 --- a/addons/crm/report/crm_activity_report_view.xml +++ b/addons/crm/report/crm_activity_report_view.xml @@ -6,7 +6,7 @@ crm.activity.report.graph crm.activity.report - + From 915e41b19aaeb92028118a43546b1e3dd8827c1e Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 10 Dec 2015 13:35:46 +0100 Subject: [PATCH 028/117] [FIX] website_mail_channel: number of members in channel The members of a channel are stored in channel_partner_ids, they are no longer a follower of the object (message_follower_ids) --- addons/website_mail_channel/views/website_mail_channel.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_mail_channel/views/website_mail_channel.xml b/addons/website_mail_channel/views/website_mail_channel.xml index 498e4e79aaa..33624270cf1 100644 --- a/addons/website_mail_channel/views/website_mail_channel.xml +++ b/addons/website_mail_channel/views/website_mail_channel.xml @@ -50,7 +50,7 @@
- members
+ members
messages / month
From 5b2e7943cceb3570598b5b38ae9f4567be45747a Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 10 Dec 2015 14:48:25 +0100 Subject: [PATCH 029/117] [I18N] mail: export source terms To reflect all the recent changes in mail module --- addons/mail/i18n/mail.pot | 239 +++++++++++++++++++++++++------------- 1 file changed, 156 insertions(+), 83 deletions(-) diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot index 3b802987106..fae4c77ded0 100644 --- a/addons/mail/i18n/mail.pot +++ b/addons/mail/i18n/mail.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-09 09:18+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-10 13:38+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -25,10 +25,10 @@ msgid "\n" " \n" "
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -50,7 +50,7 @@ msgid "\n" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -127,6 +127,13 @@ msgstr "" msgid "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -134,7 +141,7 @@ msgid "%s (copy)" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -147,9 +154,9 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -410,7 +417,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -528,16 +535,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -757,6 +754,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -921,19 +925,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "Did you know ? Type '@someone' in the composer to cite someone in your message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1394,13 +1393,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1433,13 +1425,20 @@ msgid "Invalid expression, it must be a literal python dictionary definition e.g msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "Invalid record set: should be called as model (without records) or on single-record recordset" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1496,6 +1495,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1665,6 +1669,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1685,13 +1696,6 @@ msgstr "" msgid "Members of those groups will automatically added as followers. Note that they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1890,12 +1894,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1905,11 +1923,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2260,23 +2299,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2738,11 +2765,6 @@ msgid "The values displayed hereunder are informative. When sending the email, t " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "This field holds the image used as photo for the group, limited to 1024x1024px." @@ -2785,6 +2807,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2841,8 +2870,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2871,28 +2907,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -2963,9 +3006,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -2975,6 +3025,13 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3009,17 +3066,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "Your template does not defined the email address of the sender. Please update your template." @@ -3036,6 +3087,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3043,13 +3099,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" @@ -3081,6 +3137,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3088,7 +3151,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3113,11 +3176,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 From b00d070b519186535c761d06d0f6fe44b10b72d3 Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Wed, 9 Dec 2015 16:40:53 +0100 Subject: [PATCH 030/117] [FIX] sale: delivred qty in SO line not updated When making a account.analytic.line(aal) which matches with a SO line with a product set with invoice_policy != 'cost' then these aal have to be linked to this SO line. opw:658821 --- addons/sale/sale_analytic.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/sale/sale_analytic.py b/addons/sale/sale_analytic.py index 37f437b3158..4741e1a5728 100644 --- a/addons/sale/sale_analytic.py +++ b/addons/sale/sale_analytic.py @@ -84,10 +84,11 @@ class AccountAnalyticLine(models.Model): # Use the existing SO line only if the unit prices are the same, otherwise we create # a new line for line in so_lines: - if line.price_unit == self._get_invoice_price(line.order_id): + if line.product_id.invoice_policy != 'cost' or (line.product_id.invoice_policy == 'cost' and line.price_unit == self._get_invoice_price(line.order_id)): result.update({'so_line': line.id}) so_line = line break + else: # This will trigger the creation of a new SO line so_line = False From b72a3b67f8fe04eea29118b13c5d2ac000370938 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 10 Dec 2015 13:16:20 +0100 Subject: [PATCH 031/117] [FIX] web_editor: remove exceed span on paste html content --- addons/web_editor/static/src/js/summernote.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/addons/web_editor/static/src/js/summernote.js b/addons/web_editor/static/src/js/summernote.js index ff509800c50..2b2c26bfb68 100644 --- a/addons/web_editor/static/src/js/summernote.js +++ b/addons/web_editor/static/src/js/summernote.js @@ -2336,8 +2336,8 @@ function summernote_paste (event) { $node.find('*').each(function() { var $node = $(this); - if ($(this).attr('style')) { - var style = _.filter($(this).attr('style').split(/\s*;\s*/), function (style) { + if ($node.attr('style')) { + var style = _.filter($node.attr('style').split(/\s*;\s*/), function (style) { return /width|height|color|background-color|font-weight|text-align|font-style|text-decoration/i.test(style) && $node.css(style.split(':')[0]) !== $('body').css(style.split(':')[0]); }).join(';'); if (style.length) { @@ -2347,8 +2347,8 @@ function summernote_paste (event) { } } - if ($(this).attr('class')) { - var classes = _.filter($(this).attr('class').split(/\s+/), function (style) { + if ($node.attr('class')) { + var classes = _.filter($node.attr('class').split(/\s+/), function (style) { return /(^|\s)(fa|pull|text|bg)(\s|-|$)/.test(style); }).join(' '); if (classes.length) { @@ -2365,6 +2365,12 @@ function summernote_paste (event) { $node.find('span:not([class]):not([style])').each(function () { $(this).replaceWith($(this).contents()); }); + $node.find('span + span').each(function () { + if ($(this).attr('class') === $(this).prev().attr('class') && $(this).attr('style') === $(this).prev().attr('style')) { + $(this).prev().append($(this).contents()); + $(this).remove(); + } + }); /* reset architecture HTML node and add

tag From 6cc99df83e9b72436ba5d79b7ad2829d73ec5a2f Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 10 Dec 2015 13:18:54 +0100 Subject: [PATCH 032/117] [FIX] web_editor: error when paste without any content in clipboard --- addons/web_editor/static/src/js/summernote.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_editor/static/src/js/summernote.js b/addons/web_editor/static/src/js/summernote.js index 2b2c26bfb68..a6f0e4aaa99 100644 --- a/addons/web_editor/static/src/js/summernote.js +++ b/addons/web_editor/static/src/js/summernote.js @@ -2298,7 +2298,7 @@ function summernote_paste (event) { // keep norma feature if copy a picture var clipboardData = event.originalEvent.clipboardData; - if (clipboardData.items) { + if (!_.isEmpty(clipboardData.items)) { var item = list.last(clipboardData.items); var isClipboardImage = item.kind === 'file' && item.type.indexOf('image/') !== -1; if (isClipboardImage) { From 3c64ee45a1edbea13ad692e788af7b52417281ea Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 10 Dec 2015 14:32:13 +0100 Subject: [PATCH 033/117] [FIX] web_editor: enter in a p tag empty (when user change with code view) can be raise an exception --- addons/web_editor/static/src/js/summernote.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_editor/static/src/js/summernote.js b/addons/web_editor/static/src/js/summernote.js index a6f0e4aaa99..14db16a831c 100644 --- a/addons/web_editor/static/src/js/summernote.js +++ b/addons/web_editor/static/src/js/summernote.js @@ -1115,7 +1115,7 @@ $.summernote.pluginEvents.enter = function (event, editor, layoutInfo) { $(node).html(br); node = br; } else { - node = dom.splitTree(last, {'node': r.sc, 'offset': r.so}); + node = dom.splitTree(last, {'node': r.sc, 'offset': r.so}) || r.sc; if (!contentBefore) { var cur = dom.node(dom.lastChild(node.previousSibling)); if (!dom.isBR(cur)) { From 87090c1b8b55363efd14abf30ea11da3706c4a00 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 Dec 2015 15:18:54 +0100 Subject: [PATCH 034/117] [FIX] event header date on website t-field expects a UTC datetime which it then localizes to the current viewer's timezone (using context tz from the browser), but goal here was to display the event's own local time, so t-field was provided an already localized datetime and would parse it as UTC then re-offset it based on the user's timezone, resulting in a completely nonsensical displayed datetime. Just display the localized datetime without reprocessing it (save to slice off the seconds count) --- addons/website_event/views/website_event.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index c9290869c2f..c4e4d41310c 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -262,8 +262,9 @@

- to - + + to + ()

Date: Thu, 10 Dec 2015 15:50:10 +0100 Subject: [PATCH 035/117] [FIX] web_editor: keep inline editor line spacing opw-657955 --- addons/web_editor/static/src/js/backend.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js index 0cd7541c7e2..17a2df31c6e 100644 --- a/addons/web_editor/static/src/js/backend.js +++ b/addons/web_editor/static/src/js/backend.js @@ -97,8 +97,8 @@ var FieldTextHtmlSimple = widget.extend({ if (value.match(/^\s*$/)) { value = '


'; } else { - value = "

"+value.split(//).join("

")+"

"; - value = value.replace('

', '

').replace('

', '

'); + value = "

"+value.split(//).join("

")+"

"; + value = value.replace(/

<\/p>/g, '').replace('

', '

').replace('

', '

'); } return value; }, From 4bebbfdcf5e50643f136c7b297697715fa6b3087 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 10 Dec 2015 16:01:03 +0100 Subject: [PATCH 036/117] [FIX] mail: jinja2 code compatible with wysiwyg for notifications When editing an email template with the wysiwyg, the `<` and `>` operators are automatically converted to `<` and `>`, even for the Jinja2 conditions, therefore breaking these conditions, and the render of the email templates. We avoid to use these operators in the email template, so users can customize the notification email template without having an advanced knowledge on how to edit an email template containing Jinja2 code. Besides, the line return at the end of the email template, just after the `% endif`, is done on purpose as well: the wysiwyg adds automatically, at the time of this revision, `

` at the end of the email template source, but this cannot be added on the same line than `% endif`, otherwise this is considered as Jinja2 code, and it's not. opw-659113 --- addons/mail/data/mail_data.xml | 10 ++++++---- addons/mail/models/mail_template.py | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index 2b2f389726b..327c776b987 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -83,7 +83,7 @@ % endif % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'): -

+

About ${ctx['model_name']} % if ctx.get('record_name'): : ${ctx['record_name']} @@ -97,7 +97,7 @@ % if ctx.get('actions'): % for action in ctx['actions']: ${action['title']} - %if len(ctx['actions']) > 1 and loop.index < len(ctx['actions']): + %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1: | % endif % endfor @@ -113,6 +113,7 @@ using Odoo % endif +

@@ -136,7 +137,7 @@ % if ctx.get('tracking'):
    % for tracking in ctx['tracking'] -
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • +
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • % endfor
% endif @@ -154,7 +155,8 @@
-% endif]]> +% endif +]]> diff --git a/addons/mail/models/mail_template.py b/addons/mail/models/mail_template.py index 19aee797c3b..3117b571ed6 100644 --- a/addons/mail/models/mail_template.py +++ b/addons/mail/models/mail_template.py @@ -77,6 +77,7 @@ try: 'reduce': reduce, 'map': map, 'round': round, + 'cmp': cmp, # dateutil.relativedelta is an old-style class and cannot be directly # instanciated wihtin a jinja2 expression, so a lambda "proxy" is From 4432639fb552f2008b920f0d37d2c659129eadcb Mon Sep 17 00:00:00 2001 From: Nicolas Lempereur Date: Tue, 1 Dec 2015 12:41:01 +0100 Subject: [PATCH 037/117] [IMP] web_kanban: refresh kanban view after fail If a kanban tile is moved to another column, in case of failure it would stay in that column giving the false idea that it somewhat worked. This commit refresh the kanban view in such an instance. closes #9837 first half of opw-657863 --- addons/web_kanban/static/src/js/kanban_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/js/kanban_view.js b/addons/web_kanban/static/src/js/kanban_view.js index 1dc450ebb35..6600dc8a0c8 100644 --- a/addons/web_kanban/static/src/js/kanban_view.js +++ b/addons/web_kanban/static/src/js/kanban_view.js @@ -627,7 +627,7 @@ var KanbanView = View.extend({ self.reload_record(record); self.resequence_column(column); } - }); + }).fail(this.do_reload); }, update_record: function(event) { From 3d32e9966500290f35e6edfebf97b9a60a1fc495 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Thu, 10 Dec 2015 18:43:12 +0100 Subject: [PATCH 038/117] [FIX] mail.thread: optimize lookup of res.users by email Searching on res.partners with domain [('user_ids' , '!=', False)] will currently be translated into a huge "ID IN <...>" query, with the IDs of all existing users. On a database with a lot of users, this can be measured in seconds (e.g. 3-4 seconds with 500k+ users), leading to significant delays in email delivery. Using a direct lookup in res.users is more direct and faster. --- addons/mail/models/mail_thread.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index f97978b47b0..9f9e7294146 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -1475,6 +1475,7 @@ class MailThread(models.AbstractModel): followers = record.message_partner_ids Partner = self.env['res.partner'].sudo() + Users = self.env['res.users'].sudo() partner_ids = [] for contact in emails: @@ -1495,10 +1496,10 @@ class MailThread(models.AbstractModel): email_brackets = "<%s>" % email_address if not partner_id: # exact, case-insensitive match - partners = Partner.search([('email', '=ilike', email_address), ('user_ids', '!=', False)], limit=1) + partners = Users.search([('email', '=ilike', email_address)], limit=1).mapped('partner_id') if not partners: # if no match with addr-spec, attempt substring match within name-addr pair - partners = Partner.search([('email', 'ilike', email_brackets), ('user_ids', '!=', False)], limit=1) + partners = Users.search([('email', 'ilike', email_brackets)], limit=1).mapped('partner_id') if partners: partner_id = partners[0].id # third try: check in partners From 147a4efaeaba2d89872815f106e5b295a99c2b5e Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 11 Dec 2015 02:00:36 +0100 Subject: [PATCH 039/117] [IMP] Cleaning notes --- addons/note/note_view.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml index f8923838ff6..ec63b4ed313 100644 --- a/addons/note/note_view.xml +++ b/addons/note/note_view.xml @@ -76,11 +76,13 @@ -
- - - -
+ +
+ + + +
+
From 2f19fdc3c036c918b92049f7b13329e2213c843e Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 11 Dec 2015 02:53:15 +0100 Subject: [PATCH 040/117] [FIX] Misc livechat fixes: bugfix in search view, history accessible, better form view --- .../im_livechat/views/mail_channel_views.xml | 43 ++++++++++++------- addons/rating/views/rating_view.xml | 2 +- .../views/website_livechat.xml | 2 - 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/addons/im_livechat/views/mail_channel_views.xml b/addons/im_livechat/views/mail_channel_views.xml index 159e6d7695d..aa881ef0761 100644 --- a/addons/im_livechat/views/mail_channel_views.xml +++ b/addons/im_livechat/views/mail_channel_views.xml @@ -7,9 +7,9 @@ mail.channel - + - + @@ -25,9 +25,8 @@ mail.channel - - - + + @@ -39,12 +38,11 @@ - - - - + + + - + @@ -67,9 +65,9 @@ - - - + + + @@ -82,10 +80,25 @@ History mail.channel form - list,form + tree,form + [('livechat_channel_id', '!=', None)] - {'group_by': ['livechat_channel_id', 'create_date:month']} + {} + + 1 + tree + + + + + + 2 + form + + + + Sessions diff --git a/addons/rating/views/rating_view.xml b/addons/rating/views/rating_view.xml index 1455e3f470a..d123be23ed6 100644 --- a/addons/rating/views/rating_view.xml +++ b/addons/rating/views/rating_view.xml @@ -16,7 +16,7 @@ -
+
- -