← Back to branch summary

~openerp-dev/openobject-server/trunk-missing-default-values-pza

« back to all changes in this revision

Viewing changes to openerp/modules/migration.py

  • Committer: Pooja Zankhariya (OpenERP)
  • Date: 2014-01-31 06:44:29 UTC
  • mfrom: (5013.1.35 trunk)
  • Revision ID: pza@tinyerp.com-20140131064429-0a1u9ax5cf3sslug
[MERGE]Sync with Trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
openerp/modules/migration.py
30
30
import openerp
31
31
import openerp.release as release
32
32
import openerp.tools as tools
 
33
from openerp.tools.parse_version import parse_version
33
34
 
34
35
 
35
36
_logger = logging.getLogger(__name__)
93
94
            return
94
95
 
95
96
        def convert_version(version):
96
 
            if version.startswith(release.major_version) and version != release.major_version:
 
97
            if version.count('.') >= 2:
97
98
                return version  # the version number already containt the server version
98
99
            return "%s.%s" % (release.major_version, version)
99
100
 
135
136
            a.update(b)
136
137
            return a
137
138
 
138
 
        from openerp.tools.parse_version import parse_version
139
 
 
140
139
        parsed_installed_version = parse_version(pkg.installed_version or '')
141
140
        current_version = parse_version(convert_version(pkg.data['version']))
142
141