Merge lp:~onnis-roberto/web-addons/web-addons into lp:~webaddons-core-editors/web-addons/7.0

Proposed by Roberto Onnis
Status: Merged
Merged at revision: 31
Proposed branch: lp:~onnis-roberto/web-addons/web-addons
Merge into: lp:~webaddons-core-editors/web-addons/7.0
Diff against target: 41 lines (+23/-0)
2 files modified
web_export_view/i18n/web_export_view.pot (+14/-0)
web_export_view/static/js/web_advanced_export.js (+9/-0)
To merge this branch: bzr merge lp:~onnis-roberto/web-addons/web-addons
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp Approve
Lorenzo Battistini (community) code review Approve
Pedro Manuel Baeza code review Approve
Review via email: mp+214906@code.launchpad.net

Description of the change

[web_export_view]: fixes the export in excel file of booelan fields

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Hi, Roberto,

Thanks for bringing the 6.1 patch to 7.0:

https://code.launchpad.net/~onnis-roberto/web-addons/6.1/+merge/207662

Regards.

review: Approve (code review)
Revision history for this message
Lorenzo Battistini (elbati) :
review: Approve (code review)
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'web_export_view/i18n/web_export_view.pot'
--- web_export_view/i18n/web_export_view.pot 2013-10-21 12:37:21 +0000
+++ web_export_view/i18n/web_export_view.pot 2014-04-09 09:21:38 +0000
@@ -27,3 +27,17 @@
27#, python-format27#, python-format
28msgid "Excel"28msgid "Excel"
29msgstr ""29msgstr ""
30
31#. module: web_export_view
32#. openerp-web
33#: code:addons/web_export_view/static/src/js/web_advanced_export.js:81
34#, python-format
35msgid "True"
36msgstr ""
37
38#. module: web_export_view
39#. openerp-web
40#: code:addons/web_export_view/static/src/js/web_advanced_export.js:84
41#, python-format
42msgid "False"
43msgstr ""
3044
=== modified file 'web_export_view/static/js/web_advanced_export.js'
--- web_export_view/static/js/web_advanced_export.js 2014-02-18 19:14:42 +0000
+++ web_export_view/static/js/web_advanced_export.js 2014-04-09 09:21:38 +0000
@@ -75,6 +75,15 @@
75 if (cell.classList.contains("oe_list_field_float")){75 if (cell.classList.contains("oe_list_field_float")){
76 export_row.push(instance.web.parse_value(text, {'type': "float"}));76 export_row.push(instance.web.parse_value(text, {'type': "float"}));
77 }77 }
78 else if (cell.classList.contains("oe_list_field_boolean")){
79 var data_id = $( '<div>' + cell.innerHTML + '</div>');
80 if(data_id.find('input').get(0).checked){
81 export_row.push(_t("True"));
82 }
83 else {
84 export_row.push(_t("False"));
85 }
86 }
78 else if (cell.classList.contains("oe_list_field_integer")){87 else if (cell.classList.contains("oe_list_field_integer")){
79 export_row.push(parseInt(text));88 export_row.push(parseInt(text));
80 }89 }

Subscribers

People subscribed via source and target branches