Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-9736 into lp:unifield-server

  1. US-9736
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 6197
Proposed branch: lp:~dorian-kemps/unifield-server/US-9736
Merge into: lp:unifield-server
Diff against target: 27 lines (+6/-0)
2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+5/-0)
bin/addons/msf_profile/user_access_configurator_view.xml (+1/-0)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-9736
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+417048@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/msf_profile/i18n/fr_MF.po'
2--- bin/addons/msf_profile/i18n/fr_MF.po 2022-03-02 17:30:56 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2022-03-17 16:06:44 +0000
4@@ -89653,6 +89653,11 @@
5 msgid "Show synchronized"
6 msgstr "Montrer synchronisés"
7
8+#. module: msf_profile
9+#: view:res.users:0
10+msgid "Show not synchronized"
11+msgstr "Montrer non synchronisés"
12+
13 #. modules: purchase, tender_flow
14 #: view:purchase.report:0
15 #: field:purchase.report,partner_zone:0
16
17=== modified file 'bin/addons/msf_profile/user_access_configurator_view.xml'
18--- bin/addons/msf_profile/user_access_configurator_view.xml 2019-06-18 12:26:14 +0000
19+++ bin/addons/msf_profile/user_access_configurator_view.xml 2022-03-17 16:06:44 +0000
20@@ -391,6 +391,7 @@
21 <filter name="inactive" string="Inactive" icon="terp-personal-" domain="[('active', '=', False)]" />
22 <separator orientation="vertical"/>
23 <filter name="show_synchronized" string="Show synchronized" icon="gtk-ok" domain="[('synchronize', '=', True)]"/>
24+ <filter name="show_not_synchronized" string="Show not synchronized" icon="gtk-cancel" domain="[('synchronize', '=', False)]"/>
25 <field name="name" />
26 <field name="login" />
27 <field name="address_id" string="Address" />

Subscribers

People subscribed via source and target branches