[MERGE] Forward-port saas-10 up to f76f4cd0b6

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_tip', 'web_planner'],

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

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"
+msgid "Day(s) after the end of the invoice month (Net EOM)"
-msgstr "Jour fixe du mois suivant"
+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

addons/account/models/account_invoice.py

@@ -1287,6 +1287,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)
@@ -1381,7 +1383,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'),
         ],
@@ -1401,7 +1403,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

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_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 supplier_taxes_id[0] or supplier_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')

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(

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="aml.debit" t-esc-options='{"widget": "monetary", "display_currency": "res_company.currency_id"}'/></td>
                                 <td><span t-esc="aml.credit" t-esc-options='{"widget": "monetary", "display_currency": "res_company.currency_id"}'/></td>

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': """

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.
 ==============================================

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',

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""",

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.
 ==========================================================================

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.
 ====================================

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.

addons/account_tax_adjustments/__openerp__.py

@@ -4,7 +4,7 @@
 {
     'name': 'Accounting Tax Adjustments',
     'version': '1.1',
-    'category': 'Accounting & Finance',
+    'category': 'Accounting',
     'description': """
 Accounting Tax Adjustments.
 ===========================

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': [

addons/account_tax_python/__openerp__.py

@@ -10,7 +10,7 @@
 
         "Python Code" defines the amount of the tax.
         """,
-    'category': 'Accounting & Finance',
+    'category': 'Accounting',
     'version': '1.0',
     'depends': ['account'],
     'data': [

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.

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'],

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.
 ===============================================

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.
 ==============================================================

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
 ===================

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' : 'Extra Tools',
-    'category' : 'Authentication',
     'data' : [
         'users_ldap_view.xml',
         'user_ldap_installer.xml',

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.
 =============================================

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',

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.

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.
 ============================================================

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
 ========================================

addons/base_geolocalize/__openerp__.py

@@ -3,7 +3,7 @@
 {
     'name': 'Partners Geolocation',
     'version': '2.0',
-    'category': 'Customer Relationship Management',
+    'category': 'Sales',
     'description': """
 Partners Geolocation
 ========================

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.
 ======================================================================================================================

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': [

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,

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.
 =========================================

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.

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': [

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': """

addons/crm_partner_assign/__openerp__.py

@@ -5,7 +5,7 @@
 {
     'name': 'Partner Assignation & Geolocation',
     'version': '1.0',
-    'category': 'Customer Relationship Management',
+    'category': 'Sales',
     'description': """
 This is the module used by Odoo SA to redirect customers to its partners, based on geolocation.
 ======================================================================================================

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

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',

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.
 ==============================================================

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
 ========================================

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.

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.

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.
 ============================================

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' : """

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.""",

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.
 ========================================

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
 ===========================================================================

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': [

addons/google_spreadsheet/__openerp__.py

@@ -5,7 +5,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.
 =================================================================================================

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'],

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.

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',

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',

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',

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',

addons/hw_scale/__openerp__.py

@@ -5,7 +5,7 @@
 {
     'name': 'Weighting Scale Hardware Driver',
     'version': '1.0',
-    'category': 'Hardware Drivers',
+    'category': 'Point of Sale',
     'sequence': 6,
     'summary': 'Hardware Driver for Weighting Scales',
     'website': 'https://www.odoo.com/page/point-of-sale',

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',

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':

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':
         """

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.
 =======================================================

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',

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.

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
 ============================

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.
 ==============================================================================

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.

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):

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",

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
 ==========================================

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.
 ===========================================================================================

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',

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',

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',

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',

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',

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': [

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.
 =================================

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.
 ==============================================================================

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.
 ==============================================================================

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.
 ==============================================================================

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.
 ==============================================================================

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.
 ==============================================================================

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).
 ========================================

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
 ======================================

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
 =============================================================================================

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.
 ========================================================================

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',

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',

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.
 ==============================================================================

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.
 ==================================================================

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.
 =====================================================================

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.
 ====================================================================

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': [

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

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',
     ],

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': """

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',

addons/l10n_jp/__openerp__.py

@@ -6,7 +6,7 @@
 {
     'name': 'Japan - Accounting',
     'version': '2.0',
-    'category': 'Localization/Account Charts',
+    'category': 'Localization',
     'description': """
 
 Overview:

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.
 ======================================================================

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.
 =================================================================