[MERGE] Minor bugfixes (missing imports, etc.) courtesy of Florent Xicluna
bzr revid: odo@openerp.com-20120214150022-yx6zi0j4fr2d48uc
This commit is contained in:
commit
79ac080fb2
|
@ -125,8 +125,6 @@ class view(osv.osv):
|
|||
return result
|
||||
|
||||
def graph_get(self, cr, uid, id, model, node_obj, conn_obj, src_node, des_node, label, scale, context=None):
|
||||
if not label:
|
||||
label = []
|
||||
nodes=[]
|
||||
nodes_name=[]
|
||||
transitions=[]
|
||||
|
|
|
@ -23,6 +23,7 @@ from osv import osv, fields
|
|||
import tools
|
||||
import pooler
|
||||
import cStringIO
|
||||
from tools.translate import _
|
||||
|
||||
class base_update_translations(osv.osv_memory):
|
||||
def _get_languages(self, cr, uid, context):
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
import copy
|
||||
import re
|
||||
import reportlab
|
||||
import reportlab.lib.units
|
||||
|
|
|
@ -36,7 +36,7 @@ from types import CodeType
|
|||
import logging
|
||||
import os
|
||||
|
||||
__all__ = ['test_expr', 'safe_eval', 'const_eval', 'ext_eval' ]
|
||||
__all__ = ['test_expr', 'safe_eval', 'const_eval']
|
||||
|
||||
# The time module is usually already provided in the safe_eval environment
|
||||
# but some code, e.g. datetime.datetime.now() (Windows/Python 2.5.2, bug
|
||||
|
|
Loading…
Reference in New Issue