diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index f542c88087e..3be3a3bcccd 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -12,7 +12,7 @@ The specific and easy-to-use Invoicing system in Odoo allows you to keep track o
 
 You could use this simplified accounting in case you work with an (external) account to keep your books, and you still want to keep track of payments. This module also offers you an easy method of registering payments, without having to encode complete abstracts of account.
     """,
-    'category' : 'Accounting & Finance',
+    'category': 'Accounting',
     'website': 'https://www.odoo.com/page/billing',
     'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'],
     'depends' : ['base_setup', 'product', 'analytic', 'report', 'web_planner'],
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index aa730d530e3..8ba6fbbd6f8 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -3756,7 +3756,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,option:0
-msgid "Fixed day of the following month"
+msgid "Day(s) after the end of the invoice month (Net EOM)"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 23a7aeeb481..4ca11e7e346 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -3902,8 +3902,8 @@ msgstr "Le montant fixe comptera comme un débit si c'est négatif, comme un cr
 
 #. module: account
 #: selection:account.payment.term.line,option:0
-msgid "Fixed day of the following month"
-msgstr "Jour fixe du mois suivant"
+msgid "Day(s) after the end of the invoice month (Net EOM)"
+msgstr "Jour(s) après la fin du mois de facturation"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_message_follower_ids
diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py
index 8fb7d9d6a49..2295b792c7d 100644
--- a/addons/account/models/account_invoice.py
+++ b/addons/account/models/account_invoice.py
@@ -1294,6 +1294,8 @@ class AccountInvoiceTax(models.Model):
             for line in tax.invoice_id.invoice_line_ids:
                 if tax.tax_id in line.invoice_line_tax_ids:
                     base += line.price_subtotal
+                    # To add include base amount taxes
+                    base += sum((line.invoice_line_tax_ids.filtered(lambda t: t.include_base_amount) - tax.tax_id).mapped('amount'))
             tax.base = base
 
     invoice_id = fields.Many2one('account.invoice', string='Invoice', ondelete='cascade', index=True)
@@ -1388,7 +1390,7 @@ class AccountPaymentTermLine(models.Model):
     days = fields.Integer(string='Number of Days', required=True, default=0)
     option = fields.Selection([
             ('day_after_invoice_date', 'Day(s) after the invoice date'),
-            ('fix_day_following_month', 'Fixed day of the following month'),
+            ('fix_day_following_month', 'Day(s) after the end of the invoice month (Net EOM)'),
             ('last_day_following_month', 'Last day of following month'),
             ('last_day_current_month', 'Last day of current month'),
         ],
@@ -1408,7 +1410,7 @@ class AccountPaymentTermLine(models.Model):
         if self.option in ('last_day_current_month', 'last_day_following_month'):
             self.days = 0
 
-class MailComposeMessage(models.Model):
+class MailComposeMessage(models.TransientModel):
     _inherit = 'mail.compose.message'
 
     @api.multi
diff --git a/addons/account/models/res_config.py b/addons/account/models/res_config.py
index 9b575efe3ce..778d5cd1460 100644
--- a/addons/account/models/res_config.py
+++ b/addons/account/models/res_config.py
@@ -172,8 +172,8 @@ class AccountConfigSettings(models.TransientModel):
             ir_values = self.env['ir.values']
             taxes_id = ir_values.get_default('product.template', 'taxes_id', company_id = self.company_id.id)
             supplier_taxes_id = ir_values.get_default('product.template', 'supplier_taxes_id', company_id = self.company_id.id)
-            self.default_sale_tax_id = isinstance(taxes_id, list) and taxes_id[0] or taxes_id
-            self.default_purchase_tax_id = isinstance(supplier_taxes_id, list) and supplier_taxes_id[0] or supplier_taxes_id
+            self.default_sale_tax_id = isinstance(taxes_id, list) and len(taxes_id) > 0 and taxes_id[0] or taxes_id
+            self.default_purchase_tax_id = isinstance(supplier_taxes_id, list) and len(supplier_taxes_id) > 0 and supplier_taxes_id[0] or supplier_taxes_id
         return {}
 
     @api.onchange('chart_template_id')
diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index 80c1fec2a20..975083649ad 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -31,7 +31,7 @@ class ReportPartnerLedger(models.AbstractModel):
         lang_code = self.env.context.get('lang') or 'en_US'
         lang = self.env['res.lang']
         lang_id = lang._lang_get(lang_code)
-        date_format = lang.browse(lang_id).date_format
+        date_format = lang_id.date_format
         for r in res:
             r['date'] = datetime.strptime(r['date'], DEFAULT_SERVER_DATE_FORMAT).strftime(date_format)
             r['displayed_name'] = '-'.join(
diff --git a/addons/account/views/report_journal.xml b/addons/account/views/report_journal.xml
index 76ff18c7799..396c43b8474 100644
--- a/addons/account/views/report_journal.xml
+++ b/addons/account/views/report_journal.xml
@@ -49,7 +49,7 @@
                                 <td><span t-esc="aml.move_id.name &lt;&gt; '/' and aml.move_id.name or ('*'+str(aml.move_id.id))"/></td>
                                 <td><span t-field="aml.date"/></td>
                                 <td><span t-field="aml.account_id.code"/></td>
-                                <td><span t-esc="aml.partner_id and aml.partner_id.name[:23] or ''"/></td>
+                                <td><span t-esc="aml.sudo().partner_id and aml.sudo().partner_id.name[:23] or ''"/></td>
                                 <td><span t-esc="aml.name[:35]"/></td>
                                 <td><span t-esc="format(aml.debit, 'monetary', res_company.currency_id)"/></td>
                                 <td><span t-esc="format(aml.credit, 'monetary', res_company.currency_id)"/></td>
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index 68060e1313f..ee43fbb41ae 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Accounting and Finance',
     'version': '1.1',
-    'category': 'Accounting & Finance',
+    'category': 'Accounting',
     'sequence': 35,
     'summary': 'Financial and Analytic Accounting',
     'description': """
diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py
index 0b2191ea1c3..cc27388a146 100644
--- a/addons/account_analytic_default/__openerp__.py
+++ b/addons/account_analytic_default/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Account Analytic Defaults',
     'version': '1.0',
-    'category': 'Accounting & Finance',
+    'category': 'Accounting',
     'description': """
 Set default values for your analytic accounts.
 ==============================================
diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
index 43d025ef715..f323fe820b5 100644
--- a/addons/account_asset/__openerp__.py
+++ b/addons/account_asset/__openerp__.py
@@ -12,7 +12,7 @@ Keeps track of depreciations, and creates corresponding journal entries.
 
     """,
     'website': 'https://www.odoo.com/page/accounting',
