Unifield Server

Merge lp:~fabien-morin/unifield-server/fm-us-3381 into lp:unifield-server

  1. fm-us-3381
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4565
Proposed branch: lp:~fabien-morin/unifield-server/fm-us-3381
Merge into: lp:unifield-server
Diff against target: 39 lines (+4/-3)
3 files modified
bin/addons/base/ir/ir_actions.py (+1/-1)
bin/addons/msf_profile/i18n/fr_MF.po (+2/-2)
bin/addons/sync_client/monitor_view.xml (+1/-0)
To merge this branch: bzr merge lp:~fabien-morin/unifield-server/fm-us-3381
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+331318@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 'bin/addons/base/ir/ir_actions.py'
2--- bin/addons/base/ir/ir_actions.py 2017-05-18 12:16:12 +0000
3+++ bin/addons/base/ir/ir_actions.py 2017-09-26 07:32:06 +0000
4@@ -296,7 +296,7 @@
5 'views': fields.function(_views_get_fnc, method=True, type='binary', string='Views'),
6 'limit': fields.integer('Limit', help='Default limit for the list view'),
7 'auto_refresh': fields.integer('Auto-Refresh',
8- help='Add an auto-refresh on the view'),
9+ help='Auto refresh the view after X seconds'),
10 'groups_id': fields.many2many('res.groups', 'ir_act_window_group_rel',
11 'act_id', 'gid', 'Groups'),
12 'search_view_id': fields.many2one('ir.ui.view', 'Search View Ref.'),
13
14=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
15--- bin/addons/msf_profile/i18n/fr_MF.po 2017-09-08 15:57:28 +0000
16+++ bin/addons/msf_profile/i18n/fr_MF.po 2017-09-26 07:32:06 +0000
17@@ -78049,8 +78049,8 @@
18
19 #. module: base
20 #: help:ir.actions.act_window,auto_refresh:0
21-msgid "Add an auto-refresh on the view"
22-msgstr "Ajouter un rafraichissement automatique sur la vue"
23+msgid "Auto refresh the view after X seconds"
24+msgstr "Rafraichir automatiquement la vue après X secondes"
25
26 #. module: supplier_catalogue
27 #: model:ir.actions.server,name:supplier_catalogue.action_server_export_catalogue_lines
28
29=== modified file 'bin/addons/sync_client/monitor_view.xml'
30--- bin/addons/sync_client/monitor_view.xml 2016-06-02 08:33:07 +0000
31+++ bin/addons/sync_client/monitor_view.xml 2017-09-26 07:32:06 +0000
32@@ -94,6 +94,7 @@
33 <field name="view_type">form</field>
34 <field name="view_mode">tree,form</field>
35 <field name="domain">[('my_instance', '=', True)]</field>
36+ <field name="auto_refresh">20</field>
37 </record>
38
39 <menuitem id="sync_monitor_menu" name="Synchronisation Processes Monitor"

Subscribers

People subscribed via source and target branches