Skip to content

Commit

Permalink
Merge PR #166 into 12.0
Browse files Browse the repository at this point in the history
Signed-off-by simahawk
  • Loading branch information
OCA-git-bot committed Jun 24, 2021
2 parents 1d357fc + f670d03 commit dae9cb1
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions base_rest_datamodel/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Copyright 2020 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)

{
"name": "Base Rest Datamodel",
"summary": """
Datamodel binding for base_rest""",
"version": "12.0.2.0.1",
"license": "AGPL-3",
"license": "LGPL-3",
"author": "ACSONE SA/NV,Odoo Community Association (OCA)",
"website": "https://github.com/OCA/rest-framework",
"depends": ["base_rest", "datamodel"],
Expand Down
4 changes: 2 additions & 2 deletions datamodel/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Copyright 2019 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)

{
"name": "Datamodel",
"summary": """
This addon allows you to define simple data models supporting
serialization/deserialization""",
"version": "12.0.2.0.0",
"license": "AGPL-3",
"license": "LGPL-3",
"development_status": "Beta",
"author": "ACSONE SA/NV, " "Odoo Community Association (OCA)",
"maintainers": ["lmignon"],
Expand Down
2 changes: 1 addition & 1 deletion datamodel/builder.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright 2017 Camptocamp SA
# Copyright 2019 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)

"""
Expand Down
2 changes: 1 addition & 1 deletion datamodel/core.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright 2017 Camptocamp SA
# Copyright 2019 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)

import functools
import logging
Expand Down
2 changes: 1 addition & 1 deletion datamodel/datamodels/base.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2019 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)

from ..core import Datamodel

Expand Down
2 changes: 1 addition & 1 deletion datamodel/fields.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright 2019 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
"""
Fields
Expand Down
2 changes: 1 addition & 1 deletion datamodel/tests/common.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright 2017 Camptocamp SA
# Copyright 2019 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)

import copy
import unittest
Expand Down
2 changes: 1 addition & 1 deletion datamodel/tests/test_build_datamodel.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright 2017 Camptocamp SA
# Copyright 2019 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)

import mock
from marshmallow_objects.models import Model as MarshmallowModel
Expand Down

0 comments on commit dae9cb1

Please sign in to comment.