diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 86496776111..33c14137f28 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -119,6 +119,7 @@ class report_xml(osv.osv):
('raw', 'raw'),
('sxw', 'sxw'),
('txt', 'txt'),
+ ('odt', 'odt'),
], string='Type', required=True),
'groups_id': fields.many2many('res.groups', 'res_groups_report_rel', 'uid', 'gid', 'Groups'),
'attachment': fields.char('Save As Attachment Prefix', size=32, help='This is the prefix of the file name the print will be saved as attachement. Keep empty to not save the printed reports')
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index f2541a17791..01917e9ab7e 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -346,7 +346,7 @@ class module(osv.osv):
mod_sort = {}
for m in modules:
name, version, extension = m[0], m[1], m[-1]
- if version == 'x': # 'x' version was a mistake
+ if not version or version == 'x': # 'x' version was a mistake
version = '0'
if name in mod_sort:
if parse_version(version) <= parse_version(mod_sort[name][0]):
@@ -367,7 +367,7 @@ class module(osv.osv):
else:
id = ids[0]
installed_version = self.read(cr, uid, id, ['latest_version'])['latest_version']
- if installed_version == 'x': # 'x' version was a mistake
+ if not installed_version or installed_version == 'x': # 'x' version was a mistake
installed_version = '0'
if parse_version(version) > parse_version(installed_version):
self.write(cr, uid, id, { 'url': url })
diff --git a/bin/addons/base/module/report/ir_module_reference.rml b/bin/addons/base/module/report/ir_module_reference.rml
index 14d549e815c..b19d0ddeed9 100644
--- a/bin/addons/base/module/report/ir_module_reference.rml
+++ b/bin/addons/base/module/report/ir_module_reference.rml
@@ -3,18 +3,16 @@
-
-
-
- [[ company.name ]]
- Reference Guide
-
-
- 1cm 28cm 20cm 28cm
-
-
-
-
+
+
+
+ [[ company.name ]]
+ Reference Guide
+
+
+ 1cm 28cm 20cm 28cm
+
+
@@ -66,6 +64,10 @@
+
+
+
+
@@ -104,44 +106,45 @@
-
+
-
+
-
+
-
-
-
-
+