[IMP] move webrelease into addons/web
bzr revid: al@openerp.com-20110909141317-uvo90sxlg8o5w9dx
This commit is contained in:
parent
3875715c80
commit
25237f7178
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
"name" : "web",
|
||||
"version" : "2.0",
|
||||
"depends" : [],
|
||||
'active': True,
|
||||
'js' : [
|
||||
|
|
|
@ -1,11 +1,10 @@
|
|||
|
||||
name = 'openerp-web-proto'
|
||||
name = 'openerp-web'
|
||||
version = '6.1.0 alpha'
|
||||
description = "Web Client of OpenERP, the Enterprise Management Software"
|
||||
long_description = "OpenERP Web is the web client of the OpenERP, a free enterprise management software"
|
||||
author = "OpenERP S.A."
|
||||
author = "OpenERP SA"
|
||||
author_email = "info@openerp.com"
|
||||
support_email = 'support@openerp.com'
|
||||
url = "http://www.openerp.com/"
|
||||
download_url = ''
|
||||
license = "OEPL"
|
||||
license = "AGPL"
|
|
@ -12,17 +12,18 @@ import textwrap
|
|||
import xmlrpclib
|
||||
import time
|
||||
import zlib
|
||||
import webrelease
|
||||
from xml.etree import ElementTree
|
||||
from cStringIO import StringIO
|
||||
|
||||
from babel.messages.pofile import read_po
|
||||
|
||||
import web.common.dispatch as openerpweb
|
||||
import web.common.ast
|
||||
import web.common.nonliterals
|
||||
import web.common.release
|
||||
openerpweb.ast = web.common.ast
|
||||
openerpweb.nonliterals = web.common.nonliterals
|
||||
|
||||
from babel.messages.pofile import read_po
|
||||
|
||||
# Should move to openerpweb.Xml2Json
|
||||
class Xml2Json:
|
||||
|
@ -195,7 +196,7 @@ class WebClient(openerpweb.Controller):
|
|||
@openerpweb.jsonrequest
|
||||
def version_info(self, req):
|
||||
return {
|
||||
"version": webrelease.version
|
||||
"version": web.common.release.version
|
||||
}
|
||||
|
||||
class Database(openerpweb.Controller):
|
||||
|
|
Loading…
Reference in New Issue