Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[13.0][FIX] base_jsonify: In odoo 12, Date and Datetime fields values are d… #1712

Merged
merged 1 commit into from
Oct 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .isort.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ line_length=88
known_odoo=odoo
known_odoo_addons=odoo.addons
sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER
known_third_party=
known_third_party=setuptools
6 changes: 5 additions & 1 deletion base_jsonify/models/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Raphaël Reverdy <[email protected]>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

from odoo import api, models
from odoo import api, fields, models
from odoo.exceptions import UserError
from odoo.tools.translate import _

Expand Down Expand Up @@ -69,6 +69,10 @@ def jsonify(self, parser):
value = rec[field_name]
if value is False and field_type != "boolean":
value = None
elif field_type == "date":
value = fields.Date.to_string(value)
elif field_type == "datetime":
value = fields.Datetime.to_string(value)
res[json_key] = value
result.append(res)
return result
6 changes: 6 additions & 0 deletions base_jsonify/tests/test_get_parser.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Copyright 2017 ACSONE SA/NV
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

from odoo import fields
from odoo.tests.common import TransactionCase


Expand Down Expand Up @@ -59,6 +60,8 @@ def test_json_export(self):
("country_id:country", ["code", "name"]),
"active",
("category_id", ["name"]),
"create_date",
"date",
]
partner = self.env["res.partner"].create(
{
Expand All @@ -76,6 +79,7 @@ def test_json_export(self):
},
)
],
"date": fields.Date.today(),
}
)
expected_json = {
Expand All @@ -96,6 +100,8 @@ def test_json_export(self):
"email": None,
}
],
"create_date": fields.Datetime.to_string(partner.create_date),
"date": fields.Date.to_string(partner.date),
}
json_partner = partner.jsonify(parser)

Expand Down