~fabien-morin/unifield-web/fm-us-2925

« back to all changes in this revision

Viewing changes to addons/openerp/controllers/actions.py

  • Committer: jf
  • Date: 2017-04-07 12:30:12 UTC
  • mfrom: (4840.2.1 unifield-web)
  • Revision ID: jfb@tempo-consulting.fr-20170407123012-7p515iovr496fbh2
Tags: uf4.1, uf4.1rc1
US-2457 [FIX] Analytic Lines Export Search Result: don't lose the original domain when search criteria are selected

lp:~julie-w/unifield-web/US-2457

Show diffs side-by-side

added added

removed removed

Lines of Context:
211
211
        ctx.update(datas.get('context', {}))
212
212
        if is_server_local():
213
213
            ctx['report_fromfile'] = 1
 
214
        # Use not only the domain corresponding to the filters selected but also the original domain for the view
 
215
        # (for instance from AJI View: get only FP lines and not Free1/2)
 
216
        if ctx.get('original_domain', False) and ctx.get('search_domain', False):
 
217
            ctx['search_domain'].extend(ctx['original_domain'])
214
218
        report_id = rpc.session.execute('report', 'report', name, ids, datas, ctx)
215
219
        state = False
216
220
        attempt = 0