[MERGE] forward port branch saas-12 up to b1b700a
This commit is contained in:
@@ -6,6 +6,7 @@ import json
|
||||
|
||||
from odoo import http
|
||||
from odoo.http import request
|
||||
from odoo.tools import ustr
|
||||
from odoo.tools.misc import xlwt
|
||||
|
||||
|
||||
@@ -69,7 +70,7 @@ class TableExporter(http.Controller):
|
||||
# Step 3: writing data
|
||||
x = 0
|
||||
for row in jdata['rows']:
|
||||
worksheet.write(y, x, row['indent'] * ' ' + row['title'], header_plain)
|
||||
worksheet.write(y, x, row['indent'] * ' ' + ustr(row['title']), header_plain)
|
||||
for cell in row['values']:
|
||||
x = x + 1
|
||||
if cell.get('is_bold', False):
|
||||
|
||||
@@ -129,7 +129,7 @@ ExtendedSearchProposition.Field = Widget.extend({
|
||||
}
|
||||
},
|
||||
show_inputs: function ($operator) {
|
||||
var $value = this.$('.o_searchview_extended_prop_value');
|
||||
var $value = this.$el.parent();
|
||||
switch ($operator.val()) {
|
||||
case '∃':
|
||||
case '∄':
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
<!-- These templates are accessible in backend and frontend -->
|
||||
|
||||
<div t-name="Dialog" class="modal" tabindex="-1" data-backdrop="static" role="dialog" aria-hidden="true">
|
||||
<div t-name="Dialog" class="modal" tabindex="-1" data-backdrop="static" role="dialog" aria-hidden="true" t-att-id="_.uniqueId('modal_')">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
|
||||
Reference in New Issue
Block a user