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

[MERGE] forward port branch 9.0 up to af64780a2d

Browse Source
This commit is contained in:
Christophe Simonis
2017-03-17 17:06:32 +01:00
parent 22e7b6befb af64780a2d
commit aefdf96c25
5 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_calendar/static/src/js/web_calendar.js
+2 -2
View File
@@ -611,8 +611,8 @@ var CalendarView = View.extend({
date_stop = m_start.toDate(); date_stop = m_start.toDate();
} }
var r = { var r = {
'start': moment(date_start).format('YYYY-MM-DD HH:mm:ss'), 'start': moment(date_start).toISOString(),
'end': moment(date_stop).format('YYYY-MM-DD HH:mm:ss'), 'end': moment(date_stop).toISOString(),
'title': the_title, 'title': the_title,
'allDay': (this.fields[this.date_start].type == 'date' || (this.all_day && evt[this.all_day]) || false), 'allDay': (this.fields[this.date_start].type == 'date' || (this.all_day && evt[this.all_day]) || false),
'id': evt.id, 'id': evt.id,
addons/web_editor/static/src/js/transcoder.js
+22 -14
View File
@@ -99,20 +99,28 @@ var getMatchedCSSRules = function (a) {
if (style.display === 'block') { if (style.display === 'block') {
delete style.display; delete style.display;
} }
if (style['margin-top']) {
style.margin = (style['margin-top'] || 0) + ' ' + (style['margin-right'] || 0) + ' ' + (style['margin-bottom'] || 0) + ' ' + (style['margin-left'] || 0); _.each(['margin', 'padding'], function(p) {
delete style['margin-top']; if (style[p+'-top'] || style[p+'-right'] || style[p+'-bottom'] || style[p+'-left']) {
delete style['margin-right']; if (style[p+'-top'] === style[p+'-right'] && style[p+'-top'] === style[p+'-bottom'] && style[p+'-top'] === style[p+'-left']) {
delete style['margin-bottom']; // keep => property: [top/right/bottom/left value];
delete style['margin-left']; style[p] = style[p+'-top'];
} }
if (style['padding-top']) { else {
style.padding = (style['padding-top'] || 0) + ' ' + (style['padding-right'] || 0) + ' ' + (style['padding-bottom'] || 0) + ' ' + (style['padding-left'] || 0); // keep => property: [top value] [right value] [bottom value] [left value];
delete style['padding-top']; style[p] = (style[p+'-top'] || 0) + ' ' + (style[p+'-right'] || 0) + ' ' + (style[p+'-bottom'] || 0) + ' ' + (style[p+'-left'] || 0);
delete style['padding-right']; if (style[p].indexOf('inherit') !== -1 || style[p].indexOf('initial') !== -1) {
delete style['padding-bottom']; // keep => property-top: [top value]; property-right: [right value]; property-bottom: [bottom value]; property-left: [left value];
delete style['padding-left']; delete style[p];
} return;
}
}
delete style[p+'-top'];
delete style[p+'-right'];
delete style[p+'-bottom'];
delete style[p+'-left'];
}
});
return a.className ? cache[a.tagName + "." +a.className] = style : style; return a.className ? cache[a.tagName + "." +a.className] = style : style;
}; };
addons/web_editor/static/src/xml/backend.xml
+4 -4
View File
@@ -38,11 +38,11 @@
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
background: white;"> background: white;">
<option value="en_US" t-att-selected="'en_US' == widget.lang ? 'selected' : null">
<t t-if="!widget.get('effective_readonly')">English (edit mode)</t>
<t t-if="widget.get('effective_readonly')">English</t>
</option>
<t t-foreach="widget.languages" t-as="lang"> <t t-foreach="widget.languages" t-as="lang">
<option value="en_US" t-att-selected="'en_US' == widget.lang ? 'selected' : null">
<t t-if="!widget.get('effective_readonly')">English (edit mode)</t>
<t t-if="widget.get('effective_readonly')">English</t>
</option>
<option t-att-value="lang.code" t-att-selected="lang.code == widget.lang ? 'selected' : null"><t t-esc="lang.name"/></option> <option t-att-value="lang.code" t-att-selected="lang.code == widget.lang ? 'selected' : null"><t t-esc="lang.name"/></option>
</t> </t>
</select> </select>
openerp/addons/base/ir/ir_qweb.py
+4 -4
View File
@@ -671,7 +671,7 @@ class IntegerConverter(models.AbstractModel):
@api.model @api.model
def value_to_html(self, value, field, options=None): def value_to_html(self, value, field, options=None):
return self.user_lang().format('%d', value, grouping=True) return self.user_lang().format('%d', value, grouping=True).replace(r'-', u'\u2011')
class FloatConverter(models.AbstractModel): class FloatConverter(models.AbstractModel):
@@ -688,7 +688,7 @@ class FloatConverter(models.AbstractModel):
precision = self.precision(field, options=options) precision = self.precision(field, options=options)
fmt = '%f' if precision is None else '%.{precision}f' fmt = '%f' if precision is None else '%.{precision}f'
lang = self.user_lang() lang = self.user_lang()
formatted = lang.format(fmt.format(precision=precision), value, grouping=True) formatted = lang.format(fmt.format(precision=precision), value, grouping=True).replace(r'-', u'\u2011')
# %f does not strip trailing zeroes. %g does but its precision causes # %f does not strip trailing zeroes. %g does but its precision causes
# it to switch to scientific notation starting at a million *and* to # it to switch to scientific notation starting at a million *and* to
@@ -877,7 +877,7 @@ class MonetaryConverter(models.AbstractModel):
lang = self.user_lang() lang = self.user_lang()
formatted_amount = lang.format(fmt, display_currency.round(from_amount), formatted_amount = lang.format(fmt, display_currency.round(from_amount),
grouping=True, monetary=True).replace(r' ', u'\N{NO-BREAK SPACE}') grouping=True, monetary=True).replace(r' ', u'\N{NO-BREAK SPACE}').replace(r'-', u'\u2011')
pre = post = u'' pre = post = u''
if display_currency.position == 'before': if display_currency.position == 'before':
@@ -1047,7 +1047,7 @@ class QwebWidgetMonetary(models.AbstractModel):
fmt = "%.{0}f".format(-precision if precision < 0 else 0) fmt = "%.{0}f".format(-precision if precision < 0 else 0)
lang_code = qwebcontext.context.get('lang') or 'en_US' lang_code = qwebcontext.context.get('lang') or 'en_US'
lang = qwebcontext.env['res.lang']._lang_get(lang_code) lang = qwebcontext.env['res.lang']._lang_get(lang_code)
formatted_amount = lang.format(fmt, inner, grouping=True, monetary=True).replace(r' ', u'\N{NO-BREAK SPACE}') formatted_amount = lang.format(fmt, inner, grouping=True, monetary=True).replace(r' ', u'\N{NO-BREAK SPACE}').replace(r'-', u'\u2011')
pre = post = u'' pre = post = u''
if display.position == 'before': if display.position == 'before':
pre = u'{symbol}\N{NO-BREAK SPACE}' pre = u'{symbol}\N{NO-BREAK SPACE}'
openerp/addons/test_converter/tests/test_html.py
+4 -4
View File
@@ -67,8 +67,8 @@ class TestFloatExport(TestBasicExport):
def test_float(self): def test_float(self):
converter = self.get_converter('float') converter = self.get_converter('float')
value = converter(42.0) value = converter(-42.0)
self.assertEqual(value, "42.0") self.assertEqual(value, u"\u201142.0")
value = converter(42.0100) value = converter(42.0100)
self.assertEqual(value, "42.01") self.assertEqual(value, "42.01")
@@ -120,7 +120,7 @@ class TestCurrencyExport(TestExport):
def test_currency_post(self): def test_currency_post(self):
currency = self.create(self.Currency, name="Test", symbol=u"test") currency = self.create(self.Currency, name="Test", symbol=u"test")
obj = self.create(self.Model, value=0.12) obj = self.create(self.Model, value=-0.12)
converted = self.convert(obj, dest=currency) converted = self.convert(obj, dest=currency)
@@ -129,7 +129,7 @@ class TestCurrencyExport(TestExport):
'<span data-oe-model="{obj._model._name}" data-oe-id="{obj.id}" ' '<span data-oe-model="{obj._model._name}" data-oe-id="{obj.id}" '
'data-oe-field="value" data-oe-type="monetary" ' 'data-oe-field="value" data-oe-type="monetary" '
'data-oe-expression="obj.value">' 'data-oe-expression="obj.value">'
'<span class="oe_currency_value">0.12</span>' u'<span class="oe_currency_value">\u20110.12</span>'
u'\N{NO-BREAK SPACE}{symbol}</span>'.format( u'\N{NO-BREAK SPACE}{symbol}</span>'.format(
obj=obj, obj=obj,
symbol=currency.symbol.encode('utf-8') symbol=currency.symbol.encode('utf-8')