From c0b704d37cd77c6899b3debe3014d6ccd073c150 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Mon, 18 Jan 2016 10:54:05 +0100
Subject: [PATCH] [IMP] Remove 'author' and 'website' on odoo modules'
 manisfest

And use the default values :
- author : 'Odoo S.A.'
- website: https://www.odoo.com/
---
 addons/account_asset/__openerp__.py                         | 1 -
 addons/account_tax_cash_basis/__openerp__.py                | 1 -
 addons/account_tax_python/__openerp__.py                    | 1 -
 addons/account_test/__openerp__.py                          | 1 -
 addons/base_geolocalize/__openerp__.py                      | 1 -
 addons/fleet/__openerp__.py                                 | 1 -
 addons/hr_equipment/__openerp__.py                          | 1 -
 addons/hr_expense/__openerp__.py                            | 1 -
 addons/hr_payroll_account/__openerp__.py                    | 2 --
 addons/hw_blackbox_be/__openerp__.py                        | 1 -
 addons/im_odoo_support/__openerp__.py                       | 1 -
 addons/l10n_generic_coa/__openerp__.py                      | 1 -
 addons/l10n_in/__openerp__.py                               | 1 -
 addons/l10n_ve/__openerp__.py                               | 2 +-
 addons/pos_cache/__openerp__.py                             | 1 -
 addons/product_extended/__openerp__.py                      | 1 -
 addons/product_uos/__openerp__.py                           | 2 --
 addons/sale_expense/__openerp__.py                          | 1 -
 addons/sale_timesheet/__openerp__.py                        | 1 -
 addons/theme_default/__openerp__.py                         | 1 -
 addons/web_editor/__openerp__.py                            | 1 -
 addons/website_event_questions/__openerp__.py               | 1 -
 addons/website_issue/__openerp__.py                         | 1 -
 addons/website_mass_mailing/__openerp__.py                  | 1 -
 addons/website_portal/__openerp__.py                        | 1 -
 addons/website_portal_sale/__openerp__.py                   | 1 -
 addons/website_sale_digital/__openerp__.py                  | 1 -
 addons/website_sale_stock/__openerp__.py                    | 1 -
 addons/website_theme_install/__openerp__.py                 | 1 -
 openerp/addons/base/__openerp__.py                          | 3 ---
 openerp/addons/test_assetsbundle/__openerp__.py             | 2 --
 openerp/addons/test_converter/__openerp__.py                | 2 --
 openerp/addons/test_documentation_examples/__openerp__.py   | 3 ---
 openerp/addons/test_exceptions/__openerp__.py               | 2 --
 openerp/addons/test_impex/__openerp__.py                    | 2 --
 openerp/addons/test_inherit/__openerp__.py                  | 2 --
 openerp/addons/test_limits/__openerp__.py                   | 2 --
 openerp/addons/test_new_api/__openerp__.py                  | 2 --
 openerp/addons/test_uninstall/__openerp__.py                | 2 --
 openerp/addons/test_workflow/__openerp__.py                 | 2 --
 openerp/modules/module.py                                   | 4 ++--
 openerp/tests/addons/test_translation_import/__openerp__.py | 2 --
 42 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
index ba3c426a5a2..43d025ef715 100644
--- a/addons/account_asset/__openerp__.py
+++ b/addons/account_asset/__openerp__.py
@@ -4,7 +4,6 @@
     'name': 'Assets Management',
     'version': '1.0',
     'depends': ['account_accountant'],
-    'author': 'Odoo S.A.',
     'description': """
 Assets management
 =================
diff --git a/addons/account_tax_cash_basis/__openerp__.py b/addons/account_tax_cash_basis/__openerp__.py
index 9120d25a544..230776cf233 100644
--- a/addons/account_tax_cash_basis/__openerp__.py
+++ b/addons/account_tax_cash_basis/__openerp__.py
@@ -3,7 +3,6 @@
 {
     'name' : 'Account Tax Cash Basis',
     'version' : '1.1',
-    'author' : 'OpenERP SA',
     'summary': 'Allow to have cash basis on tax',
     'sequence': 4,
     'description': """