-    'category': 'Accounting & Finance',
+    'category': 'Accounting',
     'sequence': 32,
     'demo': [
         'account_asset_demo.yml',
diff --git a/addons/account_bank_statement_import/__openerp__.py b/addons/account_bank_statement_import/__openerp__.py
index 372a3a060d9..1fbf54ddf18 100644
--- a/addons/account_bank_statement_import/__openerp__.py
+++ b/addons/account_bank_statement_import/__openerp__.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 {
     'name': 'Account Bank Statement Import',
-    'category': 'Accounting & Finance',
+    'category': 'Accounting',
     'version': '1.0',
     'depends': ['account'],
     'description': """Generic Wizard to Import Bank Statements. Includes the import of files in .OFX format""",
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index 62b0693206f..0b8122eee93 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Budgets Management',
     'version': '1.0',
-    'category': 'Accounting & Finance',
+    'category': 'Accounting',
     'description': """
 This module allows accountants to manage analytic and crossovered budgets.
 ==========================================================================
diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
index 0496d1c8de3..9dbb9b08884 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Cancel Journal Entries',
     'version': '1.1',
-    'category': 'Accounting & Finance',
+    'category': 'Accounting',
     'description': """
 Allows canceling accounting entries.
 ====================================
diff --git a/addons/account_check_printing/__openerp__.py b/addons/account_check_printing/__openerp__.py
index 6a783557bce..c3d380b4fdd 100644
--- a/addons/account_check_printing/__openerp__.py
+++ b/addons/account_check_printing/__openerp__.py
@@ -2,7 +2,7 @@
 {
     'name': 'Check Printing Base',
     'version': '1.0',
-    'category': 'Hidden/Dependency',
+    'category': 'Accounting',
     'summary': 'Check printing commons',
     'description': """
 This module offers the basic functionalities to make payments by printing checks.
diff --git a/addons/account_tax_cash_basis/__openerp__.py b/addons/account_tax_cash_basis/__openerp__.py
index 230776cf233..c6de2ca37a6 100644
--- a/addons/account_tax_cash_basis/__openerp__.py
+++ b/addons/account_tax_cash_basis/__openerp__.py
@@ -9,7 +9,7 @@
     Add an option on tax to allow them to be cash based, meaning that during reconciliation, if there is a tax with
     cash basis involved, a new journal entry will be create containing those taxes value.
     """,
-    'category' : 'Accounting & Finance',
+    'category': 'Accounting',
     'website': 'https://www.odoo.com/page/accounting',
     'depends' : ['account'],
     'data': [
diff --git a/addons/account_tax_python/__openerp__.py b/addons/account_tax_python/__openerp__.py
index 483949a8988..ee746060e97 100644
--- a/addons/account_tax_python/__openerp__.py
+++ b/addons/account_tax_python/__openerp__.py
@@ -10,7 +10,7 @@
 
         "Python Code" defines the amount of the tax.
         """,
-    'category': 'Accounting &amp; Finance',
+    'category': 'Accounting',
     'version': '1.0',
     'depends': ['account'],
     'data': [
diff --git a/addons/account_test/__openerp__.py b/addons/account_test/__openerp__.py
index 7d9f8cdac9b..d32f6f5c79b 100644
--- a/addons/account_test/__openerp__.py
+++ b/addons/account_test/__openerp__.py
@@ -7,7 +7,7 @@
 {
     'name': 'Accounting Consistency Tests',
     'version': '1.0',
-    'category': 'Accounting & Finance',
+    'category': 'Accounting',
     'website': 'https://www.odoo.com/page/accounting',
     'description': """
 Asserts on accounting.
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 0bf7e004a49..f29eb209fd6 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -23,7 +23,7 @@ This module manages:
 * Voucher Receipt [Sales & Purchase]
 * Voucher Payment [Customer & Vendors]
     """,
-    'category': 'Accounting & Finance',
+    'category': 'Accounting',
     'sequence': 20,
     'website' : 'https://www.odoo.com/page/billing',
     'depends' : ['account'],
diff --git a/addons/anonymization/__openerp__.py b/addons/anonymization/__openerp__.py
index d482e1318bc..3f82cc44b45 100644
--- a/addons/anonymization/__openerp__.py
+++ b/addons/anonymization/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Database Anonymization',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'description': """
 This module allows you to anonymize a database.
 ===============================================
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index 20e36e78548..917ce694ce2 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Associations Management',
     'version': '0.1',
-    'category': 'Specific Industry Applications',
+    'category': 'Marketing',
     'description': """
 This module is to configure modules related to an association.
 ==============================================================
diff --git a/addons/auth_crypt/__openerp__.py b/addons/auth_crypt/__openerp__.py
index 9236fc18f1d..c5dc5463c44 100644
--- a/addons/auth_crypt/__openerp__.py
+++ b/addons/auth_crypt/__openerp__.py
@@ -6,7 +6,7 @@
     'version': '2.0',
     'author': ['Odoo SA', 'FS3'],
     'maintainer': 'Odoo SA',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'description': """
 Encrypted passwords
 ===================
diff --git a/addons/auth_ldap/__openerp__.py b/addons/auth_ldap/__openerp__.py
index 9b99f9a90c8..7b9eaa43f4b 100644
--- a/addons/auth_ldap/__openerp__.py
+++ b/addons/auth_ldap/__openerp__.py
@@ -5,8 +5,7 @@
     'version' : '1.0',
     'depends' : ['base'],
     #'description': < auto-loaded from README file
-    'website' : 'https://www.odoo.com',
-    'category' : 'Authentication',
+    'category' : 'Extra Tools',
     'data' : [
         'users_ldap_view.xml',
         'user_ldap_installer.xml',
diff --git a/addons/auth_oauth/__openerp__.py b/addons/auth_oauth/__openerp__.py
index f68c4f999e8..348f9228bf4 100644
--- a/addons/auth_oauth/__openerp__.py
+++ b/addons/auth_oauth/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'OAuth2 Authentication',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'description': """
 Allow users to login through OAuth2 Provider.
 =============================================
diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py
index 31920e62cac..9b59ad0ad63 100644
--- a/addons/auth_signup/__openerp__.py
+++ b/addons/auth_signup/__openerp__.py
@@ -7,7 +7,8 @@
 Allow users to sign up and reset their password
 ===============================================
     """,
-    'category': 'Authentication',
+    'version': '1.0',
+    'category': 'Extra Tools',
     'auto_install': True,
     'depends': [
         'base_setup',
diff --git a/addons/barcodes/__openerp__.py b/addons/barcodes/__openerp__.py
index 211efe958e2..bb7b3cf4276 100644
--- a/addons/barcodes/__openerp__.py
+++ b/addons/barcodes/__openerp__.py
@@ -1,7 +1,7 @@
 {
     'name': 'Barcodes',
     'version': '2.0',
-    'category': 'Hidden/Dependency',
+    'category': 'Extra Tools',
     'summary': 'Barcodes Scanning and Parsing',
     'description': """
 This module adds support for barcode scanning and parsing.
diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index 9a7e8c12ecb..335998abe05 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Automated Action Rules',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Sales',
     'description': """
 This module allows to implement action rules for any object.
 ============================================================
diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index 9ac7d06b28a..47a579a18e8 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Automated Translations through Gengo API',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'description': """
 Automated Translations through Gengo API
 ========================================
diff --git a/addons/base_geolocalize/__openerp__.py b/addons/base_geolocalize/__openerp__.py
index 923a020b15a..c7d279cb43e 100644
--- a/addons/base_geolocalize/__openerp__.py
+++ b/addons/base_geolocalize/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Partners Geolocation',
     'version': '2.0',
-    'category': 'Customer Relationship Management',
+    'category': 'Sales',
     'description': """
 Partners Geolocation
 ========================
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index 9aa69c05f41..c8c43cbfc52 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'IBAN Bank Accounts',
     'version': '1.0',
-    'category': 'Hidden/Dependency',
+    'category': 'Extra Tools',
     'description': """
 This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for it's validity.
 ======================================================================================================================
diff --git a/addons/base_import/__openerp__.py b/addons/base_import/__openerp__.py
index 8e923508252..737621221b9 100644
--- a/addons/base_import/__openerp__.py
+++ b/addons/base_import/__openerp__.py
@@ -21,8 +21,8 @@ Re-implement openerp's file import system:
 * In a module, so that administrators and users of Odoo who do not
   need or want an online import can avoid it being available to users.
 """,
-    'category': 'Uncategorized',
     'depends': ['web', 'web_kanban'],
+    'category': 'Extra Tools',
     'installable': True,
     'auto_install': True,
     'data': [
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index bed67a558ec..d12e9292fde 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -318,7 +318,7 @@ var DataImport = Widget.extend(ControlPanelMixin, {
         this.$('.oe_import_file_show').val(file !== undefined && file.name || '');
         this.$buttons.filter('.o_import_button').add(this.$('.oe_import_file_reload'))
                 .prop('disabled', true);
-        if (!this.$('input.oe_import_file').val()) { return; }
+        if (!this.$('input.oe_import_file').val()) { return this['settings_changed'](); }
         this.$('.oe_import_date_format').val('');
 
         this.$el.removeClass('oe_import_preview oe_import_error');
diff --git a/addons/base_import_module/__openerp__.py b/addons/base_import_module/__openerp__.py
index 6188aac83f4..2de1d3729b2 100644
--- a/addons/base_import_module/__openerp__.py
+++ b/addons/base_import_module/__openerp__.py
@@ -7,7 +7,7 @@ Import a custom data module
 This module allows authorized users to import a custom data module (.xml files and static assests)
 for customization purpose.
 """,
-    'category': 'Uncategorized',
+    'category': 'Extra Tools',
     'depends': ['web'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index eeda00109d7..69ae48ea072 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'VAT Number Validation',
     'version': '1.0',
-    'category': 'Hidden/Dependency',
+    'category': 'Accounting',
     'description': """
 VAT validation for Partner's VAT numbers.
 =========================================
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index 8325b9dbe98..f76facee8c5 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Dashboards',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'summary': 'Create your custom dashboard',
     'description': """
 Lets the user create a custom dashboard.
diff --git a/addons/calendar/__openerp__.py b/addons/calendar/__openerp__.py
index 527c5ab4ca1..e7551ad181c 100644
--- a/addons/calendar/__openerp__.py
+++ b/addons/calendar/__openerp__.py
@@ -18,7 +18,7 @@ It supports:
 
 If you need to manage your meetings, you should install the CRM module.
     """,
-    'category': 'Hidden/Dependency',
+    'category': 'Extra Tools',
     'website': 'https://www.odoo.com/page/crm',
     'demo': ['calendar_demo.xml'],
     'data': [
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 6e3810bba89..5bda2950b47 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'CRM',
     'version': '1.0',
-    'category': 'Customer Relationship Management',
+    'category': 'Sales',
     'sequence': 5,
     'summary': 'Leads, Opportunities, Activities',
     'description': """
diff --git a/addons/crm_project_issue/__openerp__.py b/addons/crm_project_issue/__openerp__.py
index 6897bc4a707..879a0a0b00d 100644
--- a/addons/crm_project_issue/__openerp__.py
+++ b/addons/crm_project_issue/__openerp__.py
@@ -4,7 +4,7 @@
     'name': 'Lead to Issue',
     'summary': 'Create Issues from Leads',
     'sequence': '19',
-    'category': 'Project Management',
+    'category': 'Project',
     'complexity': 'easy',
     'description': """
 Lead to Issues
diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py
index 7b6869db84e..65bff3bc388 100644
--- a/addons/decimal_precision/__openerp__.py
+++ b/addons/decimal_precision/__openerp__.py
@@ -11,7 +11,7 @@ The decimal precision is configured per company.
 """,
     'version': '0.1',
     'depends': ['base'],
-    'category' : 'Hidden/Dependency',
+    'category' : 'Hidden',
     'data': [
         'decimal_precision_view.xml',
         'security/ir.model.access.csv',
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 48ab56e0a05..e91e09fef5f 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Delivery Costs',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Stock',
     'description': """
 Allows you to add delivery methods in sale orders and picking.
 ==============================================================
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index f47d074eab4..8ea5e002415 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Attachments List and Document Indexation',
     'version': '2.1',
-    'category': 'Knowledge Management',
+    'category': 'Document Management',
     'description': """
 Attachments list and document indexation
 ========================================
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 300a5a441fa..e6be775706e 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -3,7 +3,7 @@
     'name': 'Events Organisation',
     'version': '0.1',
     'website': 'https://www.odoo.com/page/events',
-    'category': 'Tools',
+    'category': 'Marketing',
     'summary': 'Trainings, Conferences, Meetings, Exhibitions, Registrations',
     'description': """
 Organization and management of Events.
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index fc546f6f271..c3f9ee969ce 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Events Sales',
     'version': '1.1',
-    'category': 'Tools',
+    'category': 'Marketing',
     'website': 'https://www.odoo.com/page/events',
     'description': """
 Creating registration with sale orders.
diff --git a/addons/event_sale/models/sale_order.py b/addons/event_sale/models/sale_order.py
index c27ac01033f..61152d85985 100644
--- a/addons/event_sale/models/sale_order.py
+++ b/addons/event_sale/models/sale_order.py
@@ -24,7 +24,7 @@ class SaleOrderLine(models.Model):
        help="Choose an event and it will automatically create a registration for this event.")
     event_ticket_id = fields.Many2one('event.event.ticket', string='Event Ticket', help="Choose "
         "an event ticket and it will automatically create a registration for this event ticket.")
-    event_ok = fields.Boolean(related='product_id.event_ok')
+    event_ok = fields.Boolean(related='product_id.event_ok', readonly=True)
 
     @api.multi
     def _prepare_invoice_line(self, qty):
@@ -34,13 +34,6 @@ class SaleOrderLine(models.Model):
             res['name'] = '%s: %s' % (res.get('name', ''), self.event_id.name)
         return res
 
-    @api.onchange('product_id')
-    def _onchange_product_id_event(self):
-        values = {'event_ok': False}
-        if self.product_id.event_ok:
-            values['event_ok'] = self.product_id.event_ok
-        self.update(values)
-
     @api.multi
     def _update_registrations(self, confirm=True, registration_data=None):
         """ Create or update registrations linked to a sale order line. A sale
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 3ae03d6020e..f6ba5b0dda2 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -5,7 +5,7 @@
     'name': 'Email Gateway',
     'version': '1.0',
     'depends': ['mail'],
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'description': """
 Retrieve incoming email on POP/IMAP servers.
 ============================================
diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py
index 5a95ffc82b1..74a3eb16c0e 100644
--- a/addons/fleet/__openerp__.py
+++ b/addons/fleet/__openerp__.py
@@ -4,7 +4,7 @@
     'name' : 'Fleet Management',
     'version' : '0.1',
     'sequence': 165,
-    'category': 'Managing vehicles and contracts',
+    'category': 'Human Resources',
     'website' : 'https://www.odoo.com/page/fleet',
     'summary' : 'Vehicle, leasing, insurances, costs',
     'description' : """
diff --git a/addons/gamification_sale_crm/__openerp__.py b/addons/gamification_sale_crm/__openerp__.py
index ee95c7a0414..893112a37f7 100644
--- a/addons/gamification_sale_crm/__openerp__.py
+++ b/addons/gamification_sale_crm/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'CRM Gamification',
     'version': '1.0',
-    'category': 'hidden',
+    'category': 'Sales',
     'depends': ['gamification','sale_crm'],
     'website' : 'https://www.odoo.com/page/gamification',
     'description': """Example of goal definitions and challenges that can be used related to the usage of the CRM Sale module.""",
diff --git a/addons/google_account/__openerp__.py b/addons/google_account/__openerp__.py
index 8aae3b023cc..02109b70ac6 100644
--- a/addons/google_account/__openerp__.py
+++ b/addons/google_account/__openerp__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Google Users',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'description': """
 The module adds google user in res user.
 ========================================
diff --git a/addons/google_calendar/__openerp__.py b/addons/google_calendar/__openerp__.py
index 56f16571db2..4e6d5e9d593 100644
--- a/addons/google_calendar/__openerp__.py
+++ b/addons/google_calendar/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Google Calendar',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'description': """
 The module adds the possibility to synchronize Google Calendar with Odoo
 ===========================================================================
diff --git a/addons/google_drive/__openerp__.py b/addons/google_drive/__openerp__.py
index b58d4b489f2..c41ed3a4f7b 100644
--- a/addons/google_drive/__openerp__.py
+++ b/addons/google_drive/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Google Drive™ integration',
     'version': '0.2',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'installable': True,
     'auto_install': False,
     'data': [
diff --git a/addons/google_spreadsheet/__openerp__.py b/addons/google_spreadsheet/__openerp__.py
index 48744434b11..70fa008dbf4 100644
--- a/addons/google_spreadsheet/__openerp__.py
+++ b/addons/google_spreadsheet/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Google Spreadsheet',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'description': """
 The module adds the possibility to display data from Odoo in Google Spreadsheets in real time.
 =================================================================================================
diff --git a/addons/hr_equipment/__openerp__.py b/addons/hr_equipment/__openerp__.py
index 5bb0bcb5dd8..5019846aaf8 100644
--- a/addons/hr_equipment/__openerp__.py
+++ b/addons/hr_equipment/__openerp__.py
@@ -4,6 +4,7 @@
     'name': 'Equipments',
     'version': '1.0',
     'sequence': 125,
+    'category': 'Human Resources',
     'description': """
         Track employees' equipment and manage maintenance requests.""",
     'depends': ['hr'],
diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py
index a1d6a8ca5e3..33750f53c40 100644
--- a/addons/hr_gamification/__openerp__.py
+++ b/addons/hr_gamification/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'HR Gamification',
     'version': '1.0',
-    'category': 'hidden',
+    'category': 'Human Resources',
     'website': 'https://www.odoo.com/page/employees',
     'depends': ['gamification', 'hr'],
     'description': """Use the HR resources for the gamification process.
diff --git a/addons/hw_blackbox_be/__openerp__.py b/addons/hw_blackbox_be/__openerp__.py
index fb0d2d3e5dd..f6e565cc4dc 100644
--- a/addons/hw_blackbox_be/__openerp__.py
+++ b/addons/hw_blackbox_be/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Blackbox Hardware Driver',
     'version': '1.0',
-    'category': 'Hardware Drivers',
+    'category': 'Point of Sale',
     'sequence': 6,
     'summary': 'Hardware Driver for Belgian Fiscal Data Modules',
     'website': 'https://www.odoo.com/page/point-of-sale',
diff --git a/addons/hw_escpos/__openerp__.py b/addons/hw_escpos/__openerp__.py
index e2f34310ea8..54f69130c84 100644
--- a/addons/hw_escpos/__openerp__.py
+++ b/addons/hw_escpos/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'ESC/POS Hardware Driver',
     'version': '1.0',
-    'category': 'Hardware Drivers',
+    'category': 'Point of Sale',
     'sequence': 6,
     'website': 'https://www.odoo.com/page/point-of-sale',
     'summary': 'Hardware Driver for ESC/POS Printers and Cashdrawers',
diff --git a/addons/hw_posbox_homepage/__openerp__.py b/addons/hw_posbox_homepage/__openerp__.py
index f1157a68dc4..0bc752e1481 100644
--- a/addons/hw_posbox_homepage/__openerp__.py
+++ b/addons/hw_posbox_homepage/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'PosBox Homepage',
     'version': '1.0',
-    'category': 'Hardware Drivers',
+    'category': 'Point of Sale',
     'sequence': 6,
     'website': 'https://www.odoo.com/page/point-of-sale',
     'summary': 'A homepage for the PosBox',
diff --git a/addons/hw_posbox_upgrade/__openerp__.py b/addons/hw_posbox_upgrade/__openerp__.py
index 6166dcb0099..5030d8a9c0b 100644
--- a/addons/hw_posbox_upgrade/__openerp__.py
+++ b/addons/hw_posbox_upgrade/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'PosBox Software Upgrader',
     'version': '1.0',
-    'category': 'Hardware Drivers',
+    'category': 'Point of Sale',
     'website': 'https://www.odoo.com/page/point-of-sale',
     'sequence': 6,
     'summary': 'Allows to remotely upgrade the PosBox software',
diff --git a/addons/hw_scale/__openerp__.py b/addons/hw_scale/__openerp__.py
index 9ffd6ee2a57..6a05128a5ed 100644
--- a/addons/hw_scale/__openerp__.py
+++ b/addons/hw_scale/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Weighing Scale Hardware Driver',
     'version': '1.0',
-    'category': 'Hardware Drivers',
+    'category': 'Point of Sale',
     'sequence': 6,
     'summary': 'Hardware Driver for Weighing Scales',
     'website': 'https://www.odoo.com/page/point-of-sale',
diff --git a/addons/hw_scanner/__openerp__.py b/addons/hw_scanner/__openerp__.py
index c4dbb7d9c61..0187f6fd606 100644
--- a/addons/hw_scanner/__openerp__.py
+++ b/addons/hw_scanner/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Barcode Scanner Hardware Driver',
     'version': '1.0',
-    'category': 'Hardware Drivers',
+    'category': 'Point of Sale',
     'sequence': 6,
     'summary': 'Hardware Driver for Barcode Scanners',
     'website': 'https://www.odoo.com/page/point-of-sale',
diff --git a/addons/im_livechat/__openerp__.py b/addons/im_livechat/__openerp__.py
index 39d4c2bf10e..f4e36abb480 100644
--- a/addons/im_livechat/__openerp__.py
+++ b/addons/im_livechat/__openerp__.py
@@ -4,7 +4,7 @@
     'version': '1.0',
     'sequence': 170,
     'summary': 'Website Live Chat with Visitors/Customers',
-    'category': 'Tools',
+    'category': 'Website',
     'complexity': 'easy',
     'website': 'https://www.odoo.com/page/live-chat',
     'description':
diff --git a/addons/im_odoo_support/__openerp__.py b/addons/im_odoo_support/__openerp__.py
index 3992dcdcc1d..a2ae9525f1d 100644
--- a/addons/im_odoo_support/__openerp__.py
+++ b/addons/im_odoo_support/__openerp__.py
@@ -2,7 +2,7 @@
     'name' : 'Odoo Live Support',
     'version': '1.0',
     'summary': 'Chat with the Odoo collaborators',
-    'category': 'Tools',
+    'category': 'Website',
     'complexity': 'medium',
     'description':
         """
diff --git a/addons/l10n_ae/__openerp__.py b/addons/l10n_ae/__openerp__.py
index 35647a55f69..337a4755be4 100644
--- a/addons/l10n_ae/__openerp__.py
+++ b/addons/l10n_ae/__openerp__.py
@@ -8,7 +8,7 @@
     'version': '1.0',
     'author': 'Tech Receptives',
     'website': 'http://www.techreceptives.com',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 United Arab Emirates accounting chart and localization.
 =======================================================
diff --git a/addons/l10n_ar/__openerp__.py b/addons/l10n_ar/__openerp__.py
index 66d2d43ce1f..b0e6a222328 100644
--- a/addons/l10n_ar/__openerp__.py
+++ b/addons/l10n_ar/__openerp__.py
@@ -15,7 +15,7 @@ Plan contable argentino e impuestos de acuerdo a disposiciones vigentes
     """,
     'author': ['Cubic ERP'],
     'website': 'http://cubicERP.com',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'depends': ['base', 'account'],
     'data':[
         'l10n_ar_chart.xml',
diff --git a/addons/l10n_at/__openerp__.py b/addons/l10n_at/__openerp__.py
index fd54d6e14e1..0970bb4399f 100644
--- a/addons/l10n_at/__openerp__.py
+++ b/addons/l10n_at/__openerp__.py
@@ -8,7 +8,7 @@
     'version': '2.0',
     'author': 'conexus.at',
     'website': 'http://www.conexus.at',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'depends': ['base_vat'],
     'description': """
 This module provides the standard Accounting Chart for Austria which is based on the Template from BMF.gv.at.
diff --git a/addons/l10n_au/__openerp__.py b/addons/l10n_au/__openerp__.py
index 8fac1966d91..69041554d9b 100644
--- a/addons/l10n_au/__openerp__.py
+++ b/addons/l10n_au/__openerp__.py
@@ -6,7 +6,7 @@
 {
     'name': 'Australian - Accounting',
     'version': '1.1',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 Australian Accounting Module
 ============================
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index 9267d09c2e3..299f057234e 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Belgium - Accounting',
     'version': '2.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the base module to manage the accounting chart for Belgium in Odoo.
 ==============================================================================
diff --git a/addons/l10n_be_intrastat/__openerp__.py b/addons/l10n_be_intrastat/__openerp__.py
index e02d2bc95e9..b32ae826af4 100644
--- a/addons/l10n_be_intrastat/__openerp__.py
+++ b/addons/l10n_be_intrastat/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Belgian Intrastat Declaration',
     'version': '1.0',
-    'category': 'Reporting',
+    'category': 'Localization',
     'description': """
 Generates Intrastat XML report for declaration
 Based on invoices.
diff --git a/addons/l10n_be_invoice_bba/__openerp__.py b/addons/l10n_be_invoice_bba/__openerp__.py
index 786ea9dc6b7..1330b0420a4 100644
--- a/addons/l10n_be_invoice_bba/__openerp__.py
+++ b/addons/l10n_be_invoice_bba/__openerp__.py
@@ -8,7 +8,7 @@
     'version': '1.2',
     'author': 'Noviat',
     'website': 'https://www.odoo.com/page/accounting',
-    'category' : 'Localization',
+    'category': 'Localization',
     'description': """
     
 Belgian localization for in- and outgoing invoices (prereq to account_coda):
diff --git a/addons/l10n_bo/__openerp__.py b/addons/l10n_bo/__openerp__.py
index e82bcf39b85..25ee99e90d7 100644
--- a/addons/l10n_bo/__openerp__.py
+++ b/addons/l10n_bo/__openerp__.py
@@ -14,7 +14,7 @@ Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes
     """,
     "author": "Cubic ERP",
     "website": "https://cubicERP.com",
-    "category": "Localization/Account Charts",
+    'category': 'Localization',
     "depends": ["account"],
     "data": [
         "l10n_bo_chart.xml",
diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py
index 2509b25b2ce..a9a91f575dd 100644
--- a/addons/l10n_br/__openerp__.py
+++ b/addons/l10n_br/__openerp__.py
@@ -5,7 +5,7 @@
 
 {
     'name': 'Brazilian - Accounting',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 Base module for the Brazilian localization
 ==========================================
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index 5b1a0e825ef..d5233f51b25 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -6,7 +6,7 @@
     'version': '1.0',
     'author': 'Savoir-faire Linux',
     'website': 'https://www.savoirfairelinux.com',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the module to manage the Canadian accounting chart in Odoo.
 ===========================================================================================
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index abda331a020..10a9ab65d47 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -40,7 +40,7 @@ https://github.com/OCA/l10n-switzerland
 """,
  'version': '9.0',
  'author': 'Camptocamp',
- 'category': 'Localization/Account Charts',
+ 'category': 'Localization',
  'website': 'http://www.camptocamp.com',
  'depends': ['account', 'l10n_multilang'],
  'data': ['chart/account.xml',
diff --git a/addons/l10n_cl/__openerp__.py b/addons/l10n_cl/__openerp__.py
index 278afda5bd3..cb311aaac7f 100644
--- a/addons/l10n_cl/__openerp__.py
+++ b/addons/l10n_cl/__openerp__.py
@@ -14,7 +14,7 @@ Plan contable chileno e impuestos de acuerdo a disposiciones vigentes
     """,
     'author': 'Cubic ERP',
     'website': 'http://cubicERP.com',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'depends': ['account'],
     'data': [
         'l10n_cl_chart.xml',
diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py
index 2572af5181a..6530560f13f 100644
--- a/addons/l10n_cn/__openerp__.py
+++ b/addons/l10n_cn/__openerp__.py
@@ -9,7 +9,7 @@
 {
     'name': '中国会计科目表',
     'version': '1.8',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'author': 'www.openerp-china.org',
     'maintainer': 'jeff@osbzr.com',
     'website': 'http://openerp-china.org',
diff --git a/addons/l10n_cn_small_business/__openerp__.py b/addons/l10n_cn_small_business/__openerp__.py
index a9792fb87bf..43e9ab5fb0c 100644
--- a/addons/l10n_cn_small_business/__openerp__.py
+++ b/addons/l10n_cn_small_business/__openerp__.py
@@ -9,7 +9,7 @@
 {
     'name': '中国小企业会计科目表',
     'version': '1.8',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'author': 'www.openerp-china.org',
     'maintainer': 'jeff@osbzr.com',
     'website': 'http://openerp-china.org',
diff --git a/addons/l10n_cn_standard/__openerp__.py b/addons/l10n_cn_standard/__openerp__.py
index 12d75ddae12..beb68e335dd 100644
--- a/addons/l10n_cn_standard/__openerp__.py
+++ b/addons/l10n_cn_standard/__openerp__.py
@@ -9,7 +9,7 @@
 {
     'name': '中国会计科目表-企业会计准则',
     'version': '1.8',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'author': 'www.openerp-china.org',
     'maintainer': 'jeff@osbzr.com',
     'website': 'http://openerp-china.org',
diff --git a/addons/l10n_co/__openerp__.py b/addons/l10n_co/__openerp__.py
index 522de4e4028..10189f02805 100644
--- a/addons/l10n_co/__openerp__.py
+++ b/addons/l10n_co/__openerp__.py
@@ -11,7 +11,7 @@
 {
     'name': 'Colombian - Accounting',
     'version': '0.8',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': 'Colombian Accounting and Tax Preconfiguration',
     'author': 'David Arnold BA HSG (devCO)',
     'depends': [
diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py
index eaec9682bde..91a2f528689 100644
--- a/addons/l10n_cr/__openerp__.py
+++ b/addons/l10n_cr/__openerp__.py
@@ -38,7 +38,7 @@
     'url': 'https://github.com/CLEARCORP/odoo-costa-rica',
     'author': 'ClearCorp S.A.',
     'website': 'http://clearcorp.co.cr',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 Chart of accounts for Costa Rica.
 =================================
diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py
index 811da022212..99cc2f770b6 100644
--- a/addons/l10n_de/__openerp__.py
+++ b/addons/l10n_de/__openerp__.py
@@ -7,7 +7,7 @@
     'version': '1.0',
     'author': 'openbig.org',
     'website': 'http://www.openbig.org',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03.
 ==============================================================================
diff --git a/addons/l10n_de_skr03/__openerp__.py b/addons/l10n_de_skr03/__openerp__.py
index 6d2f4eb1d1e..7a4943714db 100644
--- a/addons/l10n_de_skr03/__openerp__.py
+++ b/addons/l10n_de_skr03/__openerp__.py
@@ -56,7 +56,7 @@
     'version': '2.0',
     'author': 'openbig.org',
     'website': 'http://www.openbig.org',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03.
 ==============================================================================
diff --git a/addons/l10n_de_skr04/__openerp__.py b/addons/l10n_de_skr04/__openerp__.py
index cce2a808882..9c5c21cc85e 100644
--- a/addons/l10n_de_skr04/__openerp__.py
+++ b/addons/l10n_de_skr04/__openerp__.py
@@ -58,7 +58,7 @@
     'version': '2.0',
     'author': 'openbig.org',
     'website': 'http://www.openbig.org',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR04.
 ==============================================================================
diff --git a/addons/l10n_do/__openerp__.py b/addons/l10n_do/__openerp__.py
index 150fbd933a1..a3f9fc3cada 100644
--- a/addons/l10n_do/__openerp__.py
+++ b/addons/l10n_do/__openerp__.py
@@ -9,7 +9,7 @@
 {
     'name': 'Dominican Republic - Accounting',
     'version': '1.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the base module to manage the accounting chart for Dominican Republic.
 ==============================================================================
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index 73ec9f95631..ca3e2715281 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -6,7 +6,7 @@
 {
     'name': 'Ecuador - Accounting',
     'version': '1.1',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the base module to manage the accounting chart for Ecuador in Odoo.
 ==============================================================================
diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py
index c38653d5950..9655ec66f20 100644
--- a/addons/l10n_es/__openerp__.py
+++ b/addons/l10n_es/__openerp__.py
@@ -13,7 +13,7 @@
     "version" : "4.0",
     "author" : "Spanish Localization Team",
     'website' : 'https://launchpad.net/openerp-spain',
-    "category" : "Localization/Account Charts",
+    'category': 'Localization',
     "description": """
 Spanish charts of accounts (PGCE 2008).
 ========================================
diff --git a/addons/l10n_et/__openerp__.py b/addons/l10n_et/__openerp__.py
index 4a02fbf4de7..aa70ca13091 100644
--- a/addons/l10n_et/__openerp__.py
+++ b/addons/l10n_et/__openerp__.py
@@ -6,7 +6,7 @@
 {
     'name': 'Ethiopia - Accounting',
     'version': '2.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 Base Module for Ethiopian Localization
 ======================================
diff --git a/addons/l10n_eu_service/__openerp__.py b/addons/l10n_eu_service/__openerp__.py
index 2c4e80bb785..5370fba1551 100644
--- a/addons/l10n_eu_service/__openerp__.py
+++ b/addons/l10n_eu_service/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'EU Mini One Stop Shop (MOSS)',
     'version': '1.0',
-    'category': '',
+    'category': 'Localization',
     'description': """
 EU Mini One Stop Shop (MOSS) VAT for telecommunications, broadcasting and electronic services
 =============================================================================================
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index 400bf50c361..d31019f310e 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -6,7 +6,7 @@
 {
     'name': 'France - Accounting',
     'version': '1.1',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the module to manage the accounting chart for France in Odoo.
 ========================================================================
diff --git a/addons/l10n_fr_fec/__openerp__.py b/addons/l10n_fr_fec/__openerp__.py
index cddb67f7f17..f8a6a2265bc 100644
--- a/addons/l10n_fr_fec/__openerp__.py
+++ b/addons/l10n_fr_fec/__openerp__.py
@@ -6,7 +6,7 @@
 {
     'name': 'France - FEC',
     'version': '1.0',
-    'category': 'French Localization',
+    'category': 'Localization',
     'summary': "Fichier d'Échange Informatisé (FEC) for France",
     'author': "Akretion,Odoo Community Association (OCA)",
     'website': 'http://www.akretion.com',
diff --git a/addons/l10n_fr_hr_payroll/__openerp__.py b/addons/l10n_fr_hr_payroll/__openerp__.py
index ff25cfbe87b..3e0ff25d5e0 100644
--- a/addons/l10n_fr_hr_payroll/__openerp__.py
+++ b/addons/l10n_fr_hr_payroll/__openerp__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'French Payroll',
-    'category': 'Localization/Payroll',
+    'category': 'Localization',
     'author': 'Yannick Buron (SYNERPGY)',
     'depends': ['hr_payroll', 'l10n_fr'],
     'version': '1.0',
diff --git a/addons/l10n_generic_coa/__openerp__.py b/addons/l10n_generic_coa/__openerp__.py
index a626a28aed4..e0b9222009a 100644
--- a/addons/l10n_generic_coa/__openerp__.py
+++ b/addons/l10n_generic_coa/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Generic - Accounting',
     'version': '1.1',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the base module to manage the generic accounting chart in Odoo.
 ==============================================================================
diff --git a/addons/l10n_gr/__openerp__.py b/addons/l10n_gr/__openerp__.py
index c62da998ae1..cdc4b9ef259 100644
--- a/addons/l10n_gr/__openerp__.py
+++ b/addons/l10n_gr/__openerp__.py
@@ -8,7 +8,7 @@
     'version': '1.0',
     'author': 'P. Christeas, OpenERP SA.',
     'website': 'http://openerp.hellug.gr/',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the base module to manage the accounting chart for Greece.
 ==================================================================
diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py
index 4396bf5fcb8..4a3d73ef98a 100644
--- a/addons/l10n_gt/__openerp__.py
+++ b/addons/l10n_gt/__openerp__.py
@@ -20,7 +20,7 @@
 {
     'name': 'Guatemala - Accounting',
     'version': '3.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the base module to manage the accounting chart for Guatemala.
 =====================================================================
diff --git a/addons/l10n_hn/__openerp__.py b/addons/l10n_hn/__openerp__.py
index ac42eaf3424..5cefa1c4fc4 100644
--- a/addons/l10n_hn/__openerp__.py
+++ b/addons/l10n_hn/__openerp__.py
@@ -20,7 +20,7 @@
 {
     'name': 'Honduras - Accounting',
     'version': '0.1',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the base module to manage the accounting chart for Honduras.
 ====================================================================
diff --git a/addons/l10n_hr/__openerp__.py b/addons/l10n_hr/__openerp__.py
index 45ca7eaa8a2..61a95c67c41 100644
--- a/addons/l10n_hr/__openerp__.py
+++ b/addons/l10n_hr/__openerp__.py
@@ -40,7 +40,7 @@ Izvori podataka:
 """,
     "version": "13.0",
     "author": "OpenERP Croatian Community",
-    "category": 'Localization/Account Charts',
+    'category': 'Localization',
     "website": "https://code.launchpad.net/openobject-croatia",
 
     'depends': [
diff --git a/addons/l10n_hu/__openerp__.py b/addons/l10n_hu/__openerp__.py
index f275e594ed2..412012f572f 100644
--- a/addons/l10n_hu/__openerp__.py
+++ b/addons/l10n_hu/__openerp__.py
@@ -6,7 +6,7 @@
 {
     'name': 'Hungarian - Accounting',
     'version': '2.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 
 Base module for Hungarian localization
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index d27e4e4cd38..12091d356d7 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -16,7 +16,7 @@ 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.
   """,
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'depends': [
         'account',
     ],
diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
index 44d621a1755..bf62eba9670 100644
--- a/addons/l10n_in_hr_payroll/__openerp__.py
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -3,7 +3,6 @@
 {
     'name': 'Indian Payroll',
     'category': 'Localization',
-    'website':'http://www.openerp.com',
     'depends': ['hr_payroll'],
     'version': '1.0',
     'description': """
diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index 99930ca1759..ec848b41b1d 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -12,7 +12,7 @@ Piano dei conti italiano di un'impresa generica.
 
 Italian accounting chart and localization.
     """,
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'website': 'http://www.openerp-italia.org/',
     'data': [
         'data/account_chart.xml',
diff --git a/addons/l10n_jp/__openerp__.py b/addons/l10n_jp/__openerp__.py
index 208aee31d1a..4c0a1c89c95 100644
--- a/addons/l10n_jp/__openerp__.py
+++ b/addons/l10n_jp/__openerp__.py
@@ -6,7 +6,7 @@
 {
     'name': 'Japan - Accounting',
     'version': '2.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 
 Overview:
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index ead2bbdba18..a90a93acbad 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -8,7 +8,7 @@
 {
     'name': 'Luxembourg - Accounting',
     'version': '1.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the base module to manage the accounting chart for Luxembourg.
 ======================================================================
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
index 4e346bcf43b..ba693889bc8 100644
--- a/addons/l10n_ma/__openerp__.py
+++ b/addons/l10n_ma/__openerp__.py
@@ -7,7 +7,7 @@
     'name': 'Maroc - Accounting',
     'version': '1.0',
     'author': 'kazacube',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the base module to manage the accounting chart for Maroc.
 =================================================================
diff --git a/addons/l10n_multilang/__openerp__.py b/addons/l10n_multilang/__openerp__.py
index d7dae84ac83..dc21161f1ea 100644
--- a/addons/l10n_multilang/__openerp__.py
+++ b/addons/l10n_multilang/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Multi Language Chart of Accounts',
     'version': '1.1',
-    'category': 'Hidden/Dependency',
+    'category': 'Localization',
     'description': """
     * Multi language support for Chart of Accounts, Taxes, Tax Codes, Journals,
       Accounting Templates, Analytic Chart of Accounts and Analytic Journals.
diff --git a/addons/l10n_mx/__openerp__.py b/addons/l10n_mx/__openerp__.py
index 7f83ae8bd7a..565c7ff4f87 100644
--- a/addons/l10n_mx/__openerp__.py
+++ b/addons/l10n_mx/__openerp__.py
@@ -10,7 +10,7 @@
     "name": "Mexico - Accounting",
     "version": "2.0",
     "author": "Vauxoo",
-    "category": "Localization/Account Charts",
+    'category': 'Localization',
     "description": """
 Minimal accounting configuration for Mexico.
 ============================================
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 81e8012de53..51b257eabb5 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -66,7 +66,7 @@
 {
     'name' : 'Netherlands - Accounting',
     'version' : '2.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the module to manage the accounting chart for Netherlands in Odoo.
 =============================================================================
diff --git a/addons/l10n_no/__openerp__.py b/addons/l10n_no/__openerp__.py
index 399a0a1446e..28b05ec1bad 100644
--- a/addons/l10n_no/__openerp__.py
+++ b/addons/l10n_no/__openerp__.py
@@ -5,7 +5,7 @@
     "name" : "Norway - Accounting",
     "version" : "1.1",
     "author" : "Rolv Råen",
-    "category" : "Localization/Account Charts",
+    'category': 'Localization',
     "description": """This is the module to manage the accounting chart for Norway in Odoo.
 
 Updated for Odoo 9 by Bringsvor Consulting AS <www.bringsvor.com>
diff --git a/addons/l10n_nz/__openerp__.py b/addons/l10n_nz/__openerp__.py
index d053af521f4..79535c29a20 100644
--- a/addons/l10n_nz/__openerp__.py
+++ b/addons/l10n_nz/__openerp__.py
@@ -6,7 +6,7 @@
 {
     'name': 'New Zealand - Accounting',
     'version': '1.1',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 New Zealand Accounting Module
 =============================
diff --git a/addons/l10n_pa/__openerp__.py b/addons/l10n_pa/__openerp__.py
index 6fd0a3766a4..40fa9338770 100644
--- a/addons/l10n_pa/__openerp__.py
+++ b/addons/l10n_pa/__openerp__.py
@@ -17,7 +17,7 @@ Con la Colaboración de
     """,
     "author": "Cubic ERP",
     "website": "http://cubicERP.com",
-    "category": "Localization/Account Charts",
+    'category': 'Localization',
     "depends": ["account"],
     "data": [
         "l10n_pa_chart.xml",
diff --git a/addons/l10n_pe/__openerp__.py b/addons/l10n_pe/__openerp__.py
index fce23b033a5..5bcae9eb55d 100644
--- a/addons/l10n_pe/__openerp__.py
+++ b/addons/l10n_pe/__openerp__.py
@@ -16,7 +16,7 @@ SUNAT 2011 (PCGE 2010).
     """,
     'author': ['Cubic ERP'],
     'website': 'http://cubicERP.com',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'depends': ['account'],
     'data':[
         'l10n_pe_chart.xml',
diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py
index 10e16c770a0..734e5bfc6ce 100644
--- a/addons/l10n_pl/__openerp__.py
+++ b/addons/l10n_pl/__openerp__.py
@@ -8,7 +8,7 @@
     'version' : '1.02',
     'author' : 'Grzegorz Grzelak (OpenGLOBE)',
     'website': 'http://www.openglobe.pl',
-    'category' : 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the module to manage the accounting chart and taxes for Poland in Odoo.
 ==================================================================================
diff --git a/addons/l10n_pt/__openerp__.py b/addons/l10n_pt/__openerp__.py
index d8b6dd2ccf6..57ced757fbe 100644
--- a/addons/l10n_pt/__openerp__.py
+++ b/addons/l10n_pt/__openerp__.py
@@ -9,7 +9,7 @@
     'version': '0.011',
     'author': 'ThinkOpen Solutions',
     'website': 'http://www.thinkopensolutions.com/',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': 'Plano de contas SNC para Portugal',
     'depends': ['base',
                 'base_vat',
diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py
index 2cdb22726b0..b4b39c04ff5 100644
--- a/addons/l10n_ro/__openerp__.py
+++ b/addons/l10n_ro/__openerp__.py
@@ -12,7 +12,7 @@
     "version" : "1.0",
     "author" : "Fekete Mihai (Forest and Biomass Services Romania)",
     "website": "http://www.forbiom.eu",
-    "category" : "Localization/Account Charts",
+    'category': 'Localization',
     "depends" : ['account','base_vat'],
     "description": """
 This is the module to manage the Accounting Chart, VAT structure, Fiscal Position and Tax Mapping.
diff --git a/addons/l10n_sa/__openerp__.py b/addons/l10n_sa/__openerp__.py
index 4c6926cbc7d..4c7d4b9f037 100644
--- a/addons/l10n_sa/__openerp__.py
+++ b/addons/l10n_sa/__openerp__.py
@@ -4,7 +4,7 @@
     'name': 'Saudi Arabia - Accounting',
     'version': '1.1',
     'author': 'DVIT.ME',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 Odoo Arabic localization for most arabic countries and Saudi Arabia.
 
diff --git a/addons/l10n_sg/__openerp__.py b/addons/l10n_sg/__openerp__.py
index db7ba824c96..6a5366c8e8a 100644
--- a/addons/l10n_sg/__openerp__.py
+++ b/addons/l10n_sg/__openerp__.py
@@ -8,7 +8,7 @@
     'version': '1.0',
     'author': 'Tech Receptives',
     'website': 'http://www.techreceptives.com',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 Singapore accounting chart and localization.
 =======================================================
diff --git a/addons/l10n_si/__openerp__.py b/addons/l10n_si/__openerp__.py
index 83d10b78ab1..2c522ed9f1d 100644
--- a/addons/l10n_si/__openerp__.py
+++ b/addons/l10n_si/__openerp__.py
@@ -8,7 +8,7 @@
     "version": "1.0",
     "author": "Mentis d.o.o.",
     "website": "http://www.mentis.si",
-    "category": "Localization/Account Charts",
+    'category': 'Localization',
     "description": "Kontni načrt za gospodarske družbe",
     "depends": ["account", "base_iban", "base_vat", "account_cancel"],
     "data": [
diff --git a/addons/l10n_syscohada/__openerp__.py b/addons/l10n_syscohada/__openerp__.py
index bb3207dbbb0..3441bbd56d4 100644
--- a/addons/l10n_syscohada/__openerp__.py
+++ b/addons/l10n_syscohada/__openerp__.py
@@ -8,7 +8,7 @@
     'name' : 'OHADA - Accounting',
     'version' : '1.0',
     'author' : 'Baamtu Senegal',
-    'category' : 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This module implements the accounting chart for OHADA area.
 ===========================================================
diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index eb17c8d1375..8b760d20fda 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Thailand - Accounting',
     'version': '1.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 Chart of Accounts for Thailand.
 ===============================
diff --git a/addons/l10n_tr/__openerp__.py b/addons/l10n_tr/__openerp__.py
index b80fd87dd21..669b662cd49 100644
--- a/addons/l10n_tr/__openerp__.py
+++ b/addons/l10n_tr/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Turkey - Accounting',
     'version': '1.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 Türkiye için Tek düzen hesap planı şablonu Odoo Modülü.
 ==========================================================
diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py
index 68b16ef61ca..39bd8ca0062 100644
--- a/addons/l10n_uk/__openerp__.py
+++ b/addons/l10n_uk/__openerp__.py
@@ -6,7 +6,7 @@
 {
     'name': 'UK - Accounting',
     'version': '1.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 This is the latest UK Odoo localisation necessary to run Odoo accounting for UK SME's with:
 =================================================================================================
diff --git a/addons/l10n_us/__openerp__.py b/addons/l10n_us/__openerp__.py
index 7b1c0929bca..feca0161fb9 100644
--- a/addons/l10n_us/__openerp__.py
+++ b/addons/l10n_us/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'United States - Accounting',
     'version': '1.1',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 United States - Chart of accounts.
 ==================================
diff --git a/addons/l10n_uy/__openerp__.py b/addons/l10n_uy/__openerp__.py
index 05391ab0ea2..e6f965bcb9a 100644
--- a/addons/l10n_uy/__openerp__.py
+++ b/addons/l10n_uy/__openerp__.py
@@ -5,7 +5,7 @@
     'name': 'Uruguay - Chart of Accounts',
     'version': '0.1',
     'author': 'Uruguay l10n Team & Guillem Barba',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'website': 'https://launchpad.net/openerp-uruguay',
     'description': """
 General Chart of Accounts.
diff --git a/addons/l10n_ve/__openerp__.py b/addons/l10n_ve/__openerp__.py
index bcee758fb8d..b4ebe3331b3 100644
--- a/addons/l10n_ve/__openerp__.py
+++ b/addons/l10n_ve/__openerp__.py
@@ -10,7 +10,7 @@
     'name' : 'Venezuela - Accounting',
     'version': '1.0',
     'author': ['Odoo S.A.', 'Vauxoo'],
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description':
 """
 Chart of Account for Venezuela.
diff --git a/addons/l10n_vn/__openerp__.py b/addons/l10n_vn/__openerp__.py
index 559046ff12b..5ea1e136a73 100644
--- a/addons/l10n_vn/__openerp__.py
+++ b/addons/l10n_vn/__openerp__.py
@@ -8,7 +8,7 @@
     "version" : "1.0",
     "author" : "General Solutions",
     'website': 'http://gscom.vn',
-    "category" : "Localization/Account Charts",
+    'category': 'Localization',
     "description": """
 This is the module to manage the accounting chart for Vietnam in Odoo.
 =========================================================================
diff --git a/addons/link_tracker/__openerp__.py b/addons/link_tracker/__openerp__.py
index 740d4b0b21c..206fbd438d7 100644
--- a/addons/link_tracker/__openerp__.py
+++ b/addons/link_tracker/__openerp__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Link Tracker',
-    'category': 'Hidden',
+    'category': 'Marketing',
     'description': """
 Create short and trackable URLs.
 =====================================================
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index 5c80e2555b5..34499700cc6 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -5,7 +5,7 @@
     'sequence': 120,
     'version': '1.0',
     'depends': ['base', 'web', 'decimal_precision'],
-    'category': 'Tools',
+    'category': 'Human Resources',
     'summary': 'Lunch Order, Meal, Food',
     'description': """
 The base module to manage lunch.
diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js
index aad32394ff1..7c96c02010c 100644
--- a/addons/mail/static/src/js/chat_manager.js
+++ b/addons/mail/static/src/js/chat_manager.js
@@ -14,7 +14,7 @@ var web_client = require('web.web_client');
 
 var _t = core._t;
 var _lt = core._lt;
-var LIMIT = 100;
+var LIMIT = 25;
 var preview_msg_max_size = 350;  // optimal for native english speakers
 var ODOOBOT_ID = "ODOOBOT";
 
@@ -395,7 +395,7 @@ function fetch_document_messages (ids, options) {
                 processed_msgs.push(add_message(msg, {silent: true}));
             });
             return _.sortBy(loaded_msgs.concat(processed_msgs), function (msg) {
-                return msg.date;
+                return msg.id;
             });
         });
     } else {
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index 880c959b5d8..c2774385682 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Membership Management',
     'version': '0.1',
-    'category': 'Association',
+    'category': 'Sales',
     'description': """
 This module allows you to manage all operations for managing memberships.
 =========================================================================
diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index 5769d4353b5..5f5d77a3b8f 100644
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
-    'name': 'Notes',
+    'name': 'Productivity',
     'version': '1.0',
     'category': 'Tools',
     'description': """
diff --git a/addons/note_pad/__openerp__.py b/addons/note_pad/__openerp__.py
index 929350e405c..87b64cedbb1 100644
--- a/addons/note_pad/__openerp__.py
+++ b/addons/note_pad/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Memos pad',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Productivity',
     'description': """
 This module update memos inside Odoo for using an external pad
 =================================================================
diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index ef3934ded18..0f6f6c63d4b 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -2,7 +2,7 @@
 {
     'name': 'Collaborative Pads',
     'version': '2.0',
-    'category': 'Project Management',
+    'category': 'Extra Tools',
     'description': """
 Adds enhanced support for (Ether)Pad attachments in the web client.
 ===================================================================
diff --git a/addons/pad_project/__openerp__.py b/addons/pad_project/__openerp__.py
index 69ff86a1b20..c1c7753b9ef 100644
--- a/addons/pad_project/__openerp__.py
+++ b/addons/pad_project/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Pad on tasks',
     'version': '1.0',
-    'category': 'Project Management',
+    'category': 'Project',
     'description': """
 This module adds a PAD in all project form views.
 =================================================
diff --git a/addons/payment/__openerp__.py b/addons/payment/__openerp__.py
index b22e9f560f2..d5409ca301f 100644
--- a/addons/payment/__openerp__.py
+++ b/addons/payment/__openerp__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Payment Acquirer',
-    'category': 'Hidden',
+    'category': 'Accounting',
     'summary': 'Payment Acquirer Base Module',
     'version': '1.0',
     'description': """Payment Acquirer Base Module""",
diff --git a/addons/payment_adyen/__openerp__.py b/addons/payment_adyen/__openerp__.py
index 7822e9a0907..331ce8d124d 100644
--- a/addons/payment_adyen/__openerp__.py
+++ b/addons/payment_adyen/__openerp__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Adyen Payment Acquirer',
-    'category': 'Hidden',
+    'category': 'Accounting',
     'summary': 'Payment Acquirer: Adyen Implementation',
     'version': '1.0',
     'description': """Adyen Payment Acquirer""",
diff --git a/addons/payment_authorize/__openerp__.py b/addons/payment_authorize/__openerp__.py
index 6bebcafffad..8670588ce2a 100644
--- a/addons/payment_authorize/__openerp__.py
+++ b/addons/payment_authorize/__openerp__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Authorize.Net Payment Acquirer',
-    'category': 'Hidden',
+    'category': 'Accounting',
     'summary': 'Payment Acquirer: Authorize.net Implementation',
     'version': '1.0',
     'description': """Authorize.Net Payment Acquirer""",
diff --git a/addons/payment_buckaroo/__openerp__.py b/addons/payment_buckaroo/__openerp__.py
index 93fa4b39a21..4fd749fe9e7 100644
--- a/addons/payment_buckaroo/__openerp__.py
+++ b/addons/payment_buckaroo/__openerp__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Buckaroo Payment Acquirer',
-    'category': 'Hidden',
+    'category': 'Accounting',
     'summary': 'Payment Acquirer: Buckaroo Implementation',
     'version': '1.0',
     'description': """Buckaroo Payment Acquirer""",
diff --git a/addons/payment_ogone/__openerp__.py b/addons/payment_ogone/__openerp__.py
index 9b04ea98a6c..3a4a807c983 100644
--- a/addons/payment_ogone/__openerp__.py
+++ b/addons/payment_ogone/__openerp__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Ogone Payment Acquirer',
-    'category': 'Hidden',
+    'category': 'Accounting',
     'summary': 'Payment Acquirer: Ogone Implementation',
     'version': '1.0',
     'description': """Ogone Payment Acquirer""",
diff --git a/addons/payment_paypal/__openerp__.py b/addons/payment_paypal/__openerp__.py
index fcb07e997d2..2e53042ccc6 100644
--- a/addons/payment_paypal/__openerp__.py
+++ b/addons/payment_paypal/__openerp__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Paypal Payment Acquirer',
-    'category': 'Hidden',
+    'category': 'Accounting',
     'summary': 'Payment Acquirer: Paypal Implementation',
     'version': '1.0',
     'description': """Paypal Payment Acquirer""",
diff --git a/addons/payment_sips/__openerp__.py b/addons/payment_sips/__openerp__.py
index 9fc4fb26324..08298fbfd3f 100644
--- a/addons/payment_sips/__openerp__.py
+++ b/addons/payment_sips/__openerp__.py
@@ -21,7 +21,7 @@
     'name': 'Worldline SIPS',
     'version': '1.0',
     'author': 'Eezee-It',
-    'category': 'Hidden',
+    'category': 'Accounting',
     'description': """
 Worldline SIPS Payment Acquirer for online payments
 
diff --git a/addons/payment_transfer/__openerp__.py b/addons/payment_transfer/__openerp__.py
index 0976ab9b35a..c5fa2f171b8 100644
--- a/addons/payment_transfer/__openerp__.py
+++ b/addons/payment_transfer/__openerp__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Transfer Payment Acquirer',
-    'category': 'Hidden',
+    'category': 'Accounting',
     'summary': 'Payment Acquirer: Transfer Implementation',
     'version': '1.0',
     'description': """Transfer Payment Acquirer""",
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 5d3bbc8a408..54ebe066a34 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -8,7 +8,7 @@
         'base',
         'auth_signup',
     ],
-    'category': 'Portal',
+    'category': 'Extra Tools',
     'description': """
 Customize access to your Odoo database to external users by creating portals.
 ================================================================================
diff --git a/addons/portal_gamification/__openerp__.py b/addons/portal_gamification/__openerp__.py
index fca8d530ea8..8e3afd362f4 100644
--- a/addons/portal_gamification/__openerp__.py
+++ b/addons/portal_gamification/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Portal Gamification',
     'version': '1',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'complexity': 'easy',
     'description': """
 This module adds security rules for gamification to allow portal users to participate to challenges
diff --git a/addons/portal_sale/__openerp__.py b/addons/portal_sale/__openerp__.py
index be0ac1c0d3a..828a41cb232 100644
--- a/addons/portal_sale/__openerp__.py
+++ b/addons/portal_sale/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Portal Sale',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Sales',
     'complexity': 'easy',
     'description': """
 This module adds a Sales menu to your portal as soon as sale and portal are installed.
diff --git a/addons/portal_stock/__openerp__.py b/addons/portal_stock/__openerp__.py
index f5ebdc23f3f..d8b9127310a 100644
--- a/addons/portal_stock/__openerp__.py
+++ b/addons/portal_stock/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Portal Stock',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Warehouse',
     'complexity': 'easy',
     'description': """
 This module adds access rules to your portal if stock and portal are installed.
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index a9ee07335cf..92cccc6702c 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -6,7 +6,7 @@
     'name' : 'Procurements',
     'version' : '1.0',
     'website': 'https://www.odoo.com/page/manufacturing',
-    'category' : 'Hidden/Dependency',
+    'category' : 'Hidden',
     'depends' : ['base', 'product'],
     'description': """
 This is the module for computing Procurements.
diff --git a/addons/procurement_jit/__openerp__.py b/addons/procurement_jit/__openerp__.py
index 740bc457aa3..4b3a4115130 100644
--- a/addons/procurement_jit/__openerp__.py
+++ b/addons/procurement_jit/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Just In Time Scheduling',
     'version': '1.0',
-    'category': 'Base',
+    'category': 'Warehouse',
     'description': """
 This module will automatically reserve the picking from stock when a sale order is confirmed
 ============================================================================================
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index a5362684830..fad42d03ffb 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Products & Pricelists',
     'version': '1.2',
-    'category': 'Sales Management',
+    'category': 'Sales',
     'depends': ['base', 'decimal_precision', 'mail', 'report'],
     'demo': [
         'product_demo.xml',
diff --git a/addons/product_email_template/__openerp__.py b/addons/product_email_template/__openerp__.py
index a74b53c4384..ca734de68c6 100644
--- a/addons/product_email_template/__openerp__.py
+++ b/addons/product_email_template/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Product Email Template',
     'depends': ['account'],
-    'category': 'Accounting & Finance',
+    'category': 'Accounting',
     'description': """
 Add email templates to products to be sent on invoice confirmation
 ==================================================================
diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py
index f5916003f74..7566eb1e276 100644
--- a/addons/product_expiry/__openerp__.py
+++ b/addons/product_expiry/__openerp__.py
@@ -1,7 +1,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name' : 'Products Expiration Date',
-    'category' : 'Specific Industry Applications',
+    'category' : 'Warehouse',
     'depends' : ['stock'],
     'demo' : ['data/product_expiry_demo.xml'],
     'description': """
diff --git a/addons/product_extended/__openerp__.py b/addons/product_extended/__openerp__.py
index 5a438655bb9..e0a1f7cae41 100644
--- a/addons/product_extended/__openerp__.py
+++ b/addons/product_extended/__openerp__.py
@@ -3,7 +3,7 @@
     "name" : "Product extension to track sales and purchases",
     "version" : "1.0",
     "depends" : ["product", "purchase", "sale", "mrp", "stock_account"],
-    "category" : "Generic Modules/Inventory Control",
+    "category" : "Manufacturing",
     "description": """
 Product extension. This module adds:
   * Computes standard price from the BoM of the product with a button on the product variant based
diff --git a/addons/product_extended/product_extended_view.xml b/addons/product_extended/product_extended_view.xml
index 5995d839980..f9b6a85bc6e 100644
--- a/addons/product_extended/product_extended_view.xml
+++ b/addons/product_extended/product_extended_view.xml
@@ -9,7 +9,6 @@
             <field name="groups_id" eval="[(4, ref('mrp.group_mrp_user'))]"/>
             <field name="arch" type="xml">
                 <div name="standard_price_uom" position="after">
-                    <field name="bom_count" invisible="1"/>
                     <button name="%(action_view_compute_price_wizard)d"
                         string="Compute from BOM" type="action" 
                         attrs="{'invisible': ['|', ('cost_method', '!=', 'standard'), ('bom_count', '=', 0)]}"
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index fad47583371..58efeeecd62 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Margins by Products',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Sales',
     'description': """
 Adds a reporting menu in products that computes sales, purchases, margins and other interesting indicators based on invoices.
 =============================================================================================================================
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index bede7dc1fec..cd3425bedc5 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Prices Visible Discounts',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Sales',
     'description': """
 This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.
 ===============================================================================================================
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index d9a26448063..2f44c5ef01d 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
-    'name': 'Project Management',
+    'name': 'Project',
     'version': '1.1',
     'website': 'https://www.odoo.com/page/project-management',
     'category': 'Project Management',
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 24e1f319331..999e91888ed 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Issue Tracking',
     'version': '1.0',
-    'category': 'Project Management',
+    'category': 'Project',
     'sequence': 40,
     'summary': 'Support, Bug Tracker, Helpdesk',
     'description': """
diff --git a/addons/project_issue_sheet/__openerp__.py b/addons/project_issue_sheet/__openerp__.py
index f367064d1e5..991a340fdaa 100644
--- a/addons/project_issue_sheet/__openerp__.py
+++ b/addons/project_issue_sheet/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Timesheet on Issues',
     'version': '1.0',
-    'category': 'Project Management',
+    'category': 'Project',
     'description': """
 This module adds the Timesheet support for the Issues/Bugs Management in Project.
 =================================================================================
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 2fbeccbdfb3..67c3faab2e2 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Purchase Management',
     'version': '1.2',
-    'category': 'Purchase Management',
+    'category': 'Purchases',
     'sequence': 60,
     'summary': 'Purchase Orders, Receipts, Vendor Bills',
     'description': """
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index c241efe5103..089375243d0 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -1088,7 +1088,7 @@ class ProductCategory(models.Model):
         help="This account will be used to value price difference between purchase price and accounting cost.")
 
 
-class MailComposeMessage(models.Model):
+class MailComposeMessage(models.TransientModel):
     _inherit = 'mail.compose.message'
 
     @api.multi
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index e02e078c58f..fd50cdeafe5 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -2,7 +2,7 @@
 {
     'name': 'Purchase Requisitions',
     'version': '0.1',
-    'category': 'Purchase Management',
+    'category': 'Purchases',
     'website': 'https://www.odoo.com/page/purchase',
     'description': """
 This module allows you to manage your Purchase Requisition.
diff --git a/addons/rating/__openerp__.py b/addons/rating/__openerp__.py
index 910516cdea1..f2824bb0d70 100644
--- a/addons/rating/__openerp__.py
+++ b/addons/rating/__openerp__.py
@@ -2,7 +2,7 @@
 {
     'name': 'Customer Rating',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Productivity',
     'description': """
 This module allows a customer to give rating.
 """,
diff --git a/addons/rating_project/__openerp__.py b/addons/rating_project/__openerp__.py
index eef59540757..2485f097159 100644
--- a/addons/rating_project/__openerp__.py
+++ b/addons/rating_project/__openerp__.py
@@ -2,7 +2,7 @@
 {
     'name': 'Project Rating',
     'version': '1.0',
-    'category': 'Hidden',
+    'category': 'Project',
     'description': """
 This module Allows a customer to give rating on Project.
 """,
diff --git a/addons/rating_project_issue/__openerp__.py b/addons/rating_project_issue/__openerp__.py
index b43f64909d3..eccb025bae9 100644
--- a/addons/rating_project_issue/__openerp__.py
+++ b/addons/rating_project_issue/__openerp__.py
@@ -2,7 +2,7 @@
 {
     'name': 'Issue Rating',
     'version': '1.0',
-    'category': 'Hidden',
+    'category': 'Project',
     'description': """
 This module allows a customer to give rating on Project Issue.
 """,
diff --git a/addons/report/__openerp__.py b/addons/report/__openerp__.py
index 246fcb90689..362abd5b1a1 100644
--- a/addons/report/__openerp__.py
+++ b/addons/report/__openerp__.py
@@ -1,7 +1,7 @@
 {
     'name': 'Report',
     'category': 'Base',
-    'summary': 'Report',
+    'summary': 'Hidden',
     'version': '1.0',
     'description': """
 Report
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index 71510039065..fb94d392dff 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Intrastat Reporting',
-    'category': 'Accounting & Finance',
+    'category': 'Accounting',
     'description': """
 A module that adds intrastat reports.
 =====================================
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index b751bdd2c75..f7483706643 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -56,7 +56,7 @@ TODO:
     'version': '0.9',
     'depends': ['base','report'],
     'author': 'Camptocamp',
-    'category': 'Reporting', # i.e a technical module, not shown in Application install menu
+    'category': 'Hidden', # i.e a technical module, not shown in Application install menu
     'url': 'http://http://www.camptocamp.com/',
     'data': [ 'security/ir.model.access.csv',
               'data.xml',
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index eb267603e81..9ca5c246d5f 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name' : 'Resource',
     'version' : '1.1',
-    'category' : 'Hidden/Dependency',
+    'category' : 'Hidden',
     'website' : 'http://www.openerp.com',
     'description': """
 Module for resource management.
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index fb41f613a1f..588e6976c49 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Sales Management',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Sales',
     'sequence': 15,
     'summary': 'Quotations, Sales Orders, Invoicing',
     'description': """
diff --git a/addons/sale_expense/__openerp__.py b/addons/sale_expense/__openerp__.py
index 7cf926cb7a2..6a54d4cb808 100644
--- a/addons/sale_expense/__openerp__.py
+++ b/addons/sale_expense/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Sales Expense',
     'version': '1.0',
-    'category': 'Hidden',
+    'category': 'Sales',
     'summary': 'Quotation, Sale Orders, Delivery & Invoicing Control',
     'description': """
 Module used for demo data
diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py
index f8289c67545..5d86da377ac 100644
--- a/addons/sale_margin/__openerp__.py
+++ b/addons/sale_margin/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Margins in Sales Orders',
     'version':'1.0',
-    'category' : 'Sales Management',
+    'category': 'Sales',
     'description': """
 This module adds the 'Margin' on sales order.
 =============================================
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index 80b9e893c4d..e02c87ff656 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -141,7 +141,7 @@ class AccountInvoiceLine(models.Model):
                         prod_moves = [m for m in moves if m.product_id.id == product_id]
                         prod_qty_done = factor * qty_done
                         prod_quantity = factor * quantity
-                        average_price_unit += factor * self._compute_average_price(prod_qty_done, prod_quantity, prod_moves)
+                        average_price_unit += self._compute_average_price(prod_qty_done, prod_quantity, prod_moves)
                     price_unit = average_price_unit or price_unit
                     price_unit = uom_obj._compute_qty_obj(self.uom_id, price_unit, self.product_id.uom_id, round=False)
         return price_unit
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
index ebdc23cd6b4..2ee5c999d25 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Dates on Sales Order',
     'version': '1.1',
-    'category': 'Sales Management',
+    'category': 'Sales',
     'description': """
 Add additional date information to the sales order.
 ===================================================
diff --git a/addons/sales_team/__openerp__.py b/addons/sales_team/__openerp__.py
index a487d301098..b29ce7ca17b 100644
--- a/addons/sales_team/__openerp__.py
+++ b/addons/sales_team/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Sales Teams',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Sales',
     'summary': 'Sales Team',
     'description': """
 Using this application you can manage Sales Team  with CRM and/or Sales 
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index d820f812b2d..c7f2bdab4ac 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -33,7 +33,7 @@ Dashboard / Reports for Inventory Management will include:
     """,
     'website': 'https://www.odoo.com/page/warehouse',
     'depends': ['product', 'procurement', 'barcodes', 'web_planner'],
-    'category': 'Inventory Management',
+    'category': 'Warehouse',
     'sequence': 13,
     'demo': [
         'data/stock_demo_pre.yml',
diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index d230818059b..5bfd8e1d292 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -873,7 +873,7 @@ class Picking(models.Model):
 
             # TDE FIXME: do_only_split does not seem used anymore
             if todo_moves and not self.env.context.get('do_only_split'):
-                todo_moves.with_context(mail_notrack=True).action_done()
+                todo_moves.action_done()
             elif self.env.context.get('do_only_split'):
                 picking = picking.with_context(split=todo_moves.ids)
 
diff --git a/addons/stock_calendar/__openerp__.py b/addons/stock_calendar/__openerp__.py
index cbb45eeb647..d6c763073ee 100644
--- a/addons/stock_calendar/__openerp__.py
+++ b/addons/stock_calendar/__openerp__.py
@@ -39,7 +39,7 @@
     'website': 'https://www.odoo.com/page/warehouse',
     'images': [],
     'depends': ['purchase', 'resource'],
-    'category': 'Warehouse Management',
+    'category': 'Warehouse',
     'sequence': 16,
     'demo': [
 
diff --git a/addons/stock_dropshipping/__openerp__.py b/addons/stock_dropshipping/__openerp__.py
index 085941c2c26..42835bc8ea2 100644
--- a/addons/stock_dropshipping/__openerp__.py
+++ b/addons/stock_dropshipping/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Drop Shipping',
     'version': '1.0',
-    'category': 'Warehouse Management',
+    'category': 'Warehouse',
     'summary': 'Drop Shipping',
     'description': """
 Manage drop shipping orders
diff --git a/addons/stock_landed_costs/__openerp__.py b/addons/stock_landed_costs/__openerp__.py
index 1251e080358..cb682699f01 100644
--- a/addons/stock_landed_costs/__openerp__.py
+++ b/addons/stock_landed_costs/__openerp__.py
@@ -12,7 +12,7 @@ This module allows you to easily add extra costs on pickings and decide the spli
     """,
     'website': 'https://www.odoo.com/page/warehouse',
     'depends': ['stock_account', 'purchase'],
-    'category': 'Warehouse Management',
+    'category': 'Warehouse',
     'sequence': 16,
     'demo': [
     ],
diff --git a/addons/stock_picking_wave/__openerp__.py b/addons/stock_picking_wave/__openerp__.py
index 3a1acbbc6c0..5ff2aed752e 100644
--- a/addons/stock_picking_wave/__openerp__.py
+++ b/addons/stock_picking_wave/__openerp__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Warehouse Management: Waves',
     'version': '1.0',
-    'category': 'Stock Management',
+    'category': 'Warehouse',
     'description': """
 This module adds the picking wave option in warehouse management.
 =================================================================
diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index 9de4d9f99f5..e0496849751 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -4,7 +4,7 @@
 
 {
     'name': 'Recurring Documents',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'description': """
 Create recurring documents.
 ===========================
diff --git a/addons/theme_bootswatch/__openerp__.py b/addons/theme_bootswatch/__openerp__.py
index e3446ea4a1f..610a69ffbd1 100644
--- a/addons/theme_bootswatch/__openerp__.py
+++ b/addons/theme_bootswatch/__openerp__.py
@@ -2,7 +2,7 @@
     'name': 'Bootswatch Theme',
     'summary': 'Support for Bootswatch themes in master',
     'description': 'This theme module is exclusively for master to keep the support of Bootswatch themes which were previously part of the website module in 8.0.',
-    'category': 'Theme',
+    'category': 'Website',
     'sequence': 900,
     'version': '1.0',
     'depends': ['website'],
diff --git a/addons/theme_default/__openerp__.py b/addons/theme_default/__openerp__.py
index d7a5d4bb1a6..2980862caa5 100644
--- a/addons/theme_default/__openerp__.py
+++ b/addons/theme_default/__openerp__.py
@@ -1,7 +1,7 @@
 {
     'name': 'Default Theme',
     'description': 'Default website theme to showcase customization possibilities.',
-    'category': 'Theme/Hidden',
+    'category': 'Hidden',
     'sequence': 1000,
     'version': '1.0',
     'depends': ['website'],
diff --git a/addons/web/static/src/js/menu.js b/addons/web/static/src/js/menu.js
index 83112ed3121..8eb1552cea4 100644
--- a/addons/web/static/src/js/menu.js
+++ b/addons/web/static/src/js/menu.js
@@ -167,7 +167,7 @@ var Menu = Widget.extend({
         if ($main_menu !== $clicked_menu) {
             $clicked_menu.parents().removeClass('o_hidden');
             if ($clicked_menu.is('.oe_menu_toggler')) {
-                $clicked_menu.toggleClass('oe_menu_opened').siblings('.oe_secondary_submenu:first').toggle();
+                $clicked_menu.toggleClass('oe_menu_opened').siblings('.oe_secondary_submenu:first').toggleClass('o_hidden');
             } else {
                 $clicked_menu.parent().addClass('active');
             }
diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js
index 8e65677a8b3..6e072333d6b 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -820,7 +820,7 @@ var FieldX2Many = AbstractManyField.extend({
         self.is_loaded = self.is_loaded.then(function() {
             var view = self.get_active_view();
             if (view.type === "list") {
-                view.controller.page = 0;
+                view.controller.current_min = 1;
                 return view.controller.reload_content();
             } else if (view.controller.do_search) {
                 return view.controller.do_search(self.build_domain(), self.dataset.get_context(), []);
diff --git a/addons/web_planner/__openerp__.py b/addons/web_planner/__openerp__.py
index f8e91d8892b..2fb2b4406d3 100644
--- a/addons/web_planner/__openerp__.py
+++ b/addons/web_planner/__openerp__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 {
     'name': 'Planner',
-    'category': 'Planner',
+    'category': 'Extra Tools',
     'summary': 'Help to configure application',
     'version': '1.0',
     'description': """Application Planner""",
diff --git a/addons/web_settings_dashboard/__openerp__.py b/addons/web_settings_dashboard/__openerp__.py
index 7de71e122e7..dd6fd1565a7 100644
--- a/addons/web_settings_dashboard/__openerp__.py
+++ b/addons/web_settings_dashboard/__openerp__.py
@@ -3,7 +3,7 @@
     'name': 'Odoo Settings Dashboard',
     'version': '1.0',
     'summary': 'Quick actions for installing new app, adding users, completing planners, etc.',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'description':
     """
 Odoo dashboard
diff --git a/addons/web_tour/__openerp__.py b/addons/web_tour/__openerp__.py
index ba07849ed70..fba1156ee81 100644
--- a/addons/web_tour/__openerp__.py
+++ b/addons/web_tour/__openerp__.py
@@ -1,7 +1,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Tours',
-    'category': 'Usability',
+    'category': 'Hidden',
     'description': """
 Odoo Web tours.
 ========================
diff --git a/addons/website_crm/__openerp__.py b/addons/website_crm/__openerp__.py
index a294d2ed132..96aaf88f2a6 100644
--- a/addons/website_crm/__openerp__.py
+++ b/addons/website_crm/__openerp__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Contact Form',
-    'category': 'Website',
+    'category': 'Sales',
     'website': 'https://www.odoo.com/page/website-builder',
     'summary': 'Create Leads From Contact Form',
     'version': '2.0',
diff --git a/addons/website_crm_partner_assign/__openerp__.py b/addons/website_crm_partner_assign/__openerp__.py
index a777b6e1c8b..5038c7f6deb 100644
--- a/addons/website_crm_partner_assign/__openerp__.py
+++ b/addons/website_crm_partner_assign/__openerp__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Resellers',
-    'category': 'Website',
+    'category': 'Sales',
     'website': 'https://www.odoo.com/page/website-builder',
     'summary': 'Publish Your Channel of Resellers',
     'version': '1.0',
diff --git a/addons/website_event/__openerp__.py b/addons/website_event/__openerp__.py
index 75696e064e4..7c3be48ce44 100644
--- a/addons/website_event/__openerp__.py
+++ b/addons/website_event/__openerp__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Online Events',
-    'category': 'Website',
+    'category': 'Marketing',
     'sequence': 135,
     'summary': 'Schedule, Promote and Sell Events',
     'website': 'https://www.odoo.com/page/website-builder',
diff --git a/addons/website_event/i18n/website_event.pot b/addons/website_event/i18n/website_event.pot
index f6ff69c8d54..5eff9091643 100644
--- a/addons/website_event/i18n/website_event.pot
+++ b/addons/website_event/i18n/website_event.pot
@@ -117,6 +117,11 @@ msgstr ""
 msgid "All Events"
 msgstr ""
 
+#. module: website_event
+#: model:ir.ui.view,arch_db:website_event.registration_attendee_details
+msgid "Attendee #%s"
+msgstr ""
+
 #. module: website_event
 #: model:ir.ui.view,arch_db:website_event.registration_attendee_details
 msgid "Cancel Registration"
diff --git a/addons/website_event/views/website_event_templates.xml b/addons/website_event/views/website_event_templates.xml
index ffa9325c297..4cee5fec02c 100644
--- a/addons/website_event/views/website_event_templates.xml
+++ b/addons/website_event/views/website_event_templates.xml
@@ -473,7 +473,8 @@
                                 <t t-foreach="range(1, ticket['quantity'] + 1)" t-as="att_counter" name="attendee_loop">
                                     <t t-set="counter" t-value="counter + 1"/>
                                     <div class="row mb4">
-                                        <div class="col-md-4"><input class='form-control' type='text' t-attf-name="#{counter}-name" required="This field is required" t-att-placeholder="'Attendee #%s' %counter"/></div>
+                                        <t t-set="attendee_placeholder">Attendee #%s</t>
+                                        <div class="col-md-4"><input class='form-control' type='text' t-attf-name="#{counter}-name" required="This field is required" t-att-placeholder="attendee_placeholder %counter"/></div>
                                         <div class="col-md-5"><input class='form-control' type='email' t-attf-name="#{counter}-email" required="This field is required"/></div>
                                         <div class="col-md-3"><input class='form-control' type='tel' t-attf-name="#{counter}-phone"/></div>
                                         <input class='hidden' type='text' t-attf-name="#{counter}-ticket_id" t-attf-value="#{ticket['id']}"/>
diff --git a/addons/website_event_questions/__openerp__.py b/addons/website_event_questions/__openerp__.py
index f222eb3bcc7..cb29d3087f7 100644
--- a/addons/website_event_questions/__openerp__.py
+++ b/addons/website_event_questions/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Questions on Events',
     'description': 'Questions on Events',
-    'category': 'Website',
+    'category': 'Marketing',
     'version': '1.0',
     'depends': ['website_event'],
     'data': [
diff --git a/addons/website_event_sale/__openerp__.py b/addons/website_event_sale/__openerp__.py
index 98fd0dce0cd..c6176bac80b 100644
--- a/addons/website_event_sale/__openerp__.py
+++ b/addons/website_event_sale/__openerp__.py
@@ -2,7 +2,7 @@
 
 {
     'name': "Online Event's Tickets",
-    'category': 'Website',
+    'category': 'Marketing',
     'summary': "Sell Your Event's Tickets",
     'website': 'https://www.odoo.com/page/events',
     'description': """
diff --git a/addons/website_event_track/__openerp__.py b/addons/website_event_track/__openerp__.py
index 073abe78d8f..2c14338c3c3 100644
--- a/addons/website_event_track/__openerp__.py
+++ b/addons/website_event_track/__openerp__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Advanced Events',
-    'category': 'Website',
+    'category': 'Marketing',
     'summary': 'Sponsors, Tracks, Agenda, Event News',
     'website': 'https://www.odoo.com/page/events',
     'version': '1.0',
diff --git a/addons/website_form/controllers/main.py b/addons/website_form/controllers/main.py
index d30514bfb9f..e7520a1b2e0 100644
--- a/addons/website_form/controllers/main.py
+++ b/addons/website_form/controllers/main.py
@@ -22,7 +22,7 @@ class WebsiteForm(http.Controller):
             return json.dumps(False)
 
         try:
-            data = self.extract_data(model_record, ** kwargs)
+            data = self.extract_data(model_record, request.params)
         # If we encounter an issue while extracting data
         except ValidationError, e:
             # I couldn't find a cleaner way to pass data to an exception
@@ -101,7 +101,7 @@ class WebsiteForm(http.Controller):
 
 
     # Extract all data sent by the form and sort its on several properties
-    def extract_data(self, model, **kwargs):
+    def extract_data(self, model, values):
 
         data = {
             'record': {},        # Values to create record
@@ -112,7 +112,8 @@ class WebsiteForm(http.Controller):
         authorized_fields = model.sudo()._get_form_writable_fields()
         error_fields = []
 
-        for field_name, field_value in kwargs.items():
+
+        for field_name, field_value in values.items():
             # If the value of the field if a file
             if hasattr(field_value, 'filename'):
                 # Undo file upload field name indexing
diff --git a/addons/website_google_map/__openerp__.py b/addons/website_google_map/__openerp__.py
index ee1ade97364..b6ce85f9e35 100644
--- a/addons/website_google_map/__openerp__.py
+++ b/addons/website_google_map/__openerp__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Website Google Map',
-    'category': 'Hidden',
+    'category': 'Website',
     'summary': '',
     'version': '1.0',
     'description': """
diff --git a/addons/website_hr/__openerp__.py b/addons/website_hr/__openerp__.py
index 78f5dccd068..19909f41988 100644
--- a/addons/website_hr/__openerp__.py
+++ b/addons/website_hr/__openerp__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Team Page',
-    'category': 'Website',
+    'category': 'Human Resources',
     'summary': 'Present Your Team',
     'description': """
 Our Team Page
diff --git a/addons/website_hr_recruitment/__openerp__.py b/addons/website_hr_recruitment/__openerp__.py
index 19cada77c88..dc3acdde129 100644
--- a/addons/website_hr_recruitment/__openerp__.py
+++ b/addons/website_hr_recruitment/__openerp__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Online Jobs',
-    'category': 'Website',
+    'category': 'Human Resources',
     'version': '1.0',
     'summary': 'Job Descriptions And Application Forms',
     'description': """
diff --git a/addons/website_issue/__openerp__.py b/addons/website_issue/__openerp__.py
index 6c99eb079c0..ff619e7815e 100644
--- a/addons/website_issue/__openerp__.py
+++ b/addons/website_issue/__openerp__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Issues Form',
-    'category': 'Bridge',
+    'category': 'Project',
     'summary': 'Create Issues From Contact Form',
     'version': '1.0',
     'description': """
diff --git a/addons/website_mass_mailing/__openerp__.py b/addons/website_mass_mailing/__openerp__.py
index 8caf18b4de3..051aa1f947a 100644
--- a/addons/website_mass_mailing/__openerp__.py
+++ b/addons/website_mass_mailing/__openerp__.py
@@ -4,7 +4,7 @@
 Add a snippet in the website builder to subscribe a mass_mailing list
     """,
     'version': '1.0',
-    'category': 'Hidden',
+    'category': 'Marketing',
     'depends': ['website', 'mass_mailing'],
     'data': [
         'views/website_mass_mailing.xml',
diff --git a/addons/website_portal/controllers/main.py b/addons/website_portal/controllers/main.py
index 74f9a5c96df..c6ab3c74923 100644
--- a/addons/website_portal/controllers/main.py
+++ b/addons/website_portal/controllers/main.py
@@ -46,7 +46,7 @@ class website_account(http.Controller):
         return groups
 
     @http.route(['/my', '/my/home'], type='http', auth="public", website=True)
-    def account(self):
+    def account(self, **kw):
         values = self._prepare_portal_layout_values()
         return request.website.render("website_portal.portal_my_home", values)
 
diff --git a/addons/website_project_issue/__openerp__.py b/addons/website_project_issue/__openerp__.py
index 8595aa6eaa5..c17e64848f2 100644
--- a/addons/website_project_issue/__openerp__.py
+++ b/addons/website_project_issue/__openerp__.py
@@ -5,7 +5,6 @@
 {
     'name': 'Website Project Issue',
     'version': '0.1',
-    'category': 'Tools',
     'complexity': 'easy',
     'description': """
 This module adds project issues inside your account's page on website if project_issue and website_portal are installed.
diff --git a/addons/website_project_issue_sheet/__openerp__.py b/addons/website_project_issue_sheet/__openerp__.py
index 105c654af0c..94350ca5eaf 100644
--- a/addons/website_project_issue_sheet/__openerp__.py
+++ b/addons/website_project_issue_sheet/__openerp__.py
@@ -5,7 +5,6 @@
 {
     'name': 'Timesheet on Website Project Issue',
     'version': '0.1',
-    'category': 'Tools',
     'complexity': 'easy',
     'description': """
 Add timesheet support on issue in the frontend.
diff --git a/addons/website_quote/__openerp__.py b/addons/website_quote/__openerp__.py
index b881188e359..f1fc19fac67 100644
--- a/addons/website_quote/__openerp__.py
+++ b/addons/website_quote/__openerp__.py
@@ -1,7 +1,7 @@
 {
     'name': 'Online Proposals',
     'category': 'Website',
-    'summary': 'Send Professional Quotations',
+    'summary': 'Sales',
     'website': 'https://www.odoo.com/page/quote-builder',
     'version': '1.0',
     'description': """
diff --git a/addons/website_rating_project_issue/__openerp__.py b/addons/website_rating_project_issue/__openerp__.py
index dbe0882478f..c0f83ac6dfe 100644
--- a/addons/website_rating_project_issue/__openerp__.py
+++ b/addons/website_rating_project_issue/__openerp__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Website Rating Project Issue',
     'version': '0.1',
-    'category': 'Website',
+    'category': 'Project',
     'complexity': 'easy',
     'description': """
 This module display project customer satisfaction on your website.
diff --git a/addons/website_sale_digital/__openerp__.py b/addons/website_sale_digital/__openerp__.py
index a48d83a4436..089bf796bd1 100644
--- a/addons/website_sale_digital/__openerp__.py
+++ b/addons/website_sale_digital/__openerp__.py
@@ -2,6 +2,7 @@
 {
     'name': 'Website Sale Digital - Sell digital products',
     'version': '0.1',
+    'category': 'Website',
     'description': """
 Sell digital product using attachments to virtual products
 """,
diff --git a/addons/website_sale_stock/__openerp__.py b/addons/website_sale_stock/__openerp__.py
index 96be11a8b9d..8eb7d76af40 100644
--- a/addons/website_sale_stock/__openerp__.py
+++ b/addons/website_sale_stock/__openerp__.py
@@ -2,7 +2,8 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
-    'name': 'Website Sale Stock - Website Delivery information',
+    'name': 'Website Sale Stock - Website Delivery Information',
+    'category': 'Website',
     'description': """
     Display delivery orders (picking) infos on the website
 """,
diff --git a/addons/website_slides/__openerp__.py b/addons/website_slides/__openerp__.py
index 111f6f16bbf..a18082c54f1 100644
--- a/addons/website_slides/__openerp__.py
+++ b/addons/website_slides/__openerp__.py
@@ -4,7 +4,7 @@
     'version': '1.0',
     'sequence': 145,
     'summary': 'Share and Publish Videos, Presentations and Documents',
-    'category': 'website',
+    'category': 'Website',
     'description': """
 Share and Publish Videos, Presentations and Documents'
 ======================================================
diff --git a/doc/setup/install.rst b/doc/setup/install.rst
index 139cc244701..0f1de4f14c0 100644
--- a/doc/setup/install.rst
+++ b/doc/setup/install.rst
@@ -236,7 +236,7 @@ Execute the following commands to install Odoo 9.0 Community on your server:
 Enterprise
 ''''''''''
 
-To install Odoo 9.0 Enterprise, execute these commands:
+For Odoo 9.0 Enterprise, get the package from the Download_ page. Then run:
 
 .. code-block:: console
 
@@ -244,8 +244,7 @@ To install Odoo 9.0 Enterprise, execute these commands:
     $ sudo postgresql-setup initdb
     $ sudo systemctl enable postgresql
     $ sudo systemctl start postgresql
-    $ sudo yum-config-manager --add-repo=https://nightly.odoo.com/9.0/nightly/rpm/odoo.repo
-    $ sudo yum install -y odoo
+    $ sudo yum localinstall odoo_9.0.latest.noarch.rpm
     $ sudo systemctl enable odoo
     $ sudo systemctl start odoo
 
@@ -555,4 +554,4 @@ default db to serve on localhost:8069
 .. _git: http://git-scm.com
 .. _Editions: https://www.odoo.com/pricing#pricing_table_features
 .. _nightly: https://nightly.odoo.com/9.0/nightly/
-.. _extra: https://nightly.odoo.com/extra/
\ No newline at end of file
+.. _extra: https://nightly.odoo.com/extra/
diff --git a/openerp/addons/test_exceptions/__openerp__.py b/openerp/addons/test_exceptions/__openerp__.py
index 8ed503b8179..d5e6c6f9b3f 100644
--- a/openerp/addons/test_exceptions/__openerp__.py
+++ b/openerp/addons/test_exceptions/__openerp__.py
@@ -4,7 +4,6 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """A module to generate exceptions.""",
-    'maintainer': 'OpenERP SA',
     '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 d1631287126..f2ce6cd1111 100644
--- a/openerp/addons/test_impex/__openerp__.py
+++ b/openerp/addons/test_impex/__openerp__.py
@@ -4,7 +4,6 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """A module to test import/export.""",
-    'maintainer': 'OpenERP SA',
     '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 4682df18c18..c08117438a9 100644
--- a/openerp/addons/test_inherit/__openerp__.py
+++ b/openerp/addons/test_inherit/__openerp__.py
@@ -4,7 +4,6 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """A module to verify the inheritance.""",
-    'maintainer': 'OpenERP SA',
     'depends': ['base'],
     'data': [
         'ir.model.access.csv',
diff --git a/openerp/addons/test_limits/__openerp__.py b/openerp/addons/test_limits/__openerp__.py
index 8f411d1ed5c..369b1fab0ed 100644
--- a/openerp/addons/test_limits/__openerp__.py
+++ b/openerp/addons/test_limits/__openerp__.py
@@ -4,7 +4,6 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """A module with dummy methods.""",
-    'maintainer': 'OpenERP SA',
     '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 21234456de9..60041bd0f3f 100644
--- a/openerp/addons/test_new_api/__openerp__.py
+++ b/openerp/addons/test_new_api/__openerp__.py
@@ -4,7 +4,6 @@
     'version': '1.0',
     'category': 'Tests',
     'description': """A module to test the API.""",
-    'maintainer': 'OpenERP SA',
     '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 ebab158c67c..3c5d3b30636 100644
--- a/openerp/addons/test_uninstall/__openerp__.py
+++ b/openerp/addons/test_uninstall/__openerp__.py
@@ -4,7 +4,6 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """A module to test the uninstall feature.""",
-    'maintainer': 'OpenERP SA',
     '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 e29bc86bf8e..5d430652c74 100644
--- a/openerp/addons/test_workflow/__openerp__.py
+++ b/openerp/addons/test_workflow/__openerp__.py
@@ -4,7 +4,6 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """A module to play with workflows.""",
-    'maintainer': 'OpenERP SA',
     'depends': ['base'],
     'data': ['data.xml', 'ir.model.access.csv'],
     'installable': True,
diff --git a/openerp/http.py b/openerp/http.py
index c6781010516..6f5ddf95d66 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -772,9 +772,9 @@ class HttpRequest(WebRequest):
 
     def __init__(self, *args):
         super(HttpRequest, self).__init__(*args)
-        params = self.httprequest.args.to_dict()
-        params.update(self.httprequest.form.to_dict())
-        params.update(self.httprequest.files.to_dict())
+        params = collections.OrderedDict(self.httprequest.args)
+        params.update(self.httprequest.form)
+        params.update(self.httprequest.files)
         params.pop('session_id', None)
         self.params = params
 
@@ -1618,6 +1618,7 @@ class Root(object):
         try:
             httprequest = werkzeug.wrappers.Request(environ)
             httprequest.app = self
+            httprequest.parameter_storage_class = werkzeug.datastructures.ImmutableOrderedMultiDict
 
             explicit_session = self.setup_session(httprequest)
             self.setup_db(httprequest)
diff --git a/openerp/models.py b/openerp/models.py
index 50871943397..53f2af4a7aa 100644
--- a/openerp/models.py
+++ b/openerp/models.py
@@ -307,7 +307,8 @@ class BaseModel(object):
     __metaclass__ = MetaModel
     _auto = False               # don't create any database backend
     _register = False           # not visible in ORM registry
-    _transient = False          # not transient
+    _abstract = True            # whether model is abstract
+    _transient = False          # whether model is transient
 
     _name = None                # the model name
     _description = None         # the model's informal name
@@ -606,6 +607,8 @@ class BaseModel(object):
             if name not in pool:
                 raise TypeError("Model %r does not exist in registry." % name)
             ModelClass = type(pool[name])
+            ModelClass._build_model_check_base(cls)
+            check_parent = ModelClass._build_model_check_parent
         else:
             ModelClass = type(name, (BaseModel,), {
                 '_name': name,
@@ -615,6 +618,7 @@ class BaseModel(object):
                 '_fields': {},                          # populated in _setup_base()
                 '_defaults': {},                        # populated in _setup_base()
             })
+            check_parent = cls._build_model_check_parent
 
         # determine all the classes the model should inherit from
         bases = LastOrderedSet([cls])
@@ -626,6 +630,7 @@ class BaseModel(object):
                 for base in parent_class.__bases__:
                     bases.add(base)
             else:
+                check_parent(cls, parent_class)
                 bases.add(parent_class)
                 parent_class._inherit_children.add(name)
         ModelClass.__bases__ = tuple(bases)
@@ -638,6 +643,29 @@ class BaseModel(object):
         model.__init__(pool, cr)
         return model
 
+    @classmethod
+    def _build_model_check_base(model_class, cls):
+        """ Check whether ``model_class`` can be extended with ``cls``. """
+        if model_class._abstract and not cls._abstract:
+            msg = ("%s transforms the abstract model %r into a non-abstract model. "
+                   "That class should either inherit from AbstractModel, or set a different '_name'.")
+            raise TypeError(msg % (cls, model_class._name))
+        if model_class._transient != cls._transient:
+            if model_class._transient:
+                msg = ("%s transforms the transient model %r into a non-transient model. "
+                       "That class should either inherit from TransientModel, or set a different '_name'.")
+            else:
+                msg = ("%s transforms the model %r into a transient model. "
+                       "That class should either inherit from Model, or set a different '_name'.")
+            raise TypeError(msg % (cls, model_class._name))
+
+    @classmethod
+    def _build_model_check_parent(model_class, cls, parent_class):
+        """ Check whether ``model_class`` can inherit from ``parent_class``. """
+        if model_class._abstract and not parent_class._abstract:
+            msg = ("In %s, the abstract model %r cannot inherit from the non-abstract model %r.")
+            raise TypeError(msg % (cls, model_class._name, parent_class._name))
+
     @classmethod
     def _build_model_attributes(cls, pool):
         """ Initialize base model attributes. """
@@ -6150,6 +6178,7 @@ class Model(AbstractModel):
     """
     _auto = True                # automatically create database backend
     _register = False           # not visible in ORM registry, meant to be python-inherited only
+    _abstract = False           # not abstract
     _transient = False          # not transient
 
 class TransientModel(Model):
@@ -6162,6 +6191,7 @@ class TransientModel(Model):
     """
     _auto = True                # automatically create database backend
     _register = False           # not visible in ORM registry, meant to be python-inherited only
+    _abstract = False           # not abstract
     _transient = True           # transient
 
 def itemgetter_tuple(items):
diff --git a/openerp/tests/addons/test_translation_import/__openerp__.py b/openerp/tests/addons/test_translation_import/__openerp__.py
index f92df24767b..9c6f03a4e5b 100644
--- a/openerp/tests/addons/test_translation_import/__openerp__.py
+++ b/openerp/tests/addons/test_translation_import/__openerp__.py
@@ -4,7 +4,6 @@
     'version': '0.1',
     'category': 'Tests',
     'description': """A module to test translation import.""",
-    'maintainer': 'OpenERP SA',
     'depends': ['base'],
     'data': ['view.xml'],
     'test': ['tests.yml'],