diff --git a/web_export_view/static/src/js/web_export_view.js b/web_export_view/static/src/js/web_export_view.js index 035ee7af..23786f0f 100644 --- a/web_export_view/static/src/js/web_export_view.js +++ b/web_export_view/static/src/js/web_export_view.js @@ -73,23 +73,24 @@ Sidebar.include({ var checked = $row.find(row_selector).is(':checked'); if (children && checked === true) { $.each(export_columns_keys, function () { - var cell = $row.find('td[data-field="' + this + '"]').get(0); - var text = cell.text || cell.textContent || cell.innerHTML || ""; - if (cell.classList.contains("oe_list_field_float")) { + var $cell = $row.find('td[data-field="' + this + '"]'); + var text = $cell.text(); + if ($cell.hasClass("oe_list_field_monetary")) { + // Remove all but digits, dots and commas + text = text.replace(/[^\d\.,]/g, ""); + export_row.push( + formats.parse_value(text, {"type": "monetary"}) + ); + } else if ($cell.hasClass("oe_list_field_float")) { export_row.push( formats.parse_value(text, {'type': "float"}) ); - } - else if (cell.classList.contains("oe_list_field_boolean")) { - var data_id = $('
' + cell.innerHTML + '
'); - if (data_id.find('input').get(0).checked) { - export_row.push(_t("True")); - } - else { - export_row.push(_t("False")); - } - } - else if (cell.classList.contains("oe_list_field_integer")) { + } else if ($cell.hasClass("oe_list_field_boolean")) { + export_row.push( + $cell.is(':has(input:checked)') + ? _t("True") : _t("False") + ); + } else if ($cell.hasClass("oe_list_field_integer")) { var tmp, tmp2 = text; do { tmp = tmp2; @@ -100,8 +101,7 @@ Sidebar.include({ } while (tmp !== tmp2); export_row.push(parseInt(tmp2)); - } - else { + } else { export_row.push(text.trim()); } });