Merge e868810 into d010a0e

OCA · Oct 31, 2019 · 409bb41 · 409bb41
2 parents d010a0e + e868810
commit 409bb41
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/.isort.cfg b/.isort.cfg
@@ -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=setuptools
+known_third_party=pytz,setuptools
diff --git a/base_jsonify/models/models.py b/base_jsonify/models/models.py
@@ -3,6 +3,8 @@
 # Raphaël Reverdy <raphael.reverdy@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
+import pytz
+
 from odoo import api, fields, models
 from odoo.exceptions import UserError
 from odoo.tools.translate import _
@@ -70,9 +72,13 @@ def jsonify(self, parser):
                     if value is False and field_type != "boolean":
                         value = None
                     elif field_type == "date":
-                        value = fields.Date.to_string(value)
+                        value = fields.Date.to_date(value).isoformat()
                     elif field_type == "datetime":
-                        value = fields.Datetime.to_string(value)
+                        value = (
+                            fields.Datetime.to_datetime(value)
+                            .replace(tzinfo=pytz.utc)
+                            .isoformat()
+                        )
                     res[json_key] = value
             result.append(res)
         return result
diff --git a/base_jsonify/tests/test_get_parser.py b/base_jsonify/tests/test_get_parser.py
@@ -79,9 +79,14 @@ def test_json_export(self):
                         },
                     )
                 ],
-                "date": fields.Date.today(),
+                "date": fields.Date.from_string("2019-10-31"),
             }
         )
+        # put our own create date to ease tests
+        self.env.cr.execute(
+            "update res_partner set create_date=%s where id=%s",
+            ("2019-10-31 14:39:49", partner.id),
+        )
         expected_json = {
             "lang": "en_US",
             "comment": None,
@@ -100,8 +105,8 @@ def test_json_export(self):
                     "email": None,
                 }
             ],
-            "create_date": fields.Datetime.to_string(partner.create_date),
-            "date": fields.Date.to_string(partner.date),
+            "create_date": "2019-10-31T14:39:49+00:00",
+            "date": "2019-10-31",
         }
         json_partner = partner.jsonify(parser)