From 33d3af2f6f480ce8e10fc888bf89d551c7bc1243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 24 Sep 2008 15:43:34 +0200
Subject: [PATCH] Remove license on ir.module

---
 trytond/ir/module/module.py  | 7 +------
 trytond/ir/module/module.xml | 7 ++-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/trytond/ir/module/module.py b/trytond/ir/module/module.py
index d4e69e4f2b..74dbd240d6 100644
--- a/trytond/ir/module/module.py
+++ b/trytond/ir/module/module.py
@@ -146,9 +146,6 @@ class Module(OSV):
         ('to remove', 'To be removed'),
         ('to install', 'To be installed'),
         ], string='State', readonly=True)
-    license = fields.Selection([('GPL-2', 'GPL-2'),
-        ('Other proprietary', 'Other proprietary')], string='License',
-        readonly=True)
 
     def __init__(self):
         super(Module, self).__init__()
@@ -178,7 +175,7 @@ class Module(OSV):
         return 'uninstalled'
 
     def default_license(self, cursor, user, context=None):
-        return 'GPL-2'
+        return 'GPL-3'
 
     @staticmethod
     def get_module_info(name):
@@ -355,7 +352,6 @@ class Module(OSV):
                     'shortdesc': tryton.get('name', ''),
                     'author': tryton.get('author', ''),
                     'website': tryton.get('website', ''),
-                    'license': tryton.get('license', 'GPL-2'),
                     })
                 self._update_dependencies(cursor, user, module_id,
                         tryton.get('depends', []))
@@ -380,7 +376,6 @@ class Module(OSV):
                     'shortdesc': tryton.get('name', ''),
                     'author': tryton.get('author', 'Unknown'),
                     'website': tryton.get('website', ''),
-                    'license': tryton.get('license', 'GPL-2'),
                 })
                 res += 1
                 self._update_dependencies(cursor, user, new_id,
diff --git a/trytond/ir/module/module.xml b/trytond/ir/module/module.xml
index c0370f3db7..d5e7ce0868 100644
--- a/trytond/ir/module/module.xml
+++ b/trytond/ir/module/module.xml
@@ -19,15 +19,12 @@
                             <field name="description" colspan="4"/>
                             <label name="version"/>
                             <field name="version"/>
-                            <label name="license"/>
-                            <field name="license"/>
                             <label name="author"/>
                             <field name="author"/>
-                            <label name="website"/>
-                            <field name="website" widget="url"/>
                             <label name="url"/>
                             <field name="url" widget="url"/>
-                            <newline/>
+                            <label name="website"/>
+                            <field name="website" widget="url"/>
                             <label name="state"/>
                             <field name="state" readonly="1"/>
                             <group col="1" colspan="2">