diff --git a/addons/account_tax_python/__openerp__.py b/addons/account_tax_python/__openerp__.py
index ad9f6abef9d..483949a8988 100644
--- a/addons/account_tax_python/__openerp__.py
+++ b/addons/account_tax_python/__openerp__.py
@@ -10,7 +10,6 @@
 
         "Python Code" defines the amount of the tax.
         """,
-    'author': "Odoo SA",
     'category': 'Accounting &amp; Finance',
     'version': '1.0',
     'depends': ['account'],
diff --git a/addons/account_test/__openerp__.py b/addons/account_test/__openerp__.py
index 1a6d8fc011d..7d9f8cdac9b 100644
--- a/addons/account_test/__openerp__.py
+++ b/addons/account_test/__openerp__.py
@@ -7,7 +7,6 @@
 {
     'name': 'Accounting Consistency Tests',
     'version': '1.0',
-    'author': 'Odoo S.A.',
     'category': 'Accounting & Finance',
     'website': 'https://www.odoo.com/page/accounting',
     'description': """
diff --git a/addons/base_geolocalize/__openerp__.py b/addons/base_geolocalize/__openerp__.py
index 71a37efce82..b37ad69d50f 100644
--- a/addons/base_geolocalize/__openerp__.py
+++ b/addons/base_geolocalize/__openerp__.py
@@ -4,7 +4,6 @@
     'name': 'Partners Geolocation',
     'version': '2.0',
     'category': 'Customer Relationship Management',
-    'author': 'Odoo SA',
     'description': """
 Partners Geolocation
 ========================
diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py
index 303613e90ed..80d01538a96 100644
--- a/addons/fleet/__openerp__.py
+++ b/addons/fleet/__openerp__.py
@@ -3,7 +3,6 @@
 {
     'name' : 'Fleet Management',
     'version' : '0.1',
-    'author' : 'OpenERP S.A.',
     'sequence': 165,
     'category': 'Managing vehicles and contracts',
     'website' : 'https://www.odoo.com/page/fleet',
diff --git a/addons/hr_equipment/__openerp__.py b/addons/hr_equipment/__openerp__.py
index 5e3fca4d9bd..5bb0bcb5dd8 100644
--- a/addons/hr_equipment/__openerp__.py
+++ b/addons/hr_equipment/__openerp__.py
@@ -6,7 +6,6 @@
     'sequence': 125,
     'description': """
         Track employees' equipment and manage maintenance requests.""",
