Christophe (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-version-chs into lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-version-chs/+merge/116226
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-version-chs/+merge/116226
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-version-chs.
=== modified file 'openerp/release.py'
--- openerp/release.py 2012-03-14 14:20:43 +0000
+++ openerp/release.py 2012-07-23 09:56:24 +0000
@@ -30,9 +30,9 @@
# properly comparable using normal operarors, for example:
# (6,1,0,'beta',0) < (6,1,0,'candidate',1) < (6,1,0,'candidate',2)
# (6,1,0,'candidate',2) < (6,1,0,'final',0) < (6,1,2,'final',0)
-version_info = (6,2,0,ALPHA,0)
-version = '.'.join(map(str,version_info[:2])) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '')
-major_version = '.'.join(map(str,version_info[:2]))
+version_info = (7, 0, 0, ALPHA, 0)
+version = '.'.join(map(str, version_info[:2])) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '')
+serie = major_version = '.'.join(map(str, version_info[:2]))
description = 'OpenERP Server'
long_desc = '''OpenERP is a complete ERP and CRM. The main features are accounting (analytic
=== modified file 'openerp/service/web_services.py'
--- openerp/service/web_services.py 2012-03-22 15:05:06 +0000
+++ openerp/service/web_services.py 2012-07-23 09:56:24 +0000
@@ -52,7 +52,16 @@
_logger = logging.getLogger(__name__)
-RPC_VERSION_1 = {'server_version': '6.1', 'protocol_version': 1}
+RPC_VERSION_1 = {
+ 'server': {
+ 'version': release.version,
+ 'version_info': release.version_info,
+ 'serie': release.serie,
+ },
+ 'protocol': {
+ 'version': 1
+ },
+}
# This should be moved to openerp.modules.db, along side initialize().
def _initialize_db(serv, id, db_name, demo, lang, user_password):
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
