Skip to content

Commit 24ff5e1

Browse files
bt-adminbt-admin
authored
Merge pull request #413 from OCA/18.0
Syncing from upstream OCA/server-backend (18.0)
2 parents 76f9cab + 1eacf96 commit 24ff5e1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+2103
-9
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ addon | version | maintainers | summary
2525
[base_external_dbsource_mysql](base_external_dbsource_mysql/) | 18.0.1.0.0 | | External Database Source - MySQL
2626
[base_global_discount](base_global_discount/) | 18.0.1.0.0 | | Base Global Discount
2727
[base_import_match](base_import_match/) | 18.0.1.0.0 | | Try to avoid duplicates before importing
28-
[base_user_role](base_user_role/) | 18.0.1.0.4 | <a href='https://github.com/sebalix'><img src='https://github.com/sebalix.png' width='32' height='32' style='border-radius:50%;' alt='sebalix'/></a> <a href='https://github.com/jcdrubay'><img src='https://github.com/jcdrubay.png' width='32' height='32' style='border-radius:50%;' alt='jcdrubay'/></a> <a href='https://github.com/novawish'><img src='https://github.com/novawish.png' width='32' height='32' style='border-radius:50%;' alt='novawish'/></a> | User roles
28+
[base_user_role](base_user_role/) | 18.0.1.0.5 | <a href='https://github.com/sebalix'><img src='https://github.com/sebalix.png' width='32' height='32' style='border-radius:50%;' alt='sebalix'/></a> <a href='https://github.com/jcdrubay'><img src='https://github.com/jcdrubay.png' width='32' height='32' style='border-radius:50%;' alt='jcdrubay'/></a> <a href='https://github.com/novawish'><img src='https://github.com/novawish.png' width='32' height='32' style='border-radius:50%;' alt='novawish'/></a> | User roles
2929
[base_user_role_company](base_user_role_company/) | 18.0.1.0.2 | | User roles by company
3030
[base_user_role_history](base_user_role_history/) | 18.0.1.0.0 | <a href='https://github.com/ThomasBinsfeld'><img src='https://github.com/ThomasBinsfeld.png' width='32' height='32' style='border-radius:50%;' alt='ThomasBinsfeld'/></a> | This module allows to track the changes on users roles.
3131
[server_action_sort](server_action_sort/) | 18.0.1.0.0 | <a href='https://github.com/legalsylvain'><img src='https://github.com/legalsylvain.png' width='32' height='32' style='border-radius:50%;' alt='legalsylvain'/></a> | Sort any lines of any models by any criterias

‎base_user_role/README.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ User roles
1111
!! This file is generated by oca-gen-addon-readme !!
1212
!! changes will be overwritten. !!
1313
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
14-
!! source digest: sha256:0d45d0283ade4a3ae49f1fb94c858e774f236679fb4dec722d467190bbb58c0f
14+
!! source digest: sha256:b3aa00f609d45dcd82a69b2a3e13b327096ab1d25883b543e3e45538e854d40c
1515
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1616
1717
.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png