-    'author': 'Odoo S.A.',
     'depends': ['hr'],
     'summary': 'Equipments, Assets, Internal Hardware, Allocation Tracking',
     'data': [
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 9ca0917daad..d6051e12e5e 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -25,7 +25,6 @@ The whole flow is implemented as:
 
 This module also uses analytic accounting and is compatible with the invoice on timesheet module so that you are able to automatically re-invoice your customers' expenses if your work by project.
     """,
-    'author': 'Odoo S.A.',
     'website': 'https://www.odoo.com/page/expenses',
     'depends': ['hr_contract', 'account_accountant', 'report'],
     'data': [
diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index 66b484f83d6..d3ab4701127 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -12,8 +12,6 @@ Generic Payroll system Integrated with Accounting.
     * Payment Encoding
     * Company Contribution Management
     """,
-    'author':'OpenERP SA',
-    'website': 'https://www.odoo.com/page/employees',
     'depends': [
         'hr_payroll',
         'account',
diff --git a/addons/hw_blackbox_be/__openerp__.py b/addons/hw_blackbox_be/__openerp__.py
index d33930e2143..74571975ac4 100644
--- a/addons/hw_blackbox_be/__openerp__.py
+++ b/addons/hw_blackbox_be/__openerp__.py
@@ -14,7 +14,6 @@ Fiscal Data Module Hardware Driver
 This module allows a Point Of Sale client to communicate with a
 connected Belgian Fiscal Data Module.
 """,
-    'author': 'OpenERP SA',
     'depends': ['hw_proxy'],
     'external_dependencies': {'python': ['serial']},
     'test': [
diff --git a/addons/im_odoo_support/__openerp__.py b/addons/im_odoo_support/__openerp__.py
index 78b1eda2692..3992dcdcc1d 100644
--- a/addons/im_odoo_support/__openerp__.py
+++ b/addons/im_odoo_support/__openerp__.py
@@ -4,7 +4,6 @@
     'summary': 'Chat with the Odoo collaborators',
     'category': 'Tools',
     'complexity': 'medium',
-    'website': 'https://www.odoo.com/',
     'description':
         """
 Odoo Live Support
diff --git a/addons/l10n_generic_coa/__openerp__.py b/addons/l10n_generic_coa/__openerp__.py
index 86b8c68ef6c..a626a28aed4 100644
--- a/addons/l10n_generic_coa/__openerp__.py
+++ b/addons/l10n_generic_coa/__openerp__.py
@@ -11,7 +11,6 @@ This is the base module to manage the generic accounting chart in Odoo.
 
 Install some generic chart of accounts.
     """,
-    'author': 'Odoo',
     'depends': [
         'account',
     ],
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index ad496d9c5b8..b26e03faf51 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -16,7 +16,6 @@ Note: The Schedule VI has been revised by MCA and is applicable for all Balance
 31st March, 2011. The Format has done away with earlier two options of format of Balance
 Sheet, now only Vertical format has been permitted Which is Supported By Odoo.
   """,
-    'author': ['Odoo SA'],
     'category': 'Localization/Account Charts',
     'depends': [
         'account',
diff --git a/addons/l10n_ve/__openerp__.py b/addons/l10n_ve/__openerp__.py
index 558431fbf23..bcee758fb8d 100644
--- a/addons/l10n_ve/__openerp__.py
+++ b/addons/l10n_ve/__openerp__.py
@@ -9,7 +9,7 @@
 {
     'name' : 'Venezuela - Accounting',
     'version': '1.0',
-    'author': ['Odoo SA', 'Vauxoo'],
+    'author': ['Odoo S.A.', 'Vauxoo'],
     'category': 'Localization/Account Charts',
     'description':
 """
diff --git a/addons/pos_cache/__openerp__.py b/addons/pos_cache/__openerp__.py
index 708ae46108b..50f580b9fd0 100644
--- a/addons/pos_cache/__openerp__.py
+++ b/addons/pos_cache/__openerp__.py
@@ -11,7 +11,6 @@ This creates a product cache per POS config. It drastically lowers the
 time it takes to load a POS session with a lot of products.
     """,
 
-    'author': "Odoo",
     'website': "https://www.odoo.com/page/point-of-sale",
     'category': 'Point Of Sale',
     'version': '1.0',
diff --git a/addons/product_extended/__openerp__.py b/addons/product_extended/__openerp__.py
index 1072b7dd554..5a438655bb9 100644
--- a/addons/product_extended/__openerp__.py
+++ b/addons/product_extended/__openerp__.py
@@ -2,7 +2,6 @@
 {
     "name" : "Product extension to track sales and purchases",
     "version" : "1.0",
-    "author" : "OpenERP S.A.",
     "depends" : ["product", "purchase", "sale", "mrp", "stock_account"],
     "category" : "Generic Modules/Inventory Control",
     "description": """
diff --git a/addons/product_uos/__openerp__.py b/addons/product_uos/__openerp__.py
index 4cc1cd2b661..aabfb83ad8f 100644
--- a/addons/product_uos/__openerp__.py
+++ b/addons/product_uos/__openerp__.py
@@ -14,8 +14,6 @@ Manage secondary units of sale
 Sell products in one unit of measure that is different from the one
 you manage the inventory.
     """,
-    'author': 'Odoo',
-    'website': 'https://www.odoo.com',
     'depends': ['sale'],
     'data': [
         'views/product_uos_view.xml',
diff --git a/addons/sale_expense/__openerp__.py b/addons/sale_expense/__openerp__.py
index 6907791fab3..7cf926cb7a2 100644
--- a/addons/sale_expense/__openerp__.py
+++ b/addons/sale_expense/__openerp__.py
@@ -14,7 +14,6 @@ Create some products for which you can re-invoice the costs.
 This module does not add any feature, despite a few demo data to
 test the features easily.
 """,
-    'author': 'OpenERP SA',
     'website': 'https://www.odoo.com/page/warehouse',
     'depends': ['sale', 'hr_expense'],
     'data': [
diff --git a/addons/sale_timesheet/__openerp__.py b/addons/sale_timesheet/__openerp__.py
index 042d3539326..6a6da84f581 100644
--- a/addons/sale_timesheet/__openerp__.py
+++ b/addons/sale_timesheet/__openerp__.py
@@ -14,7 +14,6 @@ This module set the right product on all timesheet lines
 according to the order/contract you work on. This allows to
 have real delivered quantities in sales orders.
 """,
-    'author': 'OpenERP SA',
     'website': 'https://www.odoo.com/page/warehouse',
     'depends': ['sale', 'hr_timesheet'],
     'data': ['views/sale_timesheet_view.xml',
diff --git a/addons/theme_default/__openerp__.py b/addons/theme_default/__openerp__.py
index c5eb4340c39..d7a5d4bb1a6 100644
--- a/addons/theme_default/__openerp__.py
+++ b/addons/theme_default/__openerp__.py
@@ -4,7 +4,6 @@
     'category': 'Theme/Hidden',
     'sequence': 1000,
     'version': '1.0',
-    'author': 'Odoo S.A.',
     'depends': ['website'],
     'data': [
         'views/templates.xml',
diff --git a/addons/web_editor/__openerp__.py b/addons/web_editor/__openerp__.py
index 66fdff08ce1..69583b9f150 100644
--- a/addons/web_editor/__openerp__.py
+++ b/addons/web_editor/__openerp__.py
@@ -6,7 +6,6 @@ Odoo Web Editor widget.
 ==========================
 
 """,
-    'author': 'Odoo S.A.',
     'depends': ['web'],
     'data': [
         'security/ir.model.access.csv',
diff --git a/addons/website_event_questions/__openerp__.py b/addons/website_event_questions/__openerp__.py
index 24025e15b62..f222eb3bcc7 100644
--- a/addons/website_event_questions/__openerp__.py
+++ b/addons/website_event_questions/__openerp__.py
@@ -5,7 +5,6 @@
     'description': 'Questions on Events',
     'category': 'Website',
     'version': '1.0',
-    'author': 'Odoo S.A.',
     'depends': ['website_event'],
     'data': [
         'views/website_event_questions_backend.xml',
diff --git a/addons/website_issue/__openerp__.py b/addons/website_issue/__openerp__.py
index 9e918a1a14c..6c99eb079c0 100644
--- a/addons/website_issue/__openerp__.py
+++ b/addons/website_issue/__openerp__.py
@@ -8,7 +8,6 @@ Odoo Contact Form
 ====================
 
         """,
-    'author': 'Odoo SA',
     'depends': ['website_form','project_issue'],
     'data': [
         'data/website_issue_data.xml',
diff --git a/addons/website_mass_mailing/__openerp__.py b/addons/website_mass_mailing/__openerp__.py
index 471bc0f985a..8caf18b4de3 100644
--- a/addons/website_mass_mailing/__openerp__.py
+++ b/addons/website_mass_mailing/__openerp__.py
@@ -4,7 +4,6 @@
 Add a snippet in the website builder to subscribe a mass_mailing list
     """,
     'version': '1.0',
-    'author': 'Odoo',
     'category': 'Hidden',
     'depends': ['website', 'mass_mailing'],
     'data': [
diff --git a/addons/website_portal/__openerp__.py b/addons/website_portal/__openerp__.py
index 3942ed9d5b0..b3f7fd6800b 100644
--- a/addons/website_portal/__openerp__.py
+++ b/addons/website_portal/__openerp__.py
@@ -6,7 +6,6 @@
     'description': """
 Allows your customers to manage their account from a beautiful web interface.
         """,
-    'website': 'https://www.odoo.com/',
     'depends': [
         'website',
     ],
diff --git a/addons/website_portal_sale/__openerp__.py b/addons/website_portal_sale/__openerp__.py
index b9431797ce8..a9ae5e5a36d 100644
--- a/addons/website_portal_sale/__openerp__.py
+++ b/addons/website_portal_sale/__openerp__.py
@@ -6,7 +6,6 @@
     'description': """
 Add your sales document in the frontend portal. Your customers will be able to connect to their portal to see the list (and the state) of their invoices (pdf report), sales orders and quotations (web pages).
         """,
-    'website': 'https://www.odoo.com/',
     'depends': [
         'sale',
         'website_portal',
diff --git a/addons/website_sale_digital/__openerp__.py b/addons/website_sale_digital/__openerp__.py
index 9883efe53ac..a48d83a4436 100644
--- a/addons/website_sale_digital/__openerp__.py
+++ b/addons/website_sale_digital/__openerp__.py
@@ -5,7 +5,6 @@
     'description': """
 Sell digital product using attachments to virtual products
 """,
-    'author': 'Odoo S.A.',
     'depends': [
         'document',
         'website_sale',
diff --git a/addons/website_sale_stock/__openerp__.py b/addons/website_sale_stock/__openerp__.py
index 464dd8c26d5..059e9e5c3ba 100644
--- a/addons/website_sale_stock/__openerp__.py
+++ b/addons/website_sale_stock/__openerp__.py
@@ -5,7 +5,6 @@
     'description': """
     Display delivery orders (picking) infos on the website
 """,
-    'author': 'Odoo S.A.',
     'depends': [
         'website_sale',
         'sale_stock',
diff --git a/addons/website_theme_install/__openerp__.py b/addons/website_theme_install/__openerp__.py
index 88feeb3abb0..db0a7f9ff53 100644
--- a/addons/website_theme_install/__openerp__.py
+++ b/addons/website_theme_install/__openerp__.py
@@ -3,7 +3,6 @@
     'description': "Propose to install a theme on website installation",
     'category': 'Website',
     'version': '1.0',
-    'author': 'Odoo S.A.',
     'data': [
         'views/assets.xml',
         'views/views.xml',
diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 984a2c65fe9..58d93fce011 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -10,9 +10,6 @@
 The kernel of Odoo, needed for all installation.
 ===================================================
 """,
-    'author': 'Odoo SA',
-    'maintainer': 'Odoo SA',
-    'website': 'http://www.openerp.com',
     'depends': [],
     'data': [
         'res/res.lang.csv',
diff --git a/openerp/addons/test_assetsbundle/__openerp__.py b/openerp/addons/test_assetsbundle/__openerp__.py
index 8f4c8577ffa..381354ea25d 100644
--- a/openerp/addons/test_assetsbundle/__openerp__.py
+++ b/openerp/addons/test_assetsbundle/__openerp__.py
@@ -4,9 +4,7 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """A module to verify the Assets Bundle mechanism.""",
-    'author': 'Odoo SA',
     'maintainer': 'Odoo SA',
-    'website': 'https://www.odoo.com',
     'depends': ['base'],
     'installable': True,
     'data': [
diff --git a/openerp/addons/test_converter/__openerp__.py b/openerp/addons/test_converter/__openerp__.py
index 2ea63ba4bfc..1e4c3ce0375 100644
--- a/openerp/addons/test_converter/__openerp__.py
+++ b/openerp/addons/test_converter/__openerp__.py
@@ -4,9 +4,7 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """Tests of field conversions""",
-    'author': 'OpenERP SA',
     'maintainer': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
     'depends': ['base'],
     'data': ['ir.model.access.csv'],
     'installable': True,
diff --git a/openerp/addons/test_documentation_examples/__openerp__.py b/openerp/addons/test_documentation_examples/__openerp__.py
index 41bf4b33fa0..efd1f5a4d8d 100644
--- a/openerp/addons/test_documentation_examples/__openerp__.py
+++ b/openerp/addons/test_documentation_examples/__openerp__.py
@@ -7,9 +7,6 @@
     syntax-checked and tested.
     """,
 
-    'author': "Odoo",
-    'website': "http://odoo.com",
-
     'category': 'Tests',
     'version': '0.1',
     'data': [
diff --git a/openerp/addons/test_exceptions/__openerp__.py b/openerp/addons/test_exceptions/__openerp__.py
index d140d4b8a0c..8ed503b8179 100644
--- a/openerp/addons/test_exceptions/__openerp__.py
+++ b/openerp/addons/test_exceptions/__openerp__.py
@@ -4,9 +4,7 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """A module to generate exceptions.""",
-    'author': 'OpenERP SA',
     'maintainer': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
     'depends': ['base'],
     'data': ['view.xml', 'ir.model.access.csv'],
     'installable': True,
diff --git a/openerp/addons/test_impex/__openerp__.py b/openerp/addons/test_impex/__openerp__.py
index 949523ba1e3..d1631287126 100644
--- a/openerp/addons/test_impex/__openerp__.py
+++ b/openerp/addons/test_impex/__openerp__.py
@@ -4,9 +4,7 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """A module to test import/export.""",
-    'author': 'OpenERP SA',
     'maintainer': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
     'depends': ['base'],
     'data': ['ir.model.access.csv'],
     'installable': True,
diff --git a/openerp/addons/test_inherit/__openerp__.py b/openerp/addons/test_inherit/__openerp__.py
index 2780b1c4f2d..4682df18c18 100644
--- a/openerp/addons/test_inherit/__openerp__.py
+++ b/openerp/addons/test_inherit/__openerp__.py
@@ -4,9 +4,7 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """A module to verify the inheritance.""",
-    'author': 'OpenERP SA',
     'maintainer': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
     'depends': ['base'],
     'data': [
         'ir.model.access.csv',
diff --git a/openerp/addons/test_limits/__openerp__.py b/openerp/addons/test_limits/__openerp__.py
index a54f9ccdebf..8f411d1ed5c 100644
--- a/openerp/addons/test_limits/__openerp__.py
+++ b/openerp/addons/test_limits/__openerp__.py
@@ -4,9 +4,7 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """A module with dummy methods.""",
-    'author': 'OpenERP SA',
     'maintainer': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
     'depends': ['base'],
     'data': ['ir.model.access.csv'],
     'installable': True,
diff --git a/openerp/addons/test_new_api/__openerp__.py b/openerp/addons/test_new_api/__openerp__.py
index c49f3a19309..21234456de9 100644
--- a/openerp/addons/test_new_api/__openerp__.py
+++ b/openerp/addons/test_new_api/__openerp__.py
@@ -4,9 +4,7 @@
     'version': '1.0',
     'category': 'Tests',
     'description': """A module to test the API.""",
-    'author': 'OpenERP SA',
     'maintainer': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
     'depends': ['base', 'web'],
     'installable': True,
     'auto_install': False,
diff --git a/openerp/addons/test_uninstall/__openerp__.py b/openerp/addons/test_uninstall/__openerp__.py
index bad2da42b3b..ebab158c67c 100644
--- a/openerp/addons/test_uninstall/__openerp__.py
+++ b/openerp/addons/test_uninstall/__openerp__.py
@@ -4,9 +4,7 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """A module to test the uninstall feature.""",
-    'author': 'OpenERP SA',
     'maintainer': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
     'depends': ['base'],
     'data': ['ir.model.access.csv'],
     'installable': True,
diff --git a/openerp/addons/test_workflow/__openerp__.py b/openerp/addons/test_workflow/__openerp__.py
index 2d31e6394f4..e29bc86bf8e 100644
--- a/openerp/addons/test_workflow/__openerp__.py
+++ b/openerp/addons/test_workflow/__openerp__.py
@@ -4,9 +4,7 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """A module to play with workflows.""",
-    'author': 'OpenERP SA',
     'maintainer': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
     'depends': ['base'],
     'data': ['data.xml', 'ir.model.access.csv'],
     'installable': True,
diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index fa6686808a0..4d8bfafef7b 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -290,7 +290,7 @@ def load_information_from_description_file(module, mod_path=None):
             # default values for descriptor
             info = {
                 'application': False,
-                'author': 'Odoo SA',
+                'author': 'Odoo S.A.',
                 'auto_install': False,
                 'category': 'Uncategorized',
                 'depends': [],
@@ -301,7 +301,7 @@ def load_information_from_description_file(module, mod_path=None):
                 'post_load': None,
                 'version': '1.0',
                 'web': False,
-                'website': 'http://www.odoo.com',
+                'website': 'https://www.odoo.com',
                 'sequence': 100,
                 'summary': '',
             }
diff --git a/openerp/tests/addons/test_translation_import/__openerp__.py b/openerp/tests/addons/test_translation_import/__openerp__.py
index 29c3c596396..f92df24767b 100644
--- a/openerp/tests/addons/test_translation_import/__openerp__.py
+++ b/openerp/tests/addons/test_translation_import/__openerp__.py
@@ -4,9 +4,7 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """A module to test translation import.""",
-    'author': 'OpenERP SA',
     'maintainer': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
     'depends': ['base'],
     'data': ['view.xml'],
     'test': ['tests.yml'],