diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-07-09 21:12:53 +0300 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-07-09 21:12:53 +0300 |
| commit | 2d64ce69d07a55f827548e43cfcc73cd459dc39a (patch) | |
| tree | b217b2afe155395280d27a4c6cc0c43c89396c3b /bin/tools/convert.py | |
| parent | cb5e80507f5a8330ed4e0f2526343b97f8d506e6 (diff) | |
| parent | a2db1c09ba3a279a8d791c8914a19d2f0dbb2c18 (diff) | |
Merge origin/master into mdv-gpl3-py26
Conflicts:
bin/addons/base_setup/i18n/base_setup.pot
bin/openerp-server.py
bin/report/preprocess.py
bin/report/report_sxw.py
bin/tools/translate.py
bzr revid: p_christ@hol.gr-20090709181253-fu8nxy9b3ykrrd1c
Diffstat (limited to 'bin/tools/convert.py')
| -rw-r--r-- | bin/tools/convert.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/tools/convert.py b/bin/tools/convert.py index 18b1377047e..a57a3ee306f 100644 --- a/bin/tools/convert.py +++ b/bin/tools/convert.py @@ -261,10 +261,14 @@ form: module.record_id""" % (xml_id,) if len(d_search): ids = self.pool.get(d_model).search(cr,self.uid,eval(d_search)) if len(d_id): - ids.append(self.id_get(cr, d_model, d_id)) + try: + ids.append(self.id_get(cr, d_model, d_id)) + except: + # d_id cannot be found. doesn't matter in this case + pass if len(ids): self.pool.get(d_model).unlink(cr, self.uid, ids) - #self.pool.get('ir.model.data')._unlink(cr, self.uid, d_model, ids, direct=True) + self.pool.get('ir.model.data')._unlink(cr, self.uid, d_model, ids, direct=True) return False def _tag_report(self, cr, rec, data_node=None): |