Skip to content

Commit fd07371

Browse files
bt-adminbt-admin
authored
Merge pull request OCA#414 from OCA/9.0
Syncing from upstream OCA/server-tools (9.0)
2 parents 77b3f8e + a332d53 commit fd07371

10 files changed

Lines changed: 16 additions & 18 deletions

File tree

‎base_user_role/README.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
2-
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
3-
:alt: License: AGPL-3
1+
.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg
2+
:target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
3+
:alt: License: LGPL-3
44

55
==========
66
User roles

‎base_user_role/__openerp__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# -*- coding: utf-8 -*-
22
# Copyright 2014 ABF OSIELL <http://osiell.com>
3-
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
3+
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
44

55
{
66
'name': 'User roles',
77
'version': '9.0.1.0.0',
88
'category': 'Tools',
99
'author': 'ABF OSIELL, Odoo Community Association (OCA)',
10-
'license': 'AGPL-3',
10+
'license': 'LGPL-3',
1111
'maintainer': 'ABF OSIELL',
1212
'website': 'http://www.osiell.com',
1313
'depends': [

‎base_user_role/data/ir_cron.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright 2016 ABF OSIELL <http://osiell.com>
3-
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
3+
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
44
<odoo noupdate="1">
55

66
<record model="ir.cron" id="cron_update_users">

‎base_user_role/data/ir_module_category.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright 2016 ABF OSIELL <http://osiell.com>
3-
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
3+
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
44
<odoo>
55

66
<record model="ir.module.category" id="ir_module_category_role">

‎base_user_role/models/role.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22
# Copyright 2014 ABF OSIELL <http://osiell.com>
3-
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
3+
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
44

55
import datetime
66
import logging

‎base_user_role/models/user.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22
# Copyright 2014 ABF OSIELL <http://osiell.com>
3-
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
3+
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
44

55
from openerp import api, fields, models
66

‎base_user_role/tests/test_user_role.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22
# Copyright 2014 ABF OSIELL <http://osiell.com>
3-
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
3+
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
44

55
import datetime
66

‎base_user_role/views/role.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright 2014 ABF OSIELL <http://osiell.com>
3-
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
3+
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
44
<odoo>
55

66
<record id="view_res_users_role_form" model="ir.ui.view">

‎base_user_role/views/user.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright 2014 ABF OSIELL <http://osiell.com>
3-
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
3+
License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). -->
44
<odoo>
55

66
<record id="view_res_users_form_inherit" model="ir.ui.view">

‎keychain/i18n/ca.po‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ msgstr ""
1010
"Project-Id-Version: Odoo Server 9.0c\n"
1111
"Report-Msgid-Bugs-To: \n"
1212
"POT-Creation-Date: 2017-04-19 18:00+0000\n"
13-
"PO-Revision-Date: 2018-07-03 14:05+0000\n"
13+
"PO-Revision-Date: 2018-12-15 19:58+0000\n"
1414
"Last-Translator: mtbochaca <mtbochaca@gmail.com>\n"
1515
"Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
1616
"Language: ca\n"
1717
"MIME-Version: 1.0\n"
1818
"Content-Type: text/plain; charset=UTF-8\n"
1919
"Content-Transfer-Encoding: \n"
2020
"Plural-Forms: nplurals=2; plural=n != 1;\n"
21-
"X-Generator: Weblate 3.0.1\n"
21+
"X-Generator: Weblate 3.3\n"
2222

2323
#. module: keychain
2424
#: code:addons/keychain/models/keychain.py:76
@@ -108,9 +108,8 @@ msgstr "Clauer"
108108

109109
#. module: keychain
110110
#: model:ir.model.fields,field_description:keychain.field_keychain_backend_keychain_account_id
111-
#, fuzzy
112111
msgid "Keychain account id"
113-
msgstr "keychain.account"
112+
msgstr "Id de compte Keychain"
114113

115114
#. module: keychain
116115
#: model:ir.model.fields,field_description:keychain.field_keychain_account___last_update
@@ -202,9 +201,8 @@ msgstr "keychain.account"
202201

203202
#. module: keychain
204203
#: model:ir.model,name:keychain.model_keychain_backend
205-
#, fuzzy
206204
msgid "keychain.backend"
207-
msgstr "keychain.account"
205+
msgstr "keychain.backend"
208206

209207
#~ msgid "Accounts form"
210208
#~ msgstr "Formularis de comptes"

0 commit comments

Comments
 (0)