diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py index c2f71910231..2cfd27bc0a5 100644 --- a/openerp/addons/base/ir/ir_sequence.py +++ b/openerp/addons/base/ir/ir_sequence.py @@ -150,9 +150,9 @@ class ir_sequence(openerp.osv.osv.osv): for row in rows: # 4 cases: we test the previous impl. against the new one. + i = values.get('number_increment', row['number_increment']) + n = values.get('number_next', row['number_next']) if row['implementation'] == 'standard': - i = values.get('number_increment', row['number_increment']) - n = values.get('number_next', row['number_next']) if new_implementation in ('standard', None): self._alter_sequence(cr, row['id'], i, n) else: 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/tools/yaml_import.py b/openerp/tools/yaml_import.py index 667ae74e58a..e0ced74fa3e 100644 --- a/openerp/tools/yaml_import.py +++ b/openerp/tools/yaml_import.py @@ -302,8 +302,9 @@ class YamlInterpreter(object): def create_osv_memory_record(self, record, fields): model = self.get_model(record.model) - record_dict = self._create_record(model, fields, False) - id_new=model.create(self.cr, self.uid, record_dict, context=self.context) + context = self.get_context(record, self.eval_context) + record_dict = self._create_record(model, fields) + id_new = model.create(self.cr, self.uid, record_dict, context=context) self.id_map[record.id] = int(id_new) return record_dict