From 9f66f98520b89dd66290b7bdc52231b9ee910b9a Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Wed, 26 Nov 2014 10:06:22 +0100 Subject: [PATCH 1/4] [FIX] marketing_campaign: typo in manifest --- addons/marketing_campaign/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py index a51347fd1bbe4..22ed4abaef1ef 100644 --- a/addons/marketing_campaign/__openerp__.py +++ b/addons/marketing_campaign/__openerp__.py @@ -40,7 +40,7 @@ send, reports to print and send by email, custom actions * Define input segments that will select the items that should enter the campaign (e.g leads from certain countries.) - * Run you campaign in simulation mode to test it real-time or accelerated, + * Run your campaign in simulation mode to test it real-time or accelerated, and fine-tune it * You may also start the real campaign in manual mode, where each action requires manual validation From 34da02e730f18b6f314001578bcbc0eb1be985ad Mon Sep 17 00:00:00 2001 From: Danimar Ribeiro Date: Tue, 25 Nov 2014 16:25:03 -0200 Subject: [PATCH 2/4] [FIX] l10n_br: remove reference to old base.group_extended group Fixes #3879 --- addons/l10n_br/account_view.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/l10n_br/account_view.xml b/addons/l10n_br/account_view.xml index 4eaffd3e27aeb..0dd246eb3e81f 100644 --- a/addons/l10n_br/account_view.xml +++ b/addons/l10n_br/account_view.xml @@ -34,14 +34,14 @@ - + - - - + + + @@ -52,14 +52,14 @@ - + - - - + + + From e2dd18f1e7304040974a81cfacce96848eb89719 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Wed, 26 Nov 2014 12:28:45 +0100 Subject: [PATCH 3/4] [FIX] mrp: prevent recursion from phantom boms with no lines if the bom is phantom and has no line, we attempt to find a new bom with the default product uom This is possible that we find the same bom that the current one In such a case, we must not explode, to avoid recursion. --- addons/mrp/mrp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 45b2bcbc04740..67f36579f1260 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -334,7 +334,7 @@ def _bom_explode(self, cr, uid, bom, factor, properties=None, addthis=False, lev if bom.type == 'phantom' and not bom.bom_lines: newbom = self._bom_find(cr, uid, bom.product_id.id, bom.product_uom.id, properties) - if newbom: + if newbom and newbom != bom.id: res = self._bom_explode(cr, uid, self.browse(cr, uid, [newbom])[0], factor*bom.product_qty, properties, addthis=True, level=level+10) result = result + res[0] result2 = result2 + res[1] From f0e331e005d830d8b5aaa4cb5e2824d98bd75b2a Mon Sep 17 00:00:00 2001 From: Pierre Verkest Date: Thu, 6 Nov 2014 16:18:33 +0100 Subject: [PATCH 4/4] [FIX] correctly update many2many in listview (web client) Fixes the issue #1216 (follow the link for more information). The issue was caused by a hack in list view: the magical suffix __display is used in render_cell to determine if a many2many field should be updated. This commit simply makes sure that old many2many fields + __display keys are cleared. A better way would be to redesign/refactor the list view to avoid that hack in the first place. But this would be a much more complex task. --- addons/web/static/src/js/view_list.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 52124d5f8963e..f9c857c957c2f 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -541,8 +541,9 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi self.records.remove(record); return; } - _(_.keys(values)).each(function(key){ - record.set(key, values[key], {silent: true}); + _.each(values, function (value, key) { + record.set(key + '__display', false, {silent: true}); + record.set(key, value, {silent: true}); }); record.trigger('change', record); });