diff options
| author | Jay (Open ERP) <jvo@tinyerp.com> | 2010-05-20 12:00:44 +0530 |
|---|---|---|
| committer | Jay (Open ERP) <jvo@tinyerp.com> | 2010-05-20 12:00:44 +0530 |
| commit | e3ccef27d33ff83ddbb7bfd3eacc80f8a98bd21d (patch) | |
| tree | f14fb77ab9702c91bcb9309724e5aa63a96ee570 /bin/addons/base/module | |
| parent | 2669744f4f09ca6ac9219dc91909e895559c74c0 (diff) | |
| parent | fe7673b7ba1f2706b8ed2abe6892ad33211063cd (diff) | |
[BACKPORT] Stable fixes and refactorings to Trunk
bzr revid: jvo@tinyerp.com-20100520063044-sviy1e9pybirhpsw
Diffstat (limited to 'bin/addons/base/module')
| -rw-r--r-- | bin/addons/base/module/module.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py index 0a427427515..1f5f2393c19 100644 --- a/bin/addons/base/module/module.py +++ b/bin/addons/base/module/module.py @@ -146,11 +146,13 @@ class module(osv.osv): ], string='State', readonly=True), 'demo': fields.boolean('Demo data'), 'license': fields.selection([ - ('GPL-2', 'GPL-2'), + ('GPL-2', 'GPL Version 2'), ('GPL-2 or any later version', 'GPL-2 or later version'), - ('GPL-3', 'GPL-3'), + ('GPL-3', 'GPL Version 3'), ('GPL-3 or any later version', 'GPL-3 or later version'), - ('Other proprietary', 'Other proprietary') + ('AGPL-3', 'Affero GPL-3'), + ('Other OSI approved licence', 'Other OSI Approved Licence'), + ('Other proprietary', 'Other Proprietary') ], string='License', readonly=True), 'menus_by_module': fields.function(_get_views, method=True, string='Menus', type='text', multi="meta", store=True), 'reports_by_module': fields.function(_get_views, method=True, string='Reports', type='text', multi="meta", store=True), @@ -161,7 +163,7 @@ class module(osv.osv): _defaults = { 'state': lambda *a: 'uninstalled', 'demo': lambda *a: False, - 'license': lambda *a: 'GPL-2', + 'license': lambda *a: 'AGPL-3', } _order = 'name' |