pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-16 up to aec6248bb3

Browse Source
This commit is contained in:
Christophe Simonis
2017-08-23 16:44:58 +02:00
parent 7f2bd08608 aec6248bb3
commit 30bd5ac0e9
101 changed files with 2301 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/fields/basic_fields.js
+7 -3
View File
@@ -341,6 +341,9 @@ var FieldChar = InputField.extend(TranslatableFieldMixin, {
*/
_renderEdit: function () {
var def = this._super.apply(this, arguments);
if (this.field.size && this.field.size > 0) {
this.$el.attr('maxlength', this.field.size);
}
this.$el = this.$el.add(this._renderTranslateButton());
return def;
},
@@ -450,7 +453,7 @@ var FieldDateTime = FieldDate.extend({
*/
_getValue: function () {
var value = this.datewidget.getValue();
return value && value.add(-this.getSession().tzOffset, 'minutes');
return value && value.add(-this.getSession().getTZOffset(value), 'minutes');
},
/**
@@ -460,7 +463,7 @@ var FieldDateTime = FieldDate.extend({
* @private
*/
_makeDatePicker: function () {
var value = this.value && this.value.clone().add(this.getSession().tzOffset, 'minutes');
var value = this.value && this.value.clone().add(this.getSession().getTZOffset(this.value), 'minutes');
return new datepicker.DateTimeWidget(this, {defaultDate: value});
},
@@ -471,7 +474,7 @@ var FieldDateTime = FieldDate.extend({
* @private
*/
_renderEdit: function () {
var value = this.value && this.value.clone().add(this.getSession().tzOffset, 'minutes');
var value = this.value && this.value.clone().add(this.getSession().getTZOffset(this.value), 'minutes');
this.datewidget.setValue(value);
this.$input = this.datewidget.$input;
},
@@ -791,6 +794,7 @@ var FieldFloatTime = FieldFloat.extend({
var FieldText = InputField.extend(TranslatableFieldMixin, {
className: 'o_field_text',
supportedFieldTypes: ['text'],
tagName: 'span',
/**
* @constructor