Skip to content

Commit

Permalink
[MERGE] forward port branch 10.0 up to a8b72d7
Browse files Browse the repository at this point in the history
  • Loading branch information
KangOl committed Nov 14, 2017
2 parents abfd662 + a8b72d7 commit 0d0dd0c
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 4 deletions.
2 changes: 1 addition & 1 deletion addons/mail/tests/test_mail_channel.py
Expand Up @@ -32,7 +32,7 @@ def tearDownClass(cls):
def mail_group_message_get_recipient_values(self, notif_message=None, recipient_ids=None):
return self.env['mail.thread'].message_get_recipient_values(notif_message=notif_message, recipient_ids=recipient_ids)
cls.env['mail.channel']._patch_method('message_get_recipient_values', mail_group_message_get_recipient_values)
super(TestMail, cls).tearDownClass()
super(TestMailGroup, cls).tearDownClass()

@mute_logger('odoo.addons.base.ir.ir_model', 'odoo.models')
def test_access_rights_public(self):
Expand Down
3 changes: 2 additions & 1 deletion addons/web/static/src/js/views/search_inputs.js
Expand Up @@ -353,7 +353,8 @@ var DateField = Field.extend(/** @lends instance.web.search.DateField# */{
return $.when(null);
}

var m = moment(v, t === 'datetime' ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD');
// THIS SHOULD BE FORWARDPORTED UP TO SAAS-15, NOT LATER
var m = moment.utc(v, t === 'datetime' ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD');
if (!m.isValid()) { return $.when(null); }
var d = m.toDate();
var date_string = formats.format_value(d, this.attrs);
Expand Down
11 changes: 11 additions & 0 deletions doc/cla/individual/grzekru.md
@@ -0,0 +1,11 @@
Poland, 2017-09-17

I hereby agree to the terms of the Odoo Individual Contributor License
Agreement v1.0.

I declare that I am authorized and able to make this agreement and sign this
declaration.

Signed,

Grzegorz Krukar grzegorzgk1@gmail.com https://github.com/grzekru
9 changes: 9 additions & 0 deletions doc/cla/individual/mehdi-ghezal.md
@@ -0,0 +1,9 @@
France, 2017-11-10

I hereby agree to the terms of the Odoo Individual Contributor License Agreement v1.0.

I declare that I am authorized and able to make this agreement and sign this declaration.

Signed,

Mehdi GHEZAL mehdi.ghezal@gmail.com https://github.com/mehdi-ghezal
2 changes: 1 addition & 1 deletion doc/reference/javascript.rst
Expand Up @@ -594,7 +594,7 @@ API.

Odoo Web eschews direct calls to :py:meth:`~odoo.models.Model.read_group`
in favor of calling a method of :class:`~odoo.web.Query`, :py:meth:`much
in the way it is one in SQLAlchemy <sqlalchemy.orm.query.Query.group_by>`
in the way it is done in SQLAlchemy <sqlalchemy.orm.query.Query.group_by>`
[#terminal]_::

some_query.group_by(['field1', 'field2']).then(function (groups) {
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Expand Up @@ -17,7 +17,7 @@ passlib==1.6.5
Pillow==3.4.1
psutil==4.3.1
psycogreen==1.0
psycopg2==2.7.1
psycopg2==2.7.3
pydot==1.2.3
pyparsing==2.1.10
pyPdf==1.13
Expand Down

0 comments on commit 0d0dd0c

Please sign in to comment.