‎base_user_role/__manifest__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
{
66
"name": "User roles",
7-
"version": "18.0.1.0.4",
7+
"version": "18.0.1.0.5",
88
"category": "Tools",
99
"author": "ABF OSIELL, Odoo Community Association (OCA)",
1010
"license": "LGPL-3",
@@ -16,6 +16,7 @@
1616
"security/ir.model.access.csv",
1717
"data/ir_cron.xml",
1818
"data/ir_module_category.xml",
19+
"wizards/role_add_users_wizard_views.xml",
1920
"views/role.xml",
2021
"views/user.xml",
2122
"views/group.xml",

‎base_user_role/i18n/am.po‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,17 @@ msgstr ""
7171
msgid "Active"
7272
msgstr ""
7373

74+
#. module: base_user_role
75+
#: model:ir.actions.act_window,name:base_user_role.action_add_multiple_users_wizard
76+
#: model_terms:ir.ui.view,arch_db:base_user_role.view_res_users_role_form
77+
msgid "Add Multiple Users"
78+
msgstr ""
79+
80+
#. module: base_user_role
81+
#: model_terms:ir.ui.view,arch_db:base_user_role.view_res_users_role_add_users_wizard
82+
msgid "Add Users"
83+
msgstr ""
84+
7485
#. module: base_user_role
7586
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__category_id
7687
msgid "Application"
@@ -98,6 +109,7 @@ msgstr ""
98109

99110
#. module: base_user_role
100111
#: model_terms:ir.ui.view,arch_db:base_user_role.group_groups_into_role_wiz_view
112+
#: model_terms:ir.ui.view,arch_db:base_user_role.view_res_users_role_add_users_wizard
101113
msgid "Cancel"
102114
msgstr ""
103115

@@ -141,6 +153,7 @@ msgstr ""
141153
#. module: base_user_role
142154
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__create_uid
143155
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__create_uid
156+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__create_uid
144157
#: model:ir.model.fields,field_description:base_user_role.field_wizard_create_role_from_user__create_uid
145158
#: model:ir.model.fields,field_description:base_user_role.field_wizard_groups_into_role__create_uid
146159
msgid "Created by"
@@ -149,6 +162,7 @@ msgstr "Creado por"
149162
#. module: base_user_role
150163
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__create_date
151164
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__create_date
165+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__create_date
152166
#: model:ir.model.fields,field_description:base_user_role.field_wizard_create_role_from_user__create_date
153167
#: model:ir.model.fields,field_description:base_user_role.field_wizard_groups_into_role__create_date
154168
msgid "Created on"
@@ -164,6 +178,7 @@ msgstr ""
164178
#. module: base_user_role
165179
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__display_name
166180
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__display_name
181+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__display_name
167182
#: model:ir.model.fields,field_description:base_user_role.field_wizard_create_role_from_user__display_name
168183
#: model:ir.model.fields,field_description:base_user_role.field_wizard_groups_into_role__display_name
169184
msgid "Display Name"
@@ -176,6 +191,7 @@ msgstr ""
176191

177192
#. module: base_user_role
178193
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__date_from
194+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__date_from
179195
msgid "From"
180196
msgstr ""
181197

@@ -207,6 +223,7 @@ msgstr ""
207223
#. module: base_user_role
208224
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__id
209225
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__id
226+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__id
210227
#: model:ir.model.fields,field_description:base_user_role.field_wizard_create_role_from_user__id
211228
#: model:ir.model.fields,field_description:base_user_role.field_wizard_groups_into_role__id
212229
msgid "ID"
@@ -233,6 +250,7 @@ msgstr ""
233250
#. module: base_user_role
234251
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__write_uid
235252
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__write_uid
253+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__write_uid
236254
#: model:ir.model.fields,field_description:base_user_role.field_wizard_create_role_from_user__write_uid
237255
#: model:ir.model.fields,field_description:base_user_role.field_wizard_groups_into_role__write_uid
238256
msgid "Last Updated by"
@@ -241,6 +259,7 @@ msgstr "Última actualización por"
241259
#. module: base_user_role
242260
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__write_date
243261
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__write_date
262+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__write_date
244263
#: model:ir.model.fields,field_description:base_user_role.field_wizard_create_role_from_user__write_date
245264
#: model:ir.model.fields,field_description:base_user_role.field_wizard_groups_into_role__write_date
246265
msgid "Last Updated on"
@@ -286,6 +305,7 @@ msgstr ""
286305
#: model:ir.model.fields,field_description:base_user_role.field_res_groups__role_id
287306
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__role_id
288307
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__role_id
308+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__role_id
289309
msgid "Role"
290310
msgstr ""
291311

@@ -323,6 +343,7 @@ msgstr ""
323343

324344
#. module: base_user_role
325345
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__date_to
346+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__date_to
326347
msgid "To"
327348
msgstr ""
328349

@@ -370,6 +391,7 @@ msgstr ""
370391

371392
#. module: base_user_role
372393
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__users
394+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__user_ids
373395
#: model_terms:ir.ui.view,arch_db:base_user_role.view_res_users_role_form
374396
msgid "Users"
375397
msgstr ""
@@ -395,6 +417,11 @@ msgstr ""
395417
msgid "Views"
396418
msgstr ""
397419

420+
#. module: base_user_role
421+
#: model:ir.model,name:base_user_role.model_role_add_users_wizard
422+
msgid "Wizard to add multiple users to a role"
423+
msgstr ""
424+
398425
#. module: base_user_role
399426
#: model_terms:ir.ui.view,arch_db:base_user_role.create_from_user_wizard_view
400427
msgid "or"

‎base_user_role/i18n/ar.po‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,17 @@ msgstr ""
7373
msgid "Active"
7474
msgstr ""
7575

76+
#. module: base_user_role
77+
#: model:ir.actions.act_window,name:base_user_role.action_add_multiple_users_wizard
78+
#: model_terms:ir.ui.view,arch_db:base_user_role.view_res_users_role_form
79+
msgid "Add Multiple Users"
80+
msgstr ""
81+
82+
#. module: base_user_role
83+
#: model_terms:ir.ui.view,arch_db:base_user_role.view_res_users_role_add_users_wizard
84+
msgid "Add Users"
85+
msgstr ""
86+
7687
#. module: base_user_role
7788
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__category_id
7889
msgid "Application"
@@ -100,6 +111,7 @@ msgstr ""
100111

101112
#. module: base_user_role
102113
#: model_terms:ir.ui.view,arch_db:base_user_role.group_groups_into_role_wiz_view
114+
#: model_terms:ir.ui.view,arch_db:base_user_role.view_res_users_role_add_users_wizard
103115
msgid "Cancel"
104116
msgstr ""
105117

@@ -143,6 +155,7 @@ msgstr ""
143155
#. module: base_user_role
144156
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__create_uid
145157
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__create_uid
158+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__create_uid
146159
#: model:ir.model.fields,field_description:base_user_role.field_wizard_create_role_from_user__create_uid
147160
#: model:ir.model.fields,field_description:base_user_role.field_wizard_groups_into_role__create_uid
148161
msgid "Created by"
@@ -151,6 +164,7 @@ msgstr "أنشئ بواسطة"
151164
#. module: base_user_role
152165
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__create_date
153166
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__create_date
167+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__create_date
154168
#: model:ir.model.fields,field_description:base_user_role.field_wizard_create_role_from_user__create_date
155169
#: model:ir.model.fields,field_description:base_user_role.field_wizard_groups_into_role__create_date
156170
msgid "Created on"
@@ -166,6 +180,7 @@ msgstr ""
166180
#. module: base_user_role
167181
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__display_name
168182
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__display_name
183+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__display_name
169184
#: model:ir.model.fields,field_description:base_user_role.field_wizard_create_role_from_user__display_name
170185
#: model:ir.model.fields,field_description:base_user_role.field_wizard_groups_into_role__display_name
171186
msgid "Display Name"
@@ -178,6 +193,7 @@ msgstr ""
178193

179194
#. module: base_user_role
180195
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__date_from
196+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__date_from
181197
msgid "From"
182198
msgstr ""
183199

@@ -209,6 +225,7 @@ msgstr ""
209225
#. module: base_user_role
210226
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__id
211227
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__id
228+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__id
212229
#: model:ir.model.fields,field_description:base_user_role.field_wizard_create_role_from_user__id
213230
#: model:ir.model.fields,field_description:base_user_role.field_wizard_groups_into_role__id
214231
msgid "ID"
@@ -235,6 +252,7 @@ msgstr ""
235252
#. module: base_user_role
236253
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__write_uid
237254
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__write_uid
255+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__write_uid
238256
#: model:ir.model.fields,field_description:base_user_role.field_wizard_create_role_from_user__write_uid
239257
#: model:ir.model.fields,field_description:base_user_role.field_wizard_groups_into_role__write_uid
240258
msgid "Last Updated by"
@@ -243,6 +261,7 @@ msgstr "آخر تحديث بواسطة"
243261
#. module: base_user_role
244262
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__write_date
245263
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__write_date
264+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__write_date
246265
#: model:ir.model.fields,field_description:base_user_role.field_wizard_create_role_from_user__write_date
247266
#: model:ir.model.fields,field_description:base_user_role.field_wizard_groups_into_role__write_date
248267
msgid "Last Updated on"
@@ -288,6 +307,7 @@ msgstr ""
288307
#: model:ir.model.fields,field_description:base_user_role.field_res_groups__role_id
289308
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__role_id
290309
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__role_id
310+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__role_id
291311
msgid "Role"
292312
msgstr ""
293313

@@ -325,6 +345,7 @@ msgstr ""
325345

326346
#. module: base_user_role
327347
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line__date_to
348+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__date_to
328349
msgid "To"
329350
msgstr ""
330351

@@ -372,6 +393,7 @@ msgstr ""
372393

373394
#. module: base_user_role
374395
#: model:ir.model.fields,field_description:base_user_role.field_res_users_role__users
396+
#: model:ir.model.fields,field_description:base_user_role.field_role_add_users_wizard__user_ids
375397
#: model_terms:ir.ui.view,arch_db:base_user_role.view_res_users_role_form
376398
msgid "Users"
377399
msgstr "المستخدمون"
@@ -398,6 +420,11 @@ msgstr ""
398420
msgid "Views"
399421
msgstr "طرق العرض"
400422

423+
#. module: base_user_role
424+
#: model:ir.model,name:base_user_role.model_role_add_users_wizard
425+
msgid "Wizard to add multiple users to a role"
426+
msgstr ""
427+
401428
#. module: base_user_role
402429
#: model_terms:ir.ui.view,arch_db:base_user_role.create_from_user_wizard_view
403430
msgid "or"

0 commit comments

Comments
 (0)