Aeroo Reports

Merge lp:~peter-langenberg/aeroo/aeroo-absolute-import into lp:aeroo

  1. aeroo-absolute-import
  2. Merge into openerp7
Proposed by Peter Langenberg
Status: Needs review
Proposed branch: lp:~peter-langenberg/aeroo/aeroo-absolute-import
Merge into: lp:aeroo
Diff against target: 1016 lines (+122/-122)
66 files modified
report_aeroo/ExtraFunctions.py (+7/-7)
report_aeroo/barcode/EANBarCode.py (+1/-1)
report_aeroo/barcode/code39.py (+1/-1)
report_aeroo/check_deps.py (+2/-2)
report_aeroo/ctt_languages/en_US/__init__.py (+1/-1)
report_aeroo/ctt_languages/en_US/currencies/eur.py (+1/-1)
report_aeroo/ctt_languages/en_US/currencies/ltl.py (+1/-1)
report_aeroo/ctt_languages/en_US/currencies/lvl.py (+1/-1)
report_aeroo/ctt_languages/en_US/currencies/mxn.py (+1/-1)
report_aeroo/ctt_languages/en_US/currencies/trl.py (+1/-1)
report_aeroo/ctt_languages/en_US/currencies/usd.py (+1/-1)
report_aeroo/ctt_languages/es_ES/__init__.py (+1/-1)
report_aeroo/ctt_languages/es_ES/currencies/eur.py (+1/-1)
report_aeroo/ctt_languages/es_ES/currencies/mxn.py (+1/-1)
report_aeroo/ctt_languages/es_ES/currencies/usd.py (+1/-1)
report_aeroo/ctt_languages/lt_LT/__init__.py (+1/-1)
report_aeroo/ctt_languages/lt_LT/currencies/eur.py (+1/-1)
report_aeroo/ctt_languages/lt_LT/currencies/ltl.py (+1/-1)
report_aeroo/ctt_languages/lt_LT/currencies/lvl.py (+1/-1)
report_aeroo/ctt_languages/lt_LT/currencies/uah.py (+1/-1)
report_aeroo/ctt_languages/lt_LT/currencies/usd.py (+1/-1)
report_aeroo/ctt_languages/lv_LV/__init__.py (+1/-1)
report_aeroo/ctt_languages/lv_LV/currencies/eur.py (+1/-1)
report_aeroo/ctt_languages/lv_LV/currencies/ltl.py (+1/-1)
report_aeroo/ctt_languages/lv_LV/currencies/lvl.py (+1/-1)
report_aeroo/ctt_languages/lv_LV/currencies/mxn.py (+1/-1)
report_aeroo/ctt_languages/lv_LV/currencies/rub.py (+1/-1)
report_aeroo/ctt_languages/lv_LV/currencies/trl.py (+1/-1)
report_aeroo/ctt_languages/lv_LV/currencies/uah.py (+1/-1)
report_aeroo/ctt_languages/lv_LV/currencies/usd.py (+1/-1)
report_aeroo/ctt_languages/ru_RU/__init__.py (+1/-1)
report_aeroo/ctt_languages/ru_RU/currencies/eur.py (+1/-1)
report_aeroo/ctt_languages/ru_RU/currencies/ltl.py (+1/-1)
report_aeroo/ctt_languages/ru_RU/currencies/lvl.py (+1/-1)
report_aeroo/ctt_languages/ru_RU/currencies/rub.py (+1/-1)
report_aeroo/ctt_languages/ru_RU/currencies/uah.py (+1/-1)
report_aeroo/ctt_languages/ru_RU/currencies/usd.py (+1/-1)
report_aeroo/ctt_languages/tr_TR/__init__.py (+1/-1)
report_aeroo/ctt_languages/tr_TR/currencies/eur.py (+1/-1)
report_aeroo/ctt_languages/tr_TR/currencies/lvl.py (+1/-1)
report_aeroo/ctt_languages/tr_TR/currencies/trl.py (+1/-1)
report_aeroo/ctt_languages/tr_TR/currencies/usd.py (+1/-1)
report_aeroo/ctt_languages/uk_UA/__init__.py (+1/-1)
report_aeroo/ctt_languages/uk_UA/currencies/eur.py (+1/-1)
report_aeroo/ctt_languages/uk_UA/currencies/ltl.py (+1/-1)
report_aeroo/ctt_languages/uk_UA/currencies/lvl.py (+1/-1)
report_aeroo/ctt_languages/uk_UA/currencies/rub.py (+1/-1)
report_aeroo/ctt_languages/uk_UA/currencies/uah.py (+1/-1)
report_aeroo/ctt_languages/uk_UA/currencies/usd.py (+1/-1)
report_aeroo/installer.py (+4/-4)
report_aeroo/report_aeroo.py (+9/-9)
report_aeroo/report_xml.py (+8/-8)
report_aeroo/translate.py (+7/-7)
report_aeroo/wizard/add_print_button.py (+4/-4)
report_aeroo/wizard/remove_print_button.py (+4/-4)
report_aeroo/wizard/report_actions.py (+1/-1)
report_aeroo/wizard/report_import_wizard.py (+4/-4)
report_aeroo/wizard/report_print_actions.py (+4/-4)
report_aeroo/wizard/report_print_by_action.py (+2/-2)
report_aeroo_direct_print/check_deps.py (+2/-2)
report_aeroo_direct_print/installer.py (+3/-3)
report_aeroo_direct_print/report_aeroo_direct_print.py (+4/-4)
report_aeroo_ooo/DocumentConverter.py (+1/-1)
report_aeroo_ooo/check_deps.py (+2/-2)
report_aeroo_ooo/installer.py (+5/-5)
report_aeroo_ooo/report.py (+2/-2)
To merge this branch: bzr merge lp:~peter-langenberg/aeroo/aeroo-absolute-import
Reviewer Review Type Date Requested Status
Alistek developers - http://www.alistek.com Pending
Review via email: mp+192880@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

6. By Peter Langenberg

