Unifield Web

Merge lp:~fabien-morin/unifield-web/fm-us-2023 into lp:unifield-web

  1. fm-us-2023
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4826
Proposed branch: lp:~fabien-morin/unifield-web/fm-us-2023
Merge into: lp:unifield-web
Diff against target: 12 lines (+1/-1)
1 file modified
addons/openerp/controllers/actions.py (+1/-1)
To merge this branch: bzr merge lp:~fabien-morin/unifield-web/fm-us-2023
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+311839@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/controllers/actions.py'
2--- addons/openerp/controllers/actions.py 2016-11-09 14:56:17 +0000
3+++ addons/openerp/controllers/actions.py 2016-11-25 16:07:27 +0000
4@@ -217,7 +217,7 @@
5 val = None
6 bg_report = False
7 background_id = ctx.get('background_id')
8- max_attempt = ctx.get('background_time', 300)
9+ max_attempt = ctx.get('background_time', 600)
10 report_name = 'report'
11
12 if name != 'custom':

Subscribers

People subscribed via source and target branches