Merge lp:~julie-w/unifield-server/US-3799 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account_mcdb/wizard/output_currency_for_export.py'
--- bin/addons/account_mcdb/wizard/output_currency_for_export.py	2017-11-24 10:18:02 +0000
+++ bin/addons/account_mcdb/wizard/output_currency_for_export.py	2018-03-01 09:44:14 +0000
@@ -133,6 +133,10 @@
                 # get the ids of the entries and the header to display
                 # (for gl.selector/analytic.selector report if we come from JI/AJI view)
             dom = context.get('search_domain', [])
+            if context.get('original_domain'):
+                dom.extend(context['original_domain'])
+            if context.get('new_filter_domain'):
+                dom.extend(context['new_filter_domain'])
             if model == 'account.move.line':
                 dom.append(('period_id.number', '!=', 0))  # exclude IB entries
             export_obj = self.pool.get(model)