[IMP]change relative import to absolute import (for use with saas version or future versions)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'report_aeroo/ExtraFunctions.py'
2--- report_aeroo/ExtraFunctions.py 2013-05-16 15:53:25 +0000
3+++ report_aeroo/ExtraFunctions.py 2013-10-28 14:46:04 +0000
4@@ -31,19 +31,19 @@
5 ##############################################################################
6
7 from barcode import barcode
8-from tools import translate
9+from openerp.tools import translate
10 #from currency_to_text import currency_to_text
11 from ctt_objects import supported_language
12 import base64
13 import StringIO
14 from PIL import Image
15-import pooler
16+import openerp.pooler
17 import time
18-import osv
19-from report import report_sxw
20-from tools.translate import _
21-import netsvc
22-from tools.safe_eval import safe_eval as eval
23+import openerp.osv
24+from openerp.report import report_sxw
25+from openerp.tools.translate import _
26+import openerp.netsvc
27+from openerp.tools.safe_eval import safe_eval as eval
28 from aeroolib.plugins.opendocument import _filter
29
30 try:
31
32=== modified file 'report_aeroo/barcode/EANBarCode.py'
33--- report_aeroo/barcode/EANBarCode.py 2013-02-01 16:11:17 +0000
34+++ report_aeroo/barcode/EANBarCode.py 2013-10-28 14:46:04 +0000
35@@ -1,7 +1,7 @@
36 # Copyright (c) 2009-2011 Alistek Ltd (http://www.alistek.com) All Rights Reserved.
37 # General contacts <info@alistek.com>
38
39-from tools import config, ustr
40+from openerp.tools import config, ustr
41 fontsize = 15
42
43 """
44
45=== modified file 'report_aeroo/barcode/code39.py'
46--- report_aeroo/barcode/code39.py 2013-02-01 16:11:17 +0000
47+++ report_aeroo/barcode/code39.py 2013-10-28 14:46:04 +0000
48@@ -14,7 +14,7 @@
49 # a min line width of 2px with "Hello World" encoded as "*HELLO WORLD*" in Code 39
50
51 from PIL import Image, ImageDraw, ImageFont
52-from tools import config, ustr
53+from openerp.tools import config, ustr
54 import os, sys
55
56 marginx = 10
57
58=== modified file 'report_aeroo/check_deps.py'
59--- report_aeroo/check_deps.py 2013-02-01 16:11:17 +0000
60+++ report_aeroo/check_deps.py 2013-10-28 14:46:04 +0000
61@@ -30,8 +30,8 @@
62 #
63 ##############################################################################
64
65-from osv import osv
66-from tools.translate import _
67+from openerp.osv import osv
68+from openerp.tools.translate import _
69
70 __all__ = [
71 'check_deps',
72
73=== modified file 'report_aeroo/ctt_languages/en_US/__init__.py'
74--- report_aeroo/ctt_languages/en_US/__init__.py 2013-05-16 15:53:25 +0000
75+++ report_aeroo/ctt_languages/en_US/__init__.py 2013-10-28 14:46:04 +0000
76@@ -2,7 +2,7 @@
77 # -*- coding: utf8 -*-
78 # en_US
79
80-from report_aeroo.ctt_objects import ctt_language
81+from openerp.addons.report_aeroo.ctt_objects import ctt_language
82
83 class en_US(ctt_language):
84 def _init_lang(self):
85
86=== modified file 'report_aeroo/ctt_languages/en_US/currencies/eur.py'
87--- report_aeroo/ctt_languages/en_US/currencies/eur.py 2013-05-16 15:53:25 +0000
88+++ report_aeroo/ctt_languages/en_US/currencies/eur.py 2013-10-28 14:46:04 +0000
89@@ -1,7 +1,7 @@
90 #!/usr/bin/python
91 # -*- coding: utf8 -*-
92
93-from report_aeroo.ctt_objects import ctt_currency
94+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
95
96 class eur(ctt_currency):
97 def _init_currency(self):
98
99=== modified file 'report_aeroo/ctt_languages/en_US/currencies/ltl.py'
100--- report_aeroo/ctt_languages/en_US/currencies/ltl.py 2013-05-16 15:53:25 +0000
101+++ report_aeroo/ctt_languages/en_US/currencies/ltl.py 2013-10-28 14:46:04 +0000
102@@ -1,7 +1,7 @@
103 #!/usr/bin/python
104 # -*- coding: utf8 -*-
105
106-from report_aeroo.ctt_objects import ctt_currency
107+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
108
109 class ltl(ctt_currency):
110 def _init_currency(self):
111
112=== modified file 'report_aeroo/ctt_languages/en_US/currencies/lvl.py'
113--- report_aeroo/ctt_languages/en_US/currencies/lvl.py 2013-05-16 15:53:25 +0000
114+++ report_aeroo/ctt_languages/en_US/currencies/lvl.py 2013-10-28 14:46:04 +0000
115@@ -1,7 +1,7 @@
116 #!/usr/bin/python
117 # -*- coding: utf8 -*-
118
119-from report_aeroo.ctt_objects import ctt_currency
120+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
121
122 class lvl(ctt_currency):
123 def _init_currency(self):
124
125=== modified file 'report_aeroo/ctt_languages/en_US/currencies/mxn.py'
126--- report_aeroo/ctt_languages/en_US/currencies/mxn.py 2013-05-16 15:53:25 +0000
127+++ report_aeroo/ctt_languages/en_US/currencies/mxn.py 2013-10-28 14:46:04 +0000
128@@ -1,7 +1,7 @@
129 #!/usr/bin/python
130 # -*- coding: utf8 -*-
131
132-from report_aeroo.ctt_objects import ctt_currency
133+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
134
135 class mxn(ctt_currency):
136 def _init_currency(self):
137
138=== modified file 'report_aeroo/ctt_languages/en_US/currencies/trl.py'
139--- report_aeroo/ctt_languages/en_US/currencies/trl.py 2013-05-16 15:53:25 +0000
140+++ report_aeroo/ctt_languages/en_US/currencies/trl.py 2013-10-28 14:46:04 +0000
141@@ -1,7 +1,7 @@
142 #!/usr/bin/python
143 # -*- coding: utf8 -*-
144
145-from report_aeroo.ctt_objects import ctt_currency
146+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
147
148 class trl(ctt_currency):
149 def _init_currency(self):
150
151=== modified file 'report_aeroo/ctt_languages/en_US/currencies/usd.py'
152--- report_aeroo/ctt_languages/en_US/currencies/usd.py 2013-05-16 15:53:25 +0000
153+++ report_aeroo/ctt_languages/en_US/currencies/usd.py 2013-10-28 14:46:04 +0000
154@@ -1,7 +1,7 @@
155 #!/usr/bin/python
156 # -*- coding: utf8 -*-
157
158-from report_aeroo.ctt_objects import ctt_currency
159+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
160
161 class usd(ctt_currency):
162 def _init_currency(self):
163
164=== modified file 'report_aeroo/ctt_languages/es_ES/__init__.py'
165--- report_aeroo/ctt_languages/es_ES/__init__.py 2013-05-16 15:53:25 +0000
166+++ report_aeroo/ctt_languages/es_ES/__init__.py 2013-10-28 14:46:04 +0000
167@@ -7,7 +7,7 @@
168 # * Christopher Ormaza - Ecuadorenlinea.net <chris.ormaza@gmail.com>, 2011
169 ################################################################################
170
171-from report_aeroo.ctt_objects import ctt_language
172+from openerp.addons.report_aeroo.ctt_objects import ctt_language
173
174 class es_ES(ctt_language):
175 def _init_lang(self):
176
177=== modified file 'report_aeroo/ctt_languages/es_ES/currencies/eur.py'
178--- report_aeroo/ctt_languages/es_ES/currencies/eur.py 2013-05-16 15:53:25 +0000
179+++ report_aeroo/ctt_languages/es_ES/currencies/eur.py 2013-10-28 14:46:04 +0000
180@@ -1,7 +1,7 @@
181 #!/usr/bin/python
182 # -*- coding: utf8 -*-
183
184-from report_aeroo.ctt_objects import ctt_currency
185+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
186
187 class eur(ctt_currency):
188 def _init_currency(self):
189
190=== modified file 'report_aeroo/ctt_languages/es_ES/currencies/mxn.py'
191--- report_aeroo/ctt_languages/es_ES/currencies/mxn.py 2013-05-16 15:53:25 +0000
192+++ report_aeroo/ctt_languages/es_ES/currencies/mxn.py 2013-10-28 14:46:04 +0000
193@@ -1,7 +1,7 @@
194 #!/usr/bin/python
195 # -*- coding: utf8 -*-
196
197-from report_aeroo.ctt_objects import ctt_currency
198+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
199
200 class mxn(ctt_currency):
201 def _init_currency(self):
202
203=== modified file 'report_aeroo/ctt_languages/es_ES/currencies/usd.py'
204--- report_aeroo/ctt_languages/es_ES/currencies/usd.py 2013-05-16 15:53:25 +0000
205+++ report_aeroo/ctt_languages/es_ES/currencies/usd.py 2013-10-28 14:46:04 +0000
206@@ -1,7 +1,7 @@
207 #!/usr/bin/python
208 # -*- coding: utf8 -*-
209
210-from report_aeroo.ctt_objects import ctt_currency
211+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
212
213 class usd(ctt_currency):
214 def _init_currency(self):
215
216=== modified file 'report_aeroo/ctt_languages/lt_LT/__init__.py'
217--- report_aeroo/ctt_languages/lt_LT/__init__.py 2013-05-16 15:53:25 +0000
218+++ report_aeroo/ctt_languages/lt_LT/__init__.py 2013-10-28 14:46:04 +0000
219@@ -8,7 +8,7 @@
220 #
221 ################################################################################
222
223-from report_aeroo.ctt_objects import ctt_language
224+from openerp.addons.report_aeroo.ctt_objects import ctt_language
225
226 class lt_LT(ctt_language):
227 def _init_lang(self):
228
229=== modified file 'report_aeroo/ctt_languages/lt_LT/currencies/eur.py'
230--- report_aeroo/ctt_languages/lt_LT/currencies/eur.py 2013-05-16 15:53:25 +0000
231+++ report_aeroo/ctt_languages/lt_LT/currencies/eur.py 2013-10-28 14:46:04 +0000
232@@ -1,7 +1,7 @@
233 #!/usr/bin/python
234 # -*- coding: utf8 -*-
235
236-from report_aeroo.ctt_objects import ctt_currency
237+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
238
239 class eur(ctt_currency):
240 def _init_currency(self):
241
242=== modified file 'report_aeroo/ctt_languages/lt_LT/currencies/ltl.py'
243--- report_aeroo/ctt_languages/lt_LT/currencies/ltl.py 2013-05-16 15:53:25 +0000
244+++ report_aeroo/ctt_languages/lt_LT/currencies/ltl.py 2013-10-28 14:46:04 +0000
245@@ -1,7 +1,7 @@
246 #!/usr/bin/python
247 # -*- coding: utf8 -*-
248
249-from report_aeroo.ctt_objects import ctt_currency
250+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
251
252 class ltl(ctt_currency):
253 def _init_currency(self):
254
255=== modified file 'report_aeroo/ctt_languages/lt_LT/currencies/lvl.py'
256--- report_aeroo/ctt_languages/lt_LT/currencies/lvl.py 2013-05-16 15:53:25 +0000
257+++ report_aeroo/ctt_languages/lt_LT/currencies/lvl.py 2013-10-28 14:46:04 +0000
258@@ -1,7 +1,7 @@
259 #!/usr/bin/python
260 # -*- coding: utf8 -*-
261
262-from report_aeroo.ctt_objects import ctt_currency
263+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
264
265 class lvl(ctt_currency):
266 def _init_currency(self):
267
268=== modified file 'report_aeroo/ctt_languages/lt_LT/currencies/uah.py'
269--- report_aeroo/ctt_languages/lt_LT/currencies/uah.py 2013-05-16 15:53:25 +0000
270+++ report_aeroo/ctt_languages/lt_LT/currencies/uah.py 2013-10-28 14:46:04 +0000
271@@ -1,7 +1,7 @@
272 #!/usr/bin/python
273 # -*- coding: utf8 -*-
274
275-from report_aeroo.ctt_objects import ctt_currency
276+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
277
278 class uah(ctt_currency):
279 def _init_currency(self):
280
281=== modified file 'report_aeroo/ctt_languages/lt_LT/currencies/usd.py'
282--- report_aeroo/ctt_languages/lt_LT/currencies/usd.py 2013-05-16 15:53:25 +0000
283+++ report_aeroo/ctt_languages/lt_LT/currencies/usd.py 2013-10-28 14:46:04 +0000
284@@ -1,7 +1,7 @@
285 #!/usr/bin/python
286 # -*- coding: utf8 -*-
287
288-from report_aeroo.ctt_objects import ctt_currency
289+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
290
291 class usd(ctt_currency):
292 def _init_currency(self):
293
294=== modified file 'report_aeroo/ctt_languages/lv_LV/__init__.py'
295--- report_aeroo/ctt_languages/lv_LV/__init__.py 2013-05-16 15:53:25 +0000
296+++ report_aeroo/ctt_languages/lv_LV/__init__.py 2013-10-28 14:46:04 +0000
297@@ -2,7 +2,7 @@
298 # -*- coding: utf8 -*-
299 # lv_LV
300
301-from report_aeroo.ctt_objects import ctt_language
302+from openerp.addons.report_aeroo.ctt_objects import ctt_language
303
304 class lv_LV(ctt_language):
305 def _init_lang(self):
306
307=== modified file 'report_aeroo/ctt_languages/lv_LV/currencies/eur.py'
308--- report_aeroo/ctt_languages/lv_LV/currencies/eur.py 2013-05-16 15:53:25 +0000
309+++ report_aeroo/ctt_languages/lv_LV/currencies/eur.py 2013-10-28 14:46:04 +0000
310@@ -1,7 +1,7 @@
311 #!/usr/bin/python
312 # -*- coding: utf8 -*-
313
314-from report_aeroo.ctt_objects import ctt_currency
315+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
316
317 class eur(ctt_currency):
318 def _init_currency(self):
319
320=== modified file 'report_aeroo/ctt_languages/lv_LV/currencies/ltl.py'
321--- report_aeroo/ctt_languages/lv_LV/currencies/ltl.py 2013-05-16 15:53:25 +0000
322+++ report_aeroo/ctt_languages/lv_LV/currencies/ltl.py 2013-10-28 14:46:04 +0000
323@@ -1,7 +1,7 @@
324 #!/usr/bin/python
325 # -*- coding: utf8 -*-
326
327-from report_aeroo.ctt_objects import ctt_currency
328+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
329
330 class ltl(ctt_currency):
331 def _init_currency(self):
332
333=== modified file 'report_aeroo/ctt_languages/lv_LV/currencies/lvl.py'
334--- report_aeroo/ctt_languages/lv_LV/currencies/lvl.py 2013-05-16 15:53:25 +0000
335+++ report_aeroo/ctt_languages/lv_LV/currencies/lvl.py 2013-10-28 14:46:04 +0000
336@@ -1,7 +1,7 @@
337 #!/usr/bin/python
338 # -*- coding: utf8 -*-
339
340-from report_aeroo.ctt_objects import ctt_currency
341+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
342
343 class lvl(ctt_currency):
344 def _init_currency(self):
345
346=== modified file 'report_aeroo/ctt_languages/lv_LV/currencies/mxn.py'
347--- report_aeroo/ctt_languages/lv_LV/currencies/mxn.py 2013-05-16 15:53:25 +0000
348+++ report_aeroo/ctt_languages/lv_LV/currencies/mxn.py 2013-10-28 14:46:04 +0000
349@@ -1,7 +1,7 @@
350 #!/usr/bin/python
351 # -*- coding: utf8 -*-
352
353-from report_aeroo.ctt_objects import ctt_currency
354+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
355
356 class mxn(ctt_currency):
357 def _init_currency(self):
358
359=== modified file 'report_aeroo/ctt_languages/lv_LV/currencies/rub.py'
360--- report_aeroo/ctt_languages/lv_LV/currencies/rub.py 2013-05-16 15:53:25 +0000
361+++ report_aeroo/ctt_languages/lv_LV/currencies/rub.py 2013-10-28 14:46:04 +0000
362@@ -1,7 +1,7 @@
363 #!/usr/bin/python
364 # -*- coding: utf8 -*-
365
366-from report_aeroo.ctt_objects import ctt_currency
367+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
368
369 class rub(ctt_currency):
370 def _init_currency(self):
371
372=== modified file 'report_aeroo/ctt_languages/lv_LV/currencies/trl.py'
373--- report_aeroo/ctt_languages/lv_LV/currencies/trl.py 2013-05-16 15:53:25 +0000
374+++ report_aeroo/ctt_languages/lv_LV/currencies/trl.py 2013-10-28 14:46:04 +0000
375@@ -1,7 +1,7 @@
376 #!/usr/bin/python
377 # -*- coding: utf8 -*-
378
379-from report_aeroo.ctt_objects import ctt_currency
380+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
381
382 class trl(ctt_currency):
383 def _init_currency(self):
384
385=== modified file 'report_aeroo/ctt_languages/lv_LV/currencies/uah.py'
386--- report_aeroo/ctt_languages/lv_LV/currencies/uah.py 2013-05-16 15:53:25 +0000
387+++ report_aeroo/ctt_languages/lv_LV/currencies/uah.py 2013-10-28 14:46:04 +0000
388@@ -1,7 +1,7 @@
389 #!/usr/bin/python
390 # -*- coding: utf8 -*-
391
392-from report_aeroo.ctt_objects import ctt_currency
393+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
394
395 class uah(ctt_currency):
396 def _init_currency(self):
397
398=== modified file 'report_aeroo/ctt_languages/lv_LV/currencies/usd.py'
399--- report_aeroo/ctt_languages/lv_LV/currencies/usd.py 2013-05-16 15:53:25 +0000
400+++ report_aeroo/ctt_languages/lv_LV/currencies/usd.py 2013-10-28 14:46:04 +0000
401@@ -1,7 +1,7 @@
402 #!/usr/bin/python
403 # -*- coding: utf8 -*-
404
405-from report_aeroo.ctt_objects import ctt_currency
406+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
407
408 class usd(ctt_currency):
409 def _init_currency(self):
410
411=== modified file 'report_aeroo/ctt_languages/ru_RU/__init__.py'
412--- report_aeroo/ctt_languages/ru_RU/__init__.py 2013-05-16 15:53:25 +0000
413+++ report_aeroo/ctt_languages/ru_RU/__init__.py 2013-10-28 14:46:04 +0000
414@@ -2,7 +2,7 @@
415 # -*- coding: utf8 -*-
416 # ru_RU
417
418-from report_aeroo.ctt_objects import ctt_language
419+from openerp.addons.report_aeroo.ctt_objects import ctt_language
420
421 class ru_RU(ctt_language):
422 def _init_lang(self):
423
424=== modified file 'report_aeroo/ctt_languages/ru_RU/currencies/eur.py'
425--- report_aeroo/ctt_languages/ru_RU/currencies/eur.py 2013-05-16 15:53:25 +0000
426+++ report_aeroo/ctt_languages/ru_RU/currencies/eur.py 2013-10-28 14:46:04 +0000
427@@ -1,7 +1,7 @@
428 #!/usr/bin/python
429 # -*- coding: utf8 -*-
430
431-from report_aeroo.ctt_objects import ctt_currency
432+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
433
434 class eur(ctt_currency):
435 def _init_currency(self):
436
437=== modified file 'report_aeroo/ctt_languages/ru_RU/currencies/ltl.py'
438--- report_aeroo/ctt_languages/ru_RU/currencies/ltl.py 2013-05-16 15:53:25 +0000
439+++ report_aeroo/ctt_languages/ru_RU/currencies/ltl.py 2013-10-28 14:46:04 +0000
440@@ -1,7 +1,7 @@
441 #!/usr/bin/python
442 # -*- coding: utf8 -*-
443
444-from report_aeroo.ctt_objects import ctt_currency
445+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
446
447 class ltl(ctt_currency):
448 def _init_currency(self):
449
450=== modified file 'report_aeroo/ctt_languages/ru_RU/currencies/lvl.py'
451--- report_aeroo/ctt_languages/ru_RU/currencies/lvl.py 2013-05-16 15:53:25 +0000
452+++ report_aeroo/ctt_languages/ru_RU/currencies/lvl.py 2013-10-28 14:46:04 +0000
453@@ -1,7 +1,7 @@
454 #!/usr/bin/python
455 # -*- coding: utf8 -*-
456
457-from report_aeroo.ctt_objects import ctt_currency
458+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
459
460 class lvl(ctt_currency):
461 def _init_currency(self):
462
463=== modified file 'report_aeroo/ctt_languages/ru_RU/currencies/rub.py'
464--- report_aeroo/ctt_languages/ru_RU/currencies/rub.py 2013-05-16 15:53:25 +0000
465+++ report_aeroo/ctt_languages/ru_RU/currencies/rub.py 2013-10-28 14:46:04 +0000
466@@ -1,7 +1,7 @@
467 #!/usr/bin/python
468 # -*- coding: utf8 -*-
469
470-from report_aeroo.ctt_objects import ctt_currency
471+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
472
473 class rub(ctt_currency):
474 def _init_currency(self):
475
476=== modified file 'report_aeroo/ctt_languages/ru_RU/currencies/uah.py'
477--- report_aeroo/ctt_languages/ru_RU/currencies/uah.py 2013-05-16 15:53:25 +0000
478+++ report_aeroo/ctt_languages/ru_RU/currencies/uah.py 2013-10-28 14:46:04 +0000
479@@ -1,7 +1,7 @@
480 #!/usr/bin/python
481 # -*- coding: utf8 -*-
482
483-from report_aeroo.ctt_objects import ctt_currency
484+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
485
486 class uah(ctt_currency):
487 def _init_currency(self):
488
489=== modified file 'report_aeroo/ctt_languages/ru_RU/currencies/usd.py'
490--- report_aeroo/ctt_languages/ru_RU/currencies/usd.py 2013-05-16 15:53:25 +0000
491+++ report_aeroo/ctt_languages/ru_RU/currencies/usd.py 2013-10-28 14:46:04 +0000
492@@ -1,7 +1,7 @@
493 #!/usr/bin/python
494 # -*- coding: utf8 -*-
495
496-from report_aeroo.ctt_objects import ctt_currency
497+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
498
499 class usd(ctt_currency):
500 def _init_currency(self):
501
502=== modified file 'report_aeroo/ctt_languages/tr_TR/__init__.py'
503--- report_aeroo/ctt_languages/tr_TR/__init__.py 2013-05-16 15:53:25 +0000
504+++ report_aeroo/ctt_languages/tr_TR/__init__.py 2013-10-28 14:46:04 +0000
505@@ -7,7 +7,7 @@
506 # Ahmet Altınışık
507 #
508 ################################################################################
509-from report_aeroo.ctt_objects import ctt_language
510+from openerp.addons.report_aeroo.ctt_objects import ctt_language
511
512 class tr_TR(ctt_language):
513 def _init_lang(self):
514
515=== modified file 'report_aeroo/ctt_languages/tr_TR/currencies/eur.py'
516--- report_aeroo/ctt_languages/tr_TR/currencies/eur.py 2013-05-16 15:53:25 +0000
517+++ report_aeroo/ctt_languages/tr_TR/currencies/eur.py 2013-10-28 14:46:04 +0000
518@@ -1,7 +1,7 @@
519 #!/usr/bin/python
520 # -*- coding: utf8 -*-
521
522-from report_aeroo.ctt_objects import ctt_currency
523+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
524
525 class eur(ctt_currency):
526 def _init_currency(self):
527
528=== modified file 'report_aeroo/ctt_languages/tr_TR/currencies/lvl.py'
529--- report_aeroo/ctt_languages/tr_TR/currencies/lvl.py 2013-05-16 15:53:25 +0000
530+++ report_aeroo/ctt_languages/tr_TR/currencies/lvl.py 2013-10-28 14:46:04 +0000
531@@ -1,7 +1,7 @@
532 #!/usr/bin/python
533 # -*- coding: utf8 -*-
534
535-from report_aeroo.ctt_objects import ctt_currency
536+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
537
538 class lvl(ctt_currency):
539 def _init_currency(self):
540
541=== modified file 'report_aeroo/ctt_languages/tr_TR/currencies/trl.py'
542--- report_aeroo/ctt_languages/tr_TR/currencies/trl.py 2013-05-16 15:53:25 +0000
543+++ report_aeroo/ctt_languages/tr_TR/currencies/trl.py 2013-10-28 14:46:04 +0000
544@@ -1,7 +1,7 @@
545 #!/usr/bin/python
546 # -*- coding: utf8 -*-
547
548-from report_aeroo.ctt_objects import ctt_currency
549+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
550
551 class trl(ctt_currency):
552 def _init_currency(self):
553
554=== modified file 'report_aeroo/ctt_languages/tr_TR/currencies/usd.py'
555--- report_aeroo/ctt_languages/tr_TR/currencies/usd.py 2013-05-16 15:53:25 +0000
556+++ report_aeroo/ctt_languages/tr_TR/currencies/usd.py 2013-10-28 14:46:04 +0000
557@@ -1,7 +1,7 @@
558 #!/usr/bin/python
559 # -*- coding: utf8 -*-
560
561-from report_aeroo.ctt_objects import ctt_currency
562+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
563
564 class usd(ctt_currency):
565 def _init_currency(self):
566
567=== modified file 'report_aeroo/ctt_languages/uk_UA/__init__.py'
568--- report_aeroo/ctt_languages/uk_UA/__init__.py 2013-05-16 15:53:25 +0000
569+++ report_aeroo/ctt_languages/uk_UA/__init__.py 2013-10-28 14:46:04 +0000
570@@ -2,7 +2,7 @@
571 # -*- coding: utf8 -*-
572 # uk_UA
573
574-from report_aeroo.ctt_objects import ctt_language
575+from openerp.addons.report_aeroo.ctt_objects import ctt_language
576
577 class uk_UA(ctt_language):
578 def _init_lang(self):
579
580=== modified file 'report_aeroo/ctt_languages/uk_UA/currencies/eur.py'
581--- report_aeroo/ctt_languages/uk_UA/currencies/eur.py 2013-05-16 15:53:25 +0000
582+++ report_aeroo/ctt_languages/uk_UA/currencies/eur.py 2013-10-28 14:46:04 +0000
583@@ -1,7 +1,7 @@
584 #!/usr/bin/python
585 # -*- coding: utf8 -*-
586
587-from report_aeroo.ctt_objects import ctt_currency
588+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
589
590 class eur(ctt_currency):
591 def _init_currency(self):
592
593=== modified file 'report_aeroo/ctt_languages/uk_UA/currencies/ltl.py'
594--- report_aeroo/ctt_languages/uk_UA/currencies/ltl.py 2013-05-16 15:53:25 +0000
595+++ report_aeroo/ctt_languages/uk_UA/currencies/ltl.py 2013-10-28 14:46:04 +0000
596@@ -1,7 +1,7 @@
597 #!/usr/bin/python
598 # -*- coding: utf8 -*-
599
600-from report_aeroo.ctt_objects import ctt_currency
601+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
602
603 class ltl(ctt_currency):
604 def _init_currency(self):
605
606=== modified file 'report_aeroo/ctt_languages/uk_UA/currencies/lvl.py'
607--- report_aeroo/ctt_languages/uk_UA/currencies/lvl.py 2013-05-16 15:53:25 +0000
608+++ report_aeroo/ctt_languages/uk_UA/currencies/lvl.py 2013-10-28 14:46:04 +0000
609@@ -1,7 +1,7 @@
610 #!/usr/bin/python
611 # -*- coding: utf8 -*-
612
613-from report_aeroo.ctt_objects import ctt_currency
614+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
615
616 class lvl(ctt_currency):
617 def _init_currency(self):
618
619=== modified file 'report_aeroo/ctt_languages/uk_UA/currencies/rub.py'
620--- report_aeroo/ctt_languages/uk_UA/currencies/rub.py 2013-05-16 15:53:25 +0000
621+++ report_aeroo/ctt_languages/uk_UA/currencies/rub.py 2013-10-28 14:46:04 +0000
622@@ -1,7 +1,7 @@
623 #!/usr/bin/python
624 # -*- coding: utf8 -*-
625
626-from report_aeroo.ctt_objects import ctt_currency
627+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
628
629 class rub(ctt_currency):
630 def _init_currency(self):
631
632=== modified file 'report_aeroo/ctt_languages/uk_UA/currencies/uah.py'
633--- report_aeroo/ctt_languages/uk_UA/currencies/uah.py 2013-05-16 15:53:25 +0000
634+++ report_aeroo/ctt_languages/uk_UA/currencies/uah.py 2013-10-28 14:46:04 +0000
635@@ -1,7 +1,7 @@
636 #!/usr/bin/python
637 # -*- coding: utf8 -*-
638
639-from report_aeroo.ctt_objects import ctt_currency
640+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
641
642 class uah(ctt_currency):
643 def _init_currency(self):
644
645=== modified file 'report_aeroo/ctt_languages/uk_UA/currencies/usd.py'
646--- report_aeroo/ctt_languages/uk_UA/currencies/usd.py 2013-05-16 15:53:25 +0000
647+++ report_aeroo/ctt_languages/uk_UA/currencies/usd.py 2013-10-28 14:46:04 +0000
648@@ -1,7 +1,7 @@
649 #!/usr/bin/python
650 # -*- coding: utf8 -*-
651
652-from report_aeroo.ctt_objects import ctt_currency
653+from openerp.addons.report_aeroo.ctt_objects import ctt_currency
654
655 class usd(ctt_currency):
656 def _init_currency(self):
657
658=== modified file 'report_aeroo/installer.py'
659--- report_aeroo/installer.py 2013-05-16 15:53:25 +0000
660+++ report_aeroo/installer.py 2013-10-28 14:46:04 +0000
661@@ -30,10 +30,10 @@
662 #
663 ##############################################################################
664
665-from osv import fields
666-from osv import osv
667-import netsvc
668-import tools
669+from openerp.osv import fields
670+from openerp.osv import osv
671+import openerp.netsvc
672+import openerp.tools
673 import os, base64
674 import urllib2
675
676
677=== modified file 'report_aeroo/report_aeroo.py'
678--- report_aeroo/report_aeroo.py 2013-05-16 15:53:25 +0000
679+++ report_aeroo/report_aeroo.py 2013-10-28 14:46:04 +0000
680@@ -34,9 +34,9 @@
681
682 import os, sys, traceback
683 from tempfile import NamedTemporaryFile
684-import report
685-from report.report_sxw import report_sxw, report_rml, browse_record_list
686-from report.pyPdf import PdfFileWriter, PdfFileReader
687+from openerp import report
688+from openerp.report.report_sxw import report_sxw, report_rml, browse_record_list
689+from openerp.report.pyPdf import PdfFileWriter, PdfFileReader
690 #import zipfile
691 try:
692 from cStringIO import StringIO
693@@ -44,9 +44,9 @@
694 from StringIO import StringIO
695 from xml.dom import minidom
696 import base64
697-from osv import osv
698-from tools.translate import _
699-import tools
700+from openerp.osv import osv
701+from openerp.tools.translate import _
702+from openerp import tools
703 import time
704 import re
705 import copy
706@@ -57,14 +57,14 @@
707 from addons import load_information_from_description_file # for OpenERP 6.0.x
708 except ImportError:
709 from openerp.modules import load_information_from_description_file # for OpenERP 6.1
710-import release
711+from openerp import release
712
713 import aeroolib
714 from aeroolib.plugins.opendocument import Template, OOSerializer
715 from genshi.template import NewTextTemplate
716 from genshi import __version__ as genshi_version
717-import pooler
718-import netsvc
719+from openerp import pooler
720+from openerp import netsvc
721 from lxml import etree
722 import logging
723
724
725=== modified file 'report_aeroo/report_xml.py'
726--- report_aeroo/report_xml.py 2013-05-16 15:53:25 +0000
727+++ report_aeroo/report_xml.py 2013-10-28 14:46:04 +0000
728@@ -29,19 +29,19 @@
729 #
730 ##############################################################################
731
732-from osv import osv,fields
733-from osv.orm import transfer_modifiers_to_node
734-import netsvc
735-from report_aeroo import Aeroo_report, aeroo_ooo_test
736-from report.report_sxw import rml_parse
737+from openerp.osv import osv,fields
738+from openerp.osv.orm import transfer_modifiers_to_node
739+import openerp.netsvc
740+from openerp.addons.report_aeroo.report_aeroo import Aeroo_report, aeroo_ooo_test
741+from openerp.report.report_sxw import rml_parse
742 import base64, binascii
743-import tools
744+from openerp import tools
745 import encodings
746-from tools.translate import _
747+from openerp.tools.translate import _
748
749 import imp, sys, os
750 import zipimport
751-from tools.config import config
752+from openerp.tools.config import config
753 from lxml import etree
754
755 class report_stylesheets(osv.osv):
756
757=== modified file 'report_aeroo/translate.py'
758--- report_aeroo/translate.py 2013-05-16 15:53:25 +0000
759+++ report_aeroo/translate.py 2013-10-28 14:46:04 +0000
760@@ -22,15 +22,15 @@
761
762 import os
763 import logging
764-import pooler
765-import tools
766-from tools.translate import trans_parse_rml, trans_parse_xsl, trans_parse_view
767+from openerp import pooler
768+from openerp import tools
769+from openerp.tools.translate import trans_parse_rml, trans_parse_xsl, trans_parse_view
770 import fnmatch
771 from os.path import join
772 from lxml import etree
773-from tools import misc
774-from tools.misc import UpdateableStr
775-from tools import osutil
776+from openerp.tools import misc
777+from openerp.tools.misc import UpdateableStr
778+from openerp.tools import osutil
779 from babel.messages import extract
780
781 _logger = logging.getLogger(__name__)
782@@ -346,5 +346,5 @@
783 return out
784
785 import sys
786-sys.modules['tools.translate'].trans_generate = extend_trans_generate
787+sys.modules['openerp.tools.translate'].trans_generate = extend_trans_generate
788
789
790=== modified file 'report_aeroo/wizard/add_print_button.py'
791--- report_aeroo/wizard/add_print_button.py 2013-05-16 15:53:25 +0000
792+++ report_aeroo/wizard/add_print_button.py 2013-10-28 14:46:04 +0000
793@@ -29,10 +29,10 @@
794 #
795 ##############################################################################
796
797-import pooler
798-from tools.translate import _
799-from osv import osv
800-from osv import fields
801+from openerp import pooler
802+from openerp.tools.translate import _
803+from openerp.osv import osv
804+from openerp.osv import fields
805
806 special_reports = [
807 'printscreen.list'
808
809=== modified file 'report_aeroo/wizard/remove_print_button.py'
810--- report_aeroo/wizard/remove_print_button.py 2013-05-16 15:53:25 +0000
811+++ report_aeroo/wizard/remove_print_button.py 2013-10-28 14:46:04 +0000
812@@ -29,10 +29,10 @@
813 #
814 ##############################################################################
815
816-import pooler
817-from tools.translate import _
818-from osv import osv
819-from osv import fields
820+from openerp import pooler
821+from openerp.tools.translate import _
822+from openerp.osv import osv
823+from openerp.osv import fields
824
825 def ir_del(cr, uid, id):
826 obj = pooler.get_pool(cr.dbname).get('ir.values')
827
828=== modified file 'report_aeroo/wizard/report_actions.py'
829--- report_aeroo/wizard/report_actions.py 2013-02-01 16:11:17 +0000
830+++ report_aeroo/wizard/report_actions.py 2013-10-28 14:46:04 +0000
831@@ -31,7 +31,7 @@
832
833 import wizard
834 import pooler
835-from tools.translate import _
836+from openerp.tools.translate import _
837
838 def ir_set(cr, uid, key, key2, name, models, value, replace=True, isobject=False, meta=None):
839 obj = pooler.get_pool(cr.dbname).get('ir.values')
840
841=== modified file 'report_aeroo/wizard/report_import_wizard.py'
842--- report_aeroo/wizard/report_import_wizard.py 2013-05-16 15:53:25 +0000
843+++ report_aeroo/wizard/report_import_wizard.py 2013-10-28 14:46:04 +0000
844@@ -29,10 +29,10 @@
845 #
846 ##############################################################################
847
848-from osv import osv
849-from osv import fields
850-from tools import convert_xml_import
851-from tools.translate import _
852+from openerp.osv import osv
853+from openerp.osv import fields
854+from openerp.tools import convert_xml_import
855+from openerp.tools.translate import _
856 import base64
857 import lxml.etree
858 import zipfile
859
860=== modified file 'report_aeroo/wizard/report_print_actions.py'
861--- report_aeroo/wizard/report_print_actions.py 2013-05-16 15:53:25 +0000
862+++ report_aeroo/wizard/report_print_actions.py 2013-10-28 14:46:04 +0000
863@@ -29,11 +29,11 @@
864 #
865 ##############################################################################
866
867-from osv import osv
868-from osv import fields
869-import netsvc
870+from openerp.osv import osv
871+from openerp.osv import fields
872+from openerp import netsvc
873
874-from tools.translate import _
875+from openerp.tools.translate import _
876
877 class report_print_actions(osv.osv_memory):
878 _name = 'aeroo.print_actions'
879
880=== modified file 'report_aeroo/wizard/report_print_by_action.py'
881--- report_aeroo/wizard/report_print_by_action.py 2013-02-01 16:11:17 +0000
882+++ report_aeroo/wizard/report_print_by_action.py 2013-10-28 14:46:04 +0000
883@@ -30,8 +30,8 @@
884 ##############################################################################
885
886
887-from osv import osv
888-from osv import fields
889+from openerp.osv import osv
890+from openerp.osv import fields
891
892 class report_print_by_action(osv.osv_memory):
893 _name = 'aeroo.print_by_action'
894
895=== modified file 'report_aeroo_direct_print/check_deps.py'
896--- report_aeroo_direct_print/check_deps.py 2013-05-16 15:53:25 +0000
897+++ report_aeroo_direct_print/check_deps.py 2013-10-28 14:46:04 +0000
898@@ -30,8 +30,8 @@
899 #
900 ##############################################################################
901
902-from osv import osv
903-from tools.translate import _
904+from openerp.osv import osv
905+from openerp.tools.translate import _
906
907 __all__ = [
908 'check_deps',
909
910=== modified file 'report_aeroo_direct_print/installer.py'
911--- report_aeroo_direct_print/installer.py 2013-05-16 15:53:25 +0000
912+++ report_aeroo_direct_print/installer.py 2013-10-28 14:46:04 +0000
913@@ -30,9 +30,9 @@
914 #
915 ##############################################################################
916
917-from osv import fields
918-from osv import osv
919-import tools
920+from openerp.osv import fields
921+from openerp.osv import osv
922+from openerp import tools
923 import os, base64
924 import cups
925 import urllib2
926
927=== modified file 'report_aeroo_direct_print/report_aeroo_direct_print.py'
928--- report_aeroo_direct_print/report_aeroo_direct_print.py 2013-05-16 15:53:25 +0000
929+++ report_aeroo_direct_print/report_aeroo_direct_print.py 2013-10-28 14:46:04 +0000
930@@ -29,11 +29,11 @@
931 #
932 ##############################################################################
933
934-from osv import osv
935-from osv import fields
936-from tools.translate import _
937+from openerp.osv import osv
938+from openerp.osv import fields
939+from openerp.tools.translate import _
940
941-import netsvc
942+from openerp import netsvc
943 import cups
944 from tempfile import NamedTemporaryFile
945 import md5
946
947=== modified file 'report_aeroo_ooo/DocumentConverter.py'
948--- report_aeroo_ooo/DocumentConverter.py 2013-05-16 15:53:25 +0000
949+++ report_aeroo_ooo/DocumentConverter.py 2013-10-28 14:46:04 +0000
950@@ -45,7 +45,7 @@
951 from com.sun.star.lang import IllegalArgumentException
952 from com.sun.star.io import XOutputStream
953 from com.sun.star.io import IOException
954-from tools.translate import _
955+from openerp.tools.translate import _
956
957 logger = logging.getLogger(__name__)
958
959
960=== modified file 'report_aeroo_ooo/check_deps.py'
961--- report_aeroo_ooo/check_deps.py 2013-02-01 16:11:17 +0000
962+++ report_aeroo_ooo/check_deps.py 2013-10-28 14:46:04 +0000
963@@ -30,8 +30,8 @@
964 #
965 ##############################################################################
966
967-from osv import osv
968-from tools.translate import _
969+from openerp.osv import osv
970+from openerp.tools.translate import _
971
972 __all__ = [
973 'check_deps',
974
975=== modified file 'report_aeroo_ooo/installer.py'
976--- report_aeroo_ooo/installer.py 2013-05-16 15:53:25 +0000
977+++ report_aeroo_ooo/installer.py 2013-10-28 14:46:04 +0000
978@@ -30,10 +30,10 @@
979 #
980 ##############################################################################
981
982-from osv import fields
983-from osv import osv
984-import netsvc
985-import tools
986+from openerp.osv import fields
987+from openerp.osv import osv
988+from openerp import netsvc
989+from openerp import tools
990 from xml.dom import minidom
991 import os, base64
992 import urllib2
993@@ -41,7 +41,7 @@
994 from cStringIO import StringIO
995 except ImportError:
996 from StringIO import StringIO
997-from tools.translate import _
998+from openerp.tools.translate import _
999
1000 from report_aeroo_ooo.DocumentConverter import DocumentConversionException
1001 from report_aeroo_ooo.report import OpenOffice_service
1002
1003=== modified file 'report_aeroo_ooo/report.py'
1004--- report_aeroo_ooo/report.py 2013-05-16 15:53:25 +0000
1005+++ report_aeroo_ooo/report.py 2013-10-28 14:46:04 +0000
1006@@ -29,8 +29,8 @@
1007 #
1008 ##############################################################################
1009
1010-from osv import osv,fields
1011-import netsvc
1012+from openerp.osv import osv,fields
1013+from openerp import netsvc
1014 from DocumentConverter import DocumentConverter
1015
1016 class OpenOffice_service (DocumentConverter, netsvc.Service):

Subscribers

People subscribed via source and target branches