diff options
| author | Raphael Collet <rco@openerp.com> | 2012-12-18 09:59:14 +0100 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2012-12-18 09:59:14 +0100 |
| commit | 73980eba5f64c674b0bc366c714a9a38d3bb915a (patch) | |
| tree | fce41f64e3309f05aa0a33eae1395b445c389a41 /addons/document_page/wizard/document_page_show_diff.py | |
| parent | 57acd22a0077feeae6261aae617ad9ad0a3be36d (diff) | |
| parent | 0cc0dfb8cf8d26c1029d02b7377226809821dc9b (diff) | |
[MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)
bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx
Diffstat (limited to 'addons/document_page/wizard/document_page_show_diff.py')
| -rw-r--r-- | addons/document_page/wizard/document_page_show_diff.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/document_page/wizard/document_page_show_diff.py b/addons/document_page/wizard/document_page_show_diff.py index 13e8e79b3b7..0c20ee79c74 100644 --- a/addons/document_page/wizard/document_page_show_diff.py +++ b/addons/document_page/wizard/document_page_show_diff.py @@ -19,8 +19,8 @@ # ############################################################################## -from osv import fields, osv -from tools.translate import _ +from openerp.osv import fields, osv +from openerp.tools.translate import _ import base64 class showdiff(osv.osv_memory): |