diff --git a/openerp/modules/registry.py b/openerp/modules/registry.py index 347ca183a69..3139c8606be 100644 --- a/openerp/modules/registry.py +++ b/openerp/modules/registry.py @@ -138,7 +138,7 @@ class RegistryManager(object): cr.close() if pooljobs: - pool.get('ir.cron').restart(registry.db.dbname) + registry.get('ir.cron').restart(registry.db.dbname) return registry diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index b93a8331e72..de6885172d4 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -830,9 +830,6 @@ class orm_template(object): if x=='.id': return [x] return x.replace(':id','/id').replace('.id','/.id').split('/') fields_to_export = map(fsplit, fields_to_export) - fields_export = fields_to_export + [] - warning = '' - warning_fields = [] datas = [] for row in self.browse(cr, uid, ids, context): datas += self.__export_row(cr, uid, row, fields_to_export, context) @@ -1020,7 +1017,6 @@ class orm_template(object): if config.get('import_partial', False) and filename: data = pickle.load(file(config.get('import_partial'))) - original_value = data.get(filename, 0) position = 0 while position