[MERGE] forward port of branch saas-2 up to revid 3899 chs@openerp.com-20140129095637-mbfz82r5pyz4dctc
bzr revid: chs@openerp.com-20140129101004-44ft0oaeo201guhd
This commit is contained in:
commit
83345e4414
|
@ -1498,8 +1498,8 @@ class Export(http.Controller):
|
||||||
model, map(operator.itemgetter('name'), export_fields_list))
|
model, map(operator.itemgetter('name'), export_fields_list))
|
||||||
|
|
||||||
return [
|
return [
|
||||||
{'name': field['name'], 'label': fields_data[field['name']]}
|
{'name': field_name, 'label': fields_data[field_name]}
|
||||||
for field in export_fields_list
|
for field_name in fields_data.keys()
|
||||||
]
|
]
|
||||||
|
|
||||||
def fields_info(self, model, export_fields):
|
def fields_info(self, model, export_fields):
|
||||||
|
@ -1546,7 +1546,7 @@ class Export(http.Controller):
|
||||||
fields[base]['relation'], base, fields[base]['string'],
|
fields[base]['relation'], base, fields[base]['string'],
|
||||||
subfields
|
subfields
|
||||||
))
|
))
|
||||||
else:
|
elif base in fields:
|
||||||
info[base] = fields[base]['string']
|
info[base] = fields[base]['string']
|
||||||
|
|
||||||
return info
|
return info
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
@charset "utf-8";
|
@charset "UTF-8";
|
||||||
@font-face {
|
@font-face {
|
||||||
font-family: "mnmliconsRegular";
|
font-family: "mnmliconsRegular";
|
||||||
src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
|
src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
|
||||||
|
@ -223,6 +223,9 @@
|
||||||
padding: 16px;
|
padding: 16px;
|
||||||
}
|
}
|
||||||
.openerp.ui-dialog .ui-dialog-titlebar {
|
.openerp.ui-dialog .ui-dialog-titlebar {
|
||||||
|
border-top: none;
|
||||||
|
border-left: none;
|
||||||
|
border-right: none;
|
||||||
border-bottom: 1px solid #cacaca;
|
border-bottom: 1px solid #cacaca;
|
||||||
-moz-border-radius: 2px 2px 0 0;
|
-moz-border-radius: 2px 2px 0 0;
|
||||||
-webkit-border-radius: 2px 2px 0 0;
|
-webkit-border-radius: 2px 2px 0 0;
|
||||||
|
@ -239,9 +242,6 @@
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
.openerp.ui-dialog .ui-widget-header {
|
|
||||||
border: none;
|
|
||||||
}
|
|
||||||
.openerp.ui-dialog .ui-dialog-content {
|
.openerp.ui-dialog .ui-dialog-content {
|
||||||
background: white;
|
background: white;
|
||||||
width: auto !important;
|
width: auto !important;
|
||||||
|
@ -441,17 +441,6 @@
|
||||||
.openerp .oe_form_dirty button.oe_highlight_on_dirty:hover {
|
.openerp .oe_form_dirty button.oe_highlight_on_dirty:hover {
|
||||||
background: #ed6f6a;
|
background: #ed6f6a;
|
||||||
}
|
}
|
||||||
.openerp .oe_title {
|
|
||||||
width: 50%;
|
|
||||||
float: left;
|
|
||||||
}
|
|
||||||
.openerp .oe_title:after {
|
|
||||||
content: ".";
|
|
||||||
display: block;
|
|
||||||
height: 0;
|
|
||||||
clear: both;
|
|
||||||
visibility: hidden;
|
|
||||||
}
|
|
||||||
.openerp .oe_button_box {
|
.openerp .oe_button_box {
|
||||||
width: 270px;
|
width: 270px;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
@ -659,10 +648,6 @@
|
||||||
display: block;
|
display: block;
|
||||||
color: gray;
|
color: gray;
|
||||||
}
|
}
|
||||||
.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active {
|
|
||||||
border-bottom: none;
|
|
||||||
padding-bottom: 1px;
|
|
||||||
}
|
|
||||||
.openerp .oe_notebook > li.ui-tabs-active > a {
|
.openerp .oe_notebook > li.ui-tabs-active > a {
|
||||||
color: #4c4c4c;
|
color: #4c4c4c;
|
||||||
}
|
}
|
||||||
|
@ -688,6 +673,10 @@
|
||||||
background-color: #eeeeee;
|
background-color: #eeeeee;
|
||||||
border-color: #eeeeee #eeeeee #dddddd;
|
border-color: #eeeeee #eeeeee #dddddd;
|
||||||
}
|
}
|
||||||
|
.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active {
|
||||||
|
border-bottom: none;
|
||||||
|
padding-bottom: 1px;
|
||||||
|
}
|
||||||
.openerp .oe_notebook > li.ui-state-active > a, .openerp .oe_notebook > li.ui-state-active > a:hover {
|
.openerp .oe_notebook > li.ui-state-active > a, .openerp .oe_notebook > li.ui-state-active > a:hover {
|
||||||
background-color: white;
|
background-color: white;
|
||||||
border: 1px solid #dddddd;
|
border: 1px solid #dddddd;
|
||||||
|
@ -3171,6 +3160,7 @@
|
||||||
}
|
}
|
||||||
.openerp .oe_debug_view_log {
|
.openerp .oe_debug_view_log {
|
||||||
font-size: 95%;
|
font-size: 95%;
|
||||||
|
line-height: 1.2em;
|
||||||
}
|
}
|
||||||
.openerp .oe_debug_view_log label {
|
.openerp .oe_debug_view_log label {
|
||||||
display: block;
|
display: block;
|
||||||
|
|
|
@ -280,14 +280,15 @@ $sheet-padding: 16px
|
||||||
.ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane
|
.ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane
|
||||||
padding: 16px
|
padding: 16px
|
||||||
.ui-dialog-titlebar
|
.ui-dialog-titlebar
|
||||||
|
border-top: none
|
||||||
|
border-left: none
|
||||||
|
border-right: none
|
||||||
border-bottom: 1px solid #cacaca
|
border-bottom: 1px solid #cacaca
|
||||||
@include radius(2px 2px 0 0)
|
@include radius(2px 2px 0 0)
|
||||||
@include vertical-gradient(#FCFCFC, #DEDEDE)
|
@include vertical-gradient(#FCFCFC, #DEDEDE)
|
||||||
.ui-dialog-title
|
.ui-dialog-title
|
||||||
margin: 0
|
margin: 0
|
||||||
padding: 0
|
padding: 0
|
||||||
.ui-widget-header
|
|
||||||
border: none
|
|
||||||
.ui-dialog-content
|
.ui-dialog-content
|
||||||
background: white
|
background: white
|
||||||
width: auto !important
|
width: auto !important
|
||||||
|
@ -416,15 +417,6 @@ $sheet-padding: 16px
|
||||||
@include box-shadow(none)
|
@include box-shadow(none)
|
||||||
&:hover
|
&:hover
|
||||||
background: #ED6F6A
|
background: #ED6F6A
|
||||||
.oe_title
|
|
||||||
width: 50%
|
|
||||||
float: left
|
|
||||||
.oe_title:after
|
|
||||||
content: "."
|
|
||||||
display: block
|
|
||||||
height: 0
|
|
||||||
clear: both
|
|
||||||
visibility: hidden
|
|
||||||
.oe_button_box
|
.oe_button_box
|
||||||
width: 270px
|
width: 270px
|
||||||
text-align: right
|
text-align: right
|
||||||
|
@ -2522,6 +2514,7 @@ $sheet-padding: 16px
|
||||||
float: left
|
float: left
|
||||||
.oe_debug_view_log
|
.oe_debug_view_log
|
||||||
font-size: 95%
|
font-size: 95%
|
||||||
|
line-height: 1.2em
|
||||||
.oe_debug_view_log label
|
.oe_debug_view_log label
|
||||||
display: block
|
display: block
|
||||||
width: 49%
|
width: 49%
|
||||||
|
|
|
@ -141,7 +141,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) {
|
||||||
//noinspection FallthroughInSwitchStatementJS
|
//noinspection FallthroughInSwitchStatementJS
|
||||||
switch (value) {
|
switch (value) {
|
||||||
case '':
|
case '':
|
||||||
if (descriptor.type === 'char') {
|
if (descriptor.type === 'char' || descriptor.type === 'text') {
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
console.warn('Field', descriptor, 'had an empty string as value, treating as false...');
|
console.warn('Field', descriptor, 'had an empty string as value, treating as false...');
|
||||||
|
@ -196,7 +196,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) {
|
||||||
+ ' ' + normalize_format(l10n.time_format));
|
+ ' ' + normalize_format(l10n.time_format));
|
||||||
case 'date':
|
case 'date':
|
||||||
if (typeof(value) == "string")
|
if (typeof(value) == "string")
|
||||||
value = instance.web.auto_str_to_date(value);
|
value = instance.web.str_to_date(value.substring(0,10));
|
||||||
return value.toString(normalize_format(l10n.date_format));
|
return value.toString(normalize_format(l10n.date_format));
|
||||||
case 'time':
|
case 'time':
|
||||||
if (typeof(value) == "string")
|
if (typeof(value) == "string")
|
||||||
|
|
|
@ -483,7 +483,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
|
||||||
html: true,
|
html: true,
|
||||||
autoFocus: true,
|
autoFocus: true,
|
||||||
minLength: 1,
|
minLength: 1,
|
||||||
delay: 0,
|
delay: 250,
|
||||||
}).data('autocomplete');
|
}).data('autocomplete');
|
||||||
|
|
||||||
// MonkeyPatch autocomplete instance
|
// MonkeyPatch autocomplete instance
|
||||||
|
|
|
@ -3428,7 +3428,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
|
||||||
// disabled to solve a bug, but may cause others
|
// disabled to solve a bug, but may cause others
|
||||||
//close: anyoneLoosesFocus,
|
//close: anyoneLoosesFocus,
|
||||||
minLength: 0,
|
minLength: 0,
|
||||||
delay: 0
|
delay: 250
|
||||||
});
|
});
|
||||||
this.$input.autocomplete("widget").openerpClass();
|
this.$input.autocomplete("widget").openerpClass();
|
||||||
// used to correct a bug when selecting an element by pushing 'enter' in an editable list
|
// used to correct a bug when selecting an element by pushing 'enter' in an editable list
|
||||||
|
@ -5555,6 +5555,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
|
||||||
start: function() {
|
start: function() {
|
||||||
this.field_manager.on("view_content_has_changed", this, this.calc_domain);
|
this.field_manager.on("view_content_has_changed", this, this.calc_domain);
|
||||||
this.calc_domain();
|
this.calc_domain();
|
||||||
|
this.on("change:value", this, this.get_selection);
|
||||||
this.on("change:evaluated_selection_domain", this, this.get_selection);
|
this.on("change:evaluated_selection_domain", this, this.get_selection);
|
||||||
this.on("change:selection", this, function() {
|
this.on("change:selection", this, function() {
|
||||||
this.selection = this.get("selection");
|
this.selection = this.get("selection");
|
||||||
|
|
Loading…
Reference in New Issue