Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/6.1-xmlid-cache-problems-xal into lp:openobject-server/6.1

  1. 6.1-xmlid-cache-problems-xal
  2. Merge into 6.1
Proposed by Xavier ALT
Status: Merged
Approved by: Xavier ALT
Approved revision: 4313
Merged at revision: 4313
Proposed branch: lp:~openerp-dev/openobject-server/6.1-xmlid-cache-problems-xal
Merge into: lp:openobject-server/6.1
Diff against target: 10 lines (+1/-0)
1 file modified
openerp/tools/convert.py (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/6.1-xmlid-cache-problems-xal
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+139722@code.launchpad.net

Description of the change

Hi,

This is a forward-port to v6.1 of the following MP:

https://code.launchpad.net/~openerp-dev/openobject-server/6.0-xmlid-cache-problems-cto/+merge/137208

Regards,
Xavier

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openerp/tools/convert.py'
--- openerp/tools/convert.py 2012-02-14 13:52:55 +0000
+++ openerp/tools/convert.py 2012-12-13 15:17:21 +0000
@@ -894,6 +894,7 @@
894 rec.sourceline,894 rec.sourceline,
895 etree.tostring(rec).strip(), exc_info=True)895 etree.tostring(rec).strip(), exc_info=True)
896 self.cr.rollback()896 self.cr.rollback()
897 self.pool.clear_caches()
897 raise898 raise
898 return True899 return True
899900