diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml index d7190b8b5ef..9664ffac2e6 100644 --- a/openerp/addons/base/base_data.xml +++ b/openerp/addons/base/base_data.xml @@ -1580,7 +1580,6 @@ Reserve - RSV @@ -1600,7 +1599,7 @@ localhost localhost - + diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index 8d52ade3a0a..06c4202d822 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -75,7 +75,6 @@ Categorized Modules - diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index 62edb0a842c..04f0f571f3d 100644 --- a/openerp/addons/base/res/res_config.py +++ b/openerp/addons/base/res/res_config.py @@ -71,7 +71,7 @@ class res_config_configurable(osv.osv_memory): res['nodestroy'] = False return res #if there is no next action and if html is in the context: reload instead of closing - if 'html' in context: + if context and 'html' in context: return {'type' : 'ir.actions.reload'} return {'type' : 'ir.actions.act_window_close'} diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 33fde6c5d1b..7cf19bbeb90 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -651,7 +651,6 @@ Open partners - diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 6c4ac13ec58..58d35e21775 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -2478,12 +2478,12 @@ class BaseModel(object): del d['id'] if groupby and groupby in self._group_by_full: - gids = map(lambda x: x[groupby][0], data) + gids = [x[groupby][0] for x in data if x[groupby]] stages = self._group_by_full[groupby](self, cr, uid, gids, domain, context) # as both lists are sorted in the same way, we can merge in one pass pos = 0 while stages and ((pos