[FIX] replace from/import stuffs of openerp stuffs by from/import openerp.stuffs
bzr revid: cto@openerp.com-20121217154628-0c0i8y3389yz4dxd
This commit is contained in:
parent
a3939acfa5
commit
baeefa6952
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
from openerp.osv import osv,fields
|
from openerp.osv import osv,fields
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
from tools.amount_to_text_en import amount_to_text
|
from openerp.tools.amount_to_text_en import amount_to_text
|
||||||
from lxml import etree
|
from lxml import etree
|
||||||
|
|
||||||
class account_voucher(osv.osv):
|
class account_voucher(osv.osv):
|
||||||
|
|
|
@ -19,9 +19,9 @@
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from tools.translate import _
|
from openerp.tools.translate import _
|
||||||
|
|
||||||
from osv import fields, osv
|
from openerp.osv import fields, osv
|
||||||
|
|
||||||
class account_check_write(osv.osv_memory):
|
class account_check_write(osv.osv_memory):
|
||||||
_name = 'account.check.write'
|
_name = 'account.check.write'
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from osv import fields,osv
|
from openerp.osv import fields,osv
|
||||||
import pooler
|
import pooler
|
||||||
import netsvc
|
import netsvc
|
||||||
import time
|
import time
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
import datetime
|
import datetime
|
||||||
import time
|
import time
|
||||||
from report import report_sxw
|
from report import report_sxw
|
||||||
from tools.translate import _
|
from openerp.tools.translate import _
|
||||||
#
|
#
|
||||||
# Use period and Journal for selection or resources
|
# Use period and Journal for selection or resources
|
||||||
#
|
#
|
||||||
|
|
|
@ -18,13 +18,9 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from openerp.osv import fields, osv
|
from openerp.osv import fields, osv
|
||||||
from osv.orm import intersect, except_orm
|
from openerp.osv.orm import intersect
|
||||||
import tools.sql
|
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
from openerp.addons.decimal_precision import decimal_precision as dp
|
|
||||||
|
|
||||||
|
|
||||||
class account_analytic_account(osv.osv):
|
class account_analytic_account(osv.osv):
|
||||||
_name = "account.analytic.account"
|
_name = "account.analytic.account"
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from openerp.osv import fields, osv
|
from openerp.osv import fields, osv
|
||||||
from osv.osv import object_proxy
|
from openerp.osv.osv import object_proxy
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
from openerp import pooler
|
from openerp import pooler
|
||||||
import time
|
import time
|
||||||
|
|
|
@ -24,7 +24,7 @@ from openerp import tools
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
|
|
||||||
from base_calendar import get_real_ids, base_calendar_id2real_id
|
from base_calendar import get_real_ids, base_calendar_id2real_id
|
||||||
from base_status.base_state import base_state
|
from openerp.addons.base_status.base_state import base_state
|
||||||
#
|
#
|
||||||
# crm.meeting is defined here so that it may be used by modules other than crm,
|
# crm.meeting is defined here so that it may be used by modules other than crm,
|
||||||
# without forcing the installation of crm.
|
# without forcing the installation of crm.
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from service import security
|
from openerp.service import security
|
||||||
import crypt
|
import crypt
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ from string import ascii_letters, digits
|
||||||
from openerp.osv import fields,osv
|
from openerp.osv import fields,osv
|
||||||
from openerp import pooler
|
from openerp import pooler
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
from service import security
|
from openerp.service import security
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
magic_md5 = '$1$'
|
magic_md5 = '$1$'
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from base_status.base_stage import base_stage
|
from openerp.addons.base_status.base_stage import base_stage
|
||||||
import crm
|
import crm
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from openerp.osv import fields, osv
|
from openerp.osv import fields, osv
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from base_status.base_state import base_state
|
from openerp.addons.base_status.base_state import base_state
|
||||||
import crm
|
import crm
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from openerp.osv import fields, osv
|
from openerp.osv import fields, osv
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from base_status.base_stage import base_stage
|
from openerp.addons.base_status.base_stage import base_stage
|
||||||
import binascii
|
import binascii
|
||||||
from crm import crm
|
from crm import crm
|
||||||
from openerp.osv import fields, osv
|
from openerp.osv import fields, osv
|
||||||
|
|
|
@ -19,8 +19,8 @@
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from base_status.base_state import base_state
|
from openerp.addons.base_status.base_state import base_state
|
||||||
from base_status.base_stage import base_stage
|
from openerp.addons.base_status.base_stage import base_stage
|
||||||
from crm import crm
|
from crm import crm
|
||||||
from openerp.osv import fields, osv
|
from openerp.osv import fields, osv
|
||||||
from openerp import tools
|
from openerp import tools
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from openerp.osv import fields,osv
|
from openerp.osv import fields,osv
|
||||||
from osv import orm
|
from openerp.osv import orm
|
||||||
|
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ from openerp import pooler
|
||||||
from openerp import netsvc
|
from openerp import netsvc
|
||||||
import sql_db
|
import sql_db
|
||||||
|
|
||||||
from service import security
|
from openerp.service import security
|
||||||
from openerp.osv import osv
|
from openerp.osv import osv
|
||||||
from document.nodes import get_node_context
|
from document.nodes import get_node_context
|
||||||
|
|
||||||
|
|
|
@ -22,8 +22,8 @@
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import urlparse
|
import urlparse
|
||||||
from service.websrv_lib import FixSendError, HTTPHandler, HttpOptions
|
from openerp.service.websrv_lib import FixSendError, HTTPHandler, HttpOptions
|
||||||
from service.http_server import HttpLogHandler
|
from openerp.service.http_server import HttpLogHandler
|
||||||
_logger = logging.getLogger(__name__)
|
_logger = logging.getLogger(__name__)
|
||||||
class RedirectHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler):
|
class RedirectHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler):
|
||||||
|
|
||||||
|
|
|
@ -48,8 +48,8 @@ except ImportError:
|
||||||
from DAV.utils import IfParser, TagList
|
from DAV.utils import IfParser, TagList
|
||||||
from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
|
from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
|
||||||
from DAV.propfind import PROPFIND
|
from DAV.propfind import PROPFIND
|
||||||
from service import http_server
|
from openerp.service import http_server
|
||||||
from service.websrv_lib import FixSendError, HttpOptions
|
from openerp.service.websrv_lib import FixSendError, HttpOptions
|
||||||
from BaseHTTPServer import BaseHTTPRequestHandler
|
from BaseHTTPServer import BaseHTTPRequestHandler
|
||||||
import urlparse
|
import urlparse
|
||||||
import urllib
|
import urllib
|
||||||
|
@ -433,7 +433,7 @@ class DAVHandler(DAVRequestHandler, HttpOptions, FixSendError):
|
||||||
data['lockowner'] = owners
|
data['lockowner'] = owners
|
||||||
return data
|
return data
|
||||||
|
|
||||||
from service.http_server import reg_http_service,OpenERPAuthProvider
|
from openerp.service.http_server import reg_http_service,OpenERPAuthProvider
|
||||||
|
|
||||||
class DAVAuthProvider(OpenERPAuthProvider):
|
class DAVAuthProvider(OpenERPAuthProvider):
|
||||||
def authenticate(self, db, user, passwd, client_address):
|
def authenticate(self, db, user, passwd, client_address):
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
import time
|
import time
|
||||||
from openerp import tools
|
from openerp import tools
|
||||||
|
|
||||||
from base_status.base_stage import base_stage
|
from openerp.addons.base_status.base_stage import base_stage
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from openerp.osv import fields, osv
|
from openerp.osv import fields, osv
|
||||||
from openerp.tools.translate import _
|
from openerp.tools.translate import _
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
from base_status.base_stage import base_stage
|
from openerp.addons.base_status.base_stage import base_stage
|
||||||
from crm import crm
|
from crm import crm
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from openerp.osv import fields,osv
|
from openerp.osv import fields,osv
|
||||||
|
|
Loading…
Reference in New Issue