From 932e8874004da7b0222cd1846eac090819d3ab07 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Mon, 15 May 2017 15:07:10 +0200
Subject: [PATCH] [FIX] web: datepicker did not select correct date after
 initial render

---
 addons/web/static/src/js/widgets/date_picker.js      | 4 ++--
 addons/web/static/tests/fields/basic_fields_tests.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/widgets/date_picker.js b/addons/web/static/src/js/widgets/date_picker.js
index 1aaf05ee11e..06dccc85d4a 100644
--- a/addons/web/static/src/js/widgets/date_picker.js
+++ b/addons/web/static/src/js/widgets/date_picker.js
@@ -56,7 +56,7 @@ var DateWidget = Widget.extend({
         var formatted_value = value ? this.format_client(value) : null;
         this.$input.val(formatted_value);
         if (this.picker) {
-            this.picker.date(formatted_value);
+            this.picker.date(value || null);
         }
     },
     get_value: function() {
@@ -95,7 +95,7 @@ var DateWidget = Widget.extend({
         //the input field if any or the current day otherwise
         var value = moment().second(0);
         if(this.$input.val().length !== 0 && this.is_valid()) {
-            value = this.$input.val();
+            value = this.parse_client(this.$input.val());
         }
 
         this.picker.date(value);
diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js
index 2c1d0520748..7b9fbd061eb 100644
--- a/addons/web/static/tests/fields/basic_fields_tests.js
+++ b/addons/web/static/tests/fields/basic_fields_tests.js
@@ -1257,7 +1257,7 @@ QUnit.module('basic_fields', {
     });
 
     QUnit.test('date field in form view', function (assert) {
-        assert.expect(7);
+        assert.expect(8);
 
         var form = createView({
             View: FormView,
@@ -1290,6 +1290,7 @@ QUnit.module('basic_fields', {
         // click on the input and select another value
         form.$('.o_datepicker_input').click();
         assert.ok(form.$('.bootstrap-datetimepicker-widget').length, 'datepicker should be open');
+        assert.strictEqual(form.$('.day.active').data('day'), '02/03/2017', 'datepicker should be highlight February 3');
         form.$('.bootstrap-datetimepicker-widget .picker-switch').first().click();  // Month selection
         form.$('.bootstrap-datetimepicker-widget .picker-switch').first().click();  // Year selection
         form.$('.bootstrap-datetimepicker-widget .year:contains(2017)').click();
@@ -1393,7 +1394,6 @@ QUnit.module('basic_fields', {
         form.destroy();
     });
 
-
     QUnit.module('FieldDatetime');
 
     QUnit.test('datetime field in form view', function (assert) {