Merge lp:~openerp-dev/openobject-addons/evv-rework-description into lp:openobject-addons

[Nicolas Vanhoren (OpenERP)]

=== modified file 'account/__openerp__.py'
--- account/__openerp__.py	2011-01-14 00:11:01 +0000
+++ account/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
     "name" : "Accounting and Financial Management",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Generic Modules/Accounting',
+    "category": 'Finance',
     "description": """Financial and accounting module that covers:
     General accountings
     Cost / Analytic accounting

=== modified file 'account_accountant/__openerp__.py'
--- account_accountant/__openerp__.py	2011-01-14 00:11:01 +0000
+++ account_accountant/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 {
-    "name" : "Accountant",
+    "name" : "Accountant Access",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Generic Modules/Accounting',
+    "category": 'Finance',
     "description": """
 This module gives the admin user the access to all the accounting features like the journal
 items and the chart of accounts.

=== modified file 'account_analytic_analysis/__openerp__.py'
--- account_analytic_analysis/__openerp__.py	2011-01-14 00:11:01 +0000
+++ account_analytic_analysis/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,9 +21,9 @@
 
 
 {
-    'name'      : 'report_account_analytic',
+    'name'      : 'Analytic Account View',
     'version'   : '1.1',
-    'category'  : 'Generic Modules/Accounting',
+    'category'  : 'Finance',
     'description': """
 This module is for modifying account analytic view to show
 important data to project manager of services companies.

=== modified file 'account_analytic_default/__openerp__.py'
--- account_analytic_default/__openerp__.py	2011-01-14 00:11:01 +0000
+++ account_analytic_default/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -20,10 +20,10 @@
 ##############################################################################
 
 {
-    'name'      : 'Account Analytic Default',
+    'name'      : 'Account Analytic Defaults',
     'version'   : '1.0',
-    'category'  : 'Generic Modules/Accounting',
-    'description': """
+    'category'  : 'Finance',
+    'description': """Set default values for your analytic accounts
 Allows to automatically select analytic accounts based on criterions:
 * Product
 * Partner

=== modified file 'account_analytic_plans/__openerp__.py'
--- account_analytic_plans/__openerp__.py	2011-01-14 00:11:01 +0000
+++ account_analytic_plans/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,9 +21,9 @@
 
 
 {
-    'name'      : 'Multiple-plans management in Analytic Accounting',
+    'name'      : 'Manage multiple plans in Analytic Accounting',
     'version'   : '1.0',
-    'category'  : 'Generic Modules/Accounting',
+    'category'  : 'Finance',
     'description': """This module allows to use several analytic plans, according to the general journal,
 so that multiple analytic lines are created when the invoice or the entries
 are confirmed.

=== modified file 'account_anglo_saxon/__openerp__.py'
--- account_anglo_saxon/__openerp__.py	2011-01-17 10:26:16 +0000
+++ account_anglo_saxon/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -19,19 +19,21 @@
 ##############################################################################
 
 {
-    "name"      : "Stock Accounting for Anglo Saxon countries",
+    "name"      : "Stock Accounting for Anglo-Saxon Countries",
     "version"   : "1.2",
     "author"    : "OpenERP SA, Veritos",
     "website"   : "http://tinyerp.com - http://veritos.nl",
-    "description" : """This module will support the Anglo-Saxons accounting methodology by
+    "description" : """Implement the Anglo-Saxon Stock Accounting Method
+    This module will support the Anglo-Saxon accounting methodology by
     changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries
-    and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales.
+    and the Rhine - or also called Continental accounting countries - is the moment of taking the Cost of Goods Sold versus Cost of Sales.
     Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at the moment the goods are shipped.
-    This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account
+    This module will add this functionality by using an interim account, to store the value of shipped goods and will reverse this
+    interim account
     when the invoice is created to transfer this amount to the debtor or creditor account.
     Secondly, price differences between actual purchase price and fixed product standard price are booked on a separate account""",
     "depends"   : ["product", "purchase"],
-    "category"  : "Generic Modules/Inventory Control",
+    "category"  : "Warehouse",
     "init_xml"  : [],
     "demo_xml"  : [],
     "update_xml" : ["product_view.xml",],

=== modified file 'account_budget/__openerp__.py'
--- account_budget/__openerp__.py	2011-01-14 00:11:01 +0000
+++ account_budget/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Budget Management',
     'version': '1.0',
-    'category': 'Generic Modules/Accounting',
+    'category': 'Finance',
     'description': """This module allows accountants to manage analytic and crossovered budgets.
 
 Once the Master Budgets and the Budgets are defined (in Accounting/Budgets/),

=== modified file 'account_cancel/__openerp__.py'
--- account_cancel/__openerp__.py	2011-01-17 10:26:16 +0000
+++ account_cancel/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -20,12 +20,12 @@
 ##############################################################################
 
 {
-    "name" : "Account Cancel",
+    "name" : "Cancel Entries",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category": 'Generic Modules/Accounting',
-    "description": """
-    Module adds 'Allow cancelling entries' field on form view of account journal. If set to true it allows user to cancel entries & invoices.
+    "category": 'Finance',
+    "description": """Cancel your accounting entries or reset them to draft status
+    This module adds the 'Allow cancelling entries' field to the journal definition. If set to true, the user may cancel entries & invoices. Make sure to comply with the legal requirements of your country.
     """,
     'website': 'http://www.openerp.com',
     "depends" : ["account"],

=== modified file 'account_chart/__openerp__.py'
--- account_chart/__openerp__.py	2011-01-14 00:11:01 +0000
+++ account_chart/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Charts of Accounts',
     'version': '1.1',
-    'category': 'Generic Modules/Accounting',
+    'category': 'Finance',
     'description': """Remove minimal account chart""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',

=== modified file 'account_coda/__openerp__.py'
--- account_coda/__openerp__.py	2011-01-17 10:26:16 +0000
+++ account_coda/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,9 +23,9 @@
     "name"      : "Account CODA - import bank statements from coda file",
     "version"   : "1.0",
     "author"    : "OpenERP SA",
-    "category"  : "Account CODA",
-    "description": """
-    Module provides functionality to import
+    "category"  : "Finance",
+    "description": """Electronically import your Bank Statements through CODA files.
+    This module provides functionality to import
     bank statements from coda files.
     """,
     "depends"   : ["account_voucher"],

=== modified file 'account_followup/__openerp__.py'
--- account_followup/__openerp__.py	2011-01-14 00:11:01 +0000
+++ account_followup/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -20,24 +20,24 @@
 ##############################################################################
 
 {
-    'name': 'Accounting follow-ups management',
+    'name': 'Reminders',
     'version': '1.0',
-    'category': 'Generic Modules/Accounting',
-    'description': """
+    'category': 'Finance',
+    'description': """Remind your Customers for Payment
     Modules to automate letters for unpaid invoices, with multi-level recalls.
 
     You can define your multiple levels of recall through the menu:
         Accounting/Configuration/Miscellaneous/Follow-Ups
 
     Once it is defined, you can automatically print recalls every day
-    through simply clicking on the menu:
+    simply by clicking:
         Accounting/Periodical Processing/Billing/Send followups
 
     It will generate a PDF with all the letters according to the the
     different levels of recall defined. You can define different policies
-    for different companies. You can also send mail to the customer.
+    for different companies. You can also send mails to the customer.
 
-    Note that if you want to change the followup level for a given partner/account entry, you can do from in the menu:
+    Note that if you want to change the followup level for a given partner/account entry, you can do so from the menu:
         Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups Sent
 
 """,

=== modified file 'account_invoice_layout/__openerp__.py'
--- account_invoice_layout/__openerp__.py	2011-01-14 00:11:01 +0000
+++ account_invoice_layout/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,10 +21,10 @@
 
 
 {
-    'name': 'Invoices Layout Improvement',
+    'name': 'Improve Invoice Layout',
     'version': '1.0',
-    'category': 'Generic Modules/Projects & Services',
-    'description': """
+    'category': 'Finance',
+    'description': """Improve the standard invoice layout 
     This module provides some features to improve the layout of the invoices.
 
     It gives you the possibility to
@@ -32,7 +32,7 @@
         * add titles, comment lines, sub total lines
         * draw horizontal lines and put page breaks
 
-    Moreover, there is one option which allows you to print all the selected invoices with a given special message at the bottom of it. This feature can be very useful for printing your invoices with end-of-year wishes, special punctual conditions...
+    Moreover, there is an extra option which allows you to print all the selected invoices with a given special message at the bottom of it. This feature can be very useful for printing your invoices with end-of-year wishes, special punctual conditions...
 
     """,
     'author': 'OpenERP SA',

=== modified file 'account_payment/__openerp__.py'
--- account_payment/__openerp__.py	2011-01-25 14:19:50 +0000
+++ account_payment/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,8 +23,8 @@
     "name": "Payment Management",
     "version": "1.1",
     "author": "OpenERP SA",
-    "category": "Generic Modules/Payment",
-    "description": """
+    "category": "Finance",
+    "description": """Prepare Global Proposals for your Supplier Payments
 This module provides :
 * a more efficient way to manage invoice payment.
 * a basic mechanism to easily plug various automated payment.

=== modified file 'account_sequence/__openerp__.py'
--- account_sequence/__openerp__.py	2011-01-14 00:11:01 +0000
+++ account_sequence/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Entries Sequence Numbering',
     'version': '1.1',
-    'category': 'Generic Modules/Accounting',
+    'category': 'Finance',
     'description': """
     This module maintains internal sequence number for accounting entries.
     """,

=== modified file 'account_voucher/__openerp__.py'
--- account_voucher/__openerp__.py	2011-01-14 00:11:01 +0000
+++ account_voucher/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -29,7 +29,7 @@
     * Voucher Receipt
     * Cheque Register
     """,
-    "category" : "Generic Modules/Accounting",
+    "category" : "Finance",
     "website" : "http://tinyerp.com",
     "depends" : ["account"],
     "init_xml" : [],
@@ -62,4 +62,4 @@
     "installable": True,
 }
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'analytic/__openerp__.py'
--- analytic/__openerp__.py	2011-01-17 10:26:16 +0000
+++ analytic/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -24,7 +24,7 @@
     "version": "1.1",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Generic Modules/Projects & Services",
+    "category" : "Finance",
     "depends" : ["base", "decimal_precision"],
     "description": """Module for defining analytic accounting object.
     """,

=== modified file 'analytic_journal_billing_rate/__openerp__.py'
--- analytic_journal_billing_rate/__openerp__.py	2011-01-14 00:11:01 +0000
+++ analytic_journal_billing_rate/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Analytic Journal Billing Rate, Define the default invoicing rate for a specific journal',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Human Resources',
     'description': """
 
     This module allows you to define what is the default invoicing rate for a specific journal on a given account. This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.

=== modified file 'analytic_user_function/__openerp__.py'
--- analytic_user_function/__openerp__.py	2011-01-14 00:11:01 +0000
+++ analytic_user_function/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Analytic User Function',
+    'name': 'Human Resources',
     'version': '1.0',
     'category': 'Generic Modules/Others',
     'description': """

=== modified file 'association/__openerp__.py'
--- association/__openerp__.py	2011-01-14 00:11:01 +0000
+++ association/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Association profile',
     'version': '0.1',
-    'category': 'Profile',
+    'category': 'General',
     'description': """This module is to create Profile for Associates""",
     'author': 'OpenERP SA',
     'depends': ['membership', 'event'],

=== modified file 'auction/__openerp__.py'
--- auction/__openerp__.py	2011-01-14 00:11:01 +0000
+++ auction/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Auction Management',
     'version': '1.0',
-    'category': 'Generic Modules/Auction',
+    'category': 'General',
     'description': """
      This module manages the records of the artists,
      the articles to be put up for auction,the buyers and

=== modified file 'audittrail/__openerp__.py'
--- audittrail/__openerp__.py	2011-01-14 00:11:01 +0000
+++ audittrail/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Audit Trail',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Tools',
     'description': """
     This module gives the administrator the rights
     to track every user operation on all the objects

=== modified file 'base_action_rule/__openerp__.py'
--- base_action_rule/__openerp__.py	2011-01-17 10:26:16 +0000
+++ base_action_rule/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Action Rule',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Tools',
     'description': "This module allows to implement action rules for any object.",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',

=== modified file 'base_calendar/__openerp__.py'
--- base_calendar/__openerp__.py	2011-03-08 12:59:11 +0000
+++ base_calendar/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -29,7 +29,7 @@
     - Recurring events
     - Invitations to people""",
     "author" : "OpenERP SA",
-    'category': 'Generic Modules/Others',
+    'category': 'Tools',
     'website': 'http://www.openerp.com',
     "init_xml" : [
         'base_calendar_data.xml'

=== modified file 'base_contact/__openerp__.py'
--- base_contact/__openerp__.py	2011-01-14 00:11:01 +0000
+++ base_contact/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Base Contact',
     'version': '1.0',
-    'category': 'Generic Modules/Base',
+    'category': 'Tools',
     'description': """
         This module allows you to manage your contacts entirely.
 

=== modified file 'base_crypt/__openerp__.py'
--- base_crypt/__openerp__.py	2011-02-23 12:09:12 +0000
+++ base_crypt/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -24,7 +24,7 @@
     "author" : ['OpenERP SA', "FS3"],
     "maintainer" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Generic Modules/Base",
+    "category" : "Tools",
     "description": """This module replaces the cleartext password in the database with a password hash,
 preventing anyone from reading the original password.
 For your existing user base, the removal of the cleartext passwords occurs the first time

=== modified file 'base_iban/__openerp__.py'
--- base_iban/__openerp__.py	2011-01-14 00:11:01 +0000
+++ base_iban/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,8 +21,8 @@
 {
     'name': 'Create IBAN bank accounts',
     'version': '1.0',
-    'category': 'Generic Modules/Base',
-    'description': """
+    'category': 'Finance',
+    'description': """Check the validity of your IBAN bank account numbers
 This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity.
 
     """,

=== modified file 'base_module_doc_rst/__openerp__.py'
--- base_module_doc_rst/__openerp__.py	2011-01-14 00:11:01 +0000
+++ base_module_doc_rst/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Module Technical Guide in Restructured Text ',
     'version': '1.0',
-    'category': 'Generic Modules/Base',
+    'category': 'Tools',
     'description': """
     * This module generates the Technical Guides of selected modules in Restructured Text format (RST)
     * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST

=== modified file 'base_module_quality/__openerp__.py'
--- base_module_quality/__openerp__.py	2011-01-14 00:11:01 +0000
+++ base_module_quality/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Base module quality - To check the quality of other modules' ,
     'version': '1.0',
-    'category': 'OpenERP SA Specific Modules/Base module quality',
+    'category': 'Tools',
     'description': """
 The aim of this module is to check the quality of other modules.
 

=== modified file 'base_module_record/__openerp__.py'
--- base_module_record/__openerp__.py	2011-01-14 00:11:01 +0000
+++ base_module_record/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Module Record',
     'version': '1.0',
-    'category': 'Generic Modules/Base',
+    'category': 'Tools',
     'description': """
 This module allows you to create a new module without any development.
 It records all operations on objects during the recording session and

=== modified file 'base_report_creator/__openerp__.py'
--- base_report_creator/__openerp__.py	2011-02-23 12:01:08 +0000
+++ base_report_creator/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Report Creator',
     'version': '1.0',
-    'category': 'Generic Modules/Base',
+    'category': 'Tools',
     'description': """This module allows you to create any statistic
 report on several objects. It's a SQL query builder and browser
 for and users.

=== modified file 'base_report_designer/__openerp__.py'
--- base_report_designer/__openerp__.py	2011-01-14 00:11:01 +0000
+++ base_report_designer/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Report designer interface module',
     'version': '0.1',
-    'category': 'Generic Modules/Base',
+    'category': 'Tools',
     'description': """
 This module is used along with OpenERP OpenOffice plugin.
 You have to first install the plugin which is available at

=== modified file 'base_setup/__openerp__.py'
--- base_setup/__openerp__.py	2011-01-14 00:11:01 +0000
+++ base_setup/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Base Setup',
     'version': '1.0',
-    'category': 'Generic Modules/Base',
+    'category': 'Tools',
     'description': """
     This module implements a configuration system that helps user
     to configure the system at the installation of a new database.

=== modified file 'base_synchro/__openerp__.py'
--- base_synchro/__openerp__.py	2011-01-17 10:26:16 +0000
+++ base_synchro/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
         "name":"Base Synchro",
         "version":"0.1",
         "author":"OpenERP SA",
-        "category":"Generic Modules/Base",
+        "category":"Tools",
         "description": """Synchronization with all objects.""",
         "depends":["base"],
         "demo_xml":[],

=== modified file 'base_vat/__openerp__.py'
--- base_vat/__openerp__.py	2011-01-14 00:11:01 +0000
+++ base_vat/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,9 +21,9 @@
 {
     'name': 'Base VAT - To check VAT number validity',
     'version': '1.0',
-    'category': 'Generic Modules/Base',
-    'description': """
-    Enable the VAT Number for the partner. Check the validity of that VAT Number.
+    'category': 'Tools',
+    'description': """Check the validity of VAT Numbers.
+    Enable the VAT Number for the partner. 
 
     This module follows the methods stated at http://sima-pc.com/nif.php for
     checking the validity of VAT Number assigned to partners in European countries.
@@ -36,4 +36,4 @@
     'active': False,
     'certificate': '0084849360989',
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'board/__openerp__.py'
--- board/__openerp__.py	2011-01-14 00:11:01 +0000
+++ board/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,8 +22,8 @@
 {
     'name': 'Dashboard main module',
     'version': '1.0',
-    'category': 'Board/Base',
-    'description': """Base module for all dashboards.""",
+    'category': 'Tools',
+    'description': """Create your own dashboards""",
     'author': 'OpenERP SA',
     'depends': ['base'],
     'update_xml': ['security/board_security.xml','security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml','board_administration_view.xml'],

=== modified file 'caldav/__openerp__.py'
--- caldav/__openerp__.py	2011-01-17 10:26:16 +0000
+++ caldav/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -27,7 +27,7 @@
                     "base", 
                     "document_webdav",
                 ],
-     'description': """
+     'description': """Easily share your OpenERP calendars with your mobile device
     This module Contains basic functionality for caldav system like:  
   - Webdav server that provides remote access to calendar
   - Synchronisation of calendar using WebDAV
@@ -47,7 +47,7 @@
         CALENDAR_NAME: Name of calendar to access
 """, 
     "author" : "OpenERP SA", 
-    'category': 'Generic Modules/Others', 
+    'category': 'Tools', 
     'website': 'http://www.openerp.com', 
     "init_xml" : ["caldav_data.xml"], 
     "demo_xml" : [], 

=== modified file 'claim_from_delivery/__openerp__.py'
--- claim_from_delivery/__openerp__.py	2011-01-17 10:26:16 +0000
+++ claim_from_delivery/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,11 +21,11 @@
     "name" : "Claim from delivery",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Generic Modules/Inventory Control",
+    "category" : "Warehouse",
     "depends" : ["base", "crm_claim", "stock"],
     "init_xml" : [],
     "demo_xml" : [],
-    "description": '''Create Claim from delivery order:
+    "description": '''Integrate your Claims Management with your Delivery Orders
 ''',
     "update_xml" : ["claim_delivery_view.xml"],
     "active": False,

=== modified file 'crm/__openerp__.py'
--- crm/__openerp__.py	2011-01-17 08:00:48 +0000
+++ crm/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,8 +23,9 @@
 {
     'name': 'Customer & Supplier Relationship Management',
     'version': '1.0',
-    'category': 'Generic Modules/CRM & SRM',
-    'description': """The generic OpenERP Customer Relationship Management
+    'category': 'Sales',
+    'description': """Manage your Customer & Supplier Relations with OpenERP
+The generic OpenERP Customer Relationship Management
 system enables a group of people to intelligently and efficiently manage
 leads, opportunities, meeting, phonecall etc.
 It manages key tasks such as communication, identification, prioritization,

=== modified file 'crm_caldav/__openerp__.py'
--- crm_caldav/__openerp__.py	2011-01-17 10:26:16 +0000
+++ crm_caldav/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -24,8 +24,8 @@
 {
     'name': 'Extended Module to Add CalDav feature on Meeting',
     'version': '1.1',
-    'category': 'Generic Modules/CRM & SRM',
-    'description': """
+    'category': 'Sales',
+    'description': """Easily Share your Meetings with your mobile device or calendar client
     New Features in Meeting:
         *  Share meeting with other calendar clients like sunbird
 """,

=== modified file 'crm_claim/__openerp__.py'
--- crm_claim/__openerp__.py	2011-01-17 10:26:16 +0000
+++ crm_claim/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Customer & Supplier Relationship Management',
     'version': '1.0',
-    'category': 'Generic Modules/CRM & SRM',
+    'category': 'Sales',
     'description': """
 This modules allows you to track your customers/suppliers claims and flames.
 It is fully integrated with the email gateway so that you can create

=== modified file 'crm_fundraising/__openerp__.py'
--- crm_fundraising/__openerp__.py	2011-01-17 10:26:16 +0000
+++ crm_fundraising/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'CRM Fundraising', 
     'version': '1.0', 
-    'category': 'Generic Modules/CRM & SRM', 
+    'category': 'Sales', 
     'description': """Fundraising""", 
     'author': 'OpenERP SA', 
     'website': 'http://www.openerp.com', 

=== modified file 'crm_helpdesk/__openerp__.py'
--- crm_helpdesk/__openerp__.py	2011-01-17 10:26:16 +0000
+++ crm_helpdesk/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'CRM Helpdesk', 
     'version': '1.0', 
-    'category': 'Generic Modules/CRM & SRM', 
+    'category': 'Sales', 
     'description': """Helpdesk Management""", 
     'author': 'OpenERP SA', 
     'website': 'http://www.openerp.com', 

=== modified file 'crm_partner_assign/__openerp__.py'
--- crm_partner_assign/__openerp__.py	2011-02-08 10:11:14 +0000
+++ crm_partner_assign/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Partner Geo-Localisation',
     'version': '1.0',
-    'category': 'Generic Modules/Production',
+    'category': 'Sales',
     'description': """
 This is the module used by OpenERP SA to redirect customers to his partners,
 based on geolocalization.

=== modified file 'crm_profiling/__openerp__.py'
--- crm_profiling/__openerp__.py	2011-01-14 00:11:01 +0000
+++ crm_profiling/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Crm Profiling management - To Perform Segmentation within Partners',
     'version': '1.3',
-    'category': 'Generic Modules/CRM & SRM',
+    'category': 'Sales',
     'description': """
     This module allows users to perform segmentation within partners.
     It uses the profiles criteria from the earlier segmentation module and improve it. Thanks to the new concept of questionnaire. You can now regroup questions into a questionnaire and directly use it on a partner.

=== modified file 'decimal_precision/__openerp__.py'
--- decimal_precision/__openerp__.py	2011-01-17 10:26:16 +0000
+++ decimal_precision/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,7 +21,7 @@
 
 {
     "name": "Decimal Precision Configuration",
-    "description": """
+    "description": """Configure your Price Accuracy according to your needs
 This module allows to configure the price accuracy you need for different kind
 of usage: accounting, sales, purchases, ...
 
@@ -30,7 +30,7 @@
     "author": "OpenERP SA",
     "version": "0.1",
     "depends": ["base"],
-    "category" : "Generic Modules/Others",
+    "category" : "Tools",
     "init_xml": [],
     "update_xml": [
         'decimal_precision_view.xml',

=== modified file 'delivery/__openerp__.py'
--- delivery/__openerp__.py	2011-01-14 00:11:01 +0000
+++ delivery/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,8 +23,8 @@
 {
     'name': 'Carriers and deliveries',
     'version': '1.0',
-    'category': 'Generic Modules/Sales & Purchases',
-    'description': """Allows you to add delivery methods in sale orders and picking.
+    'category': 'Warehouse',
+    'description': """Allows you to add delivery methods in sales orders and picking.
      You can define your own carrier and delivery grids for prices.
      When creating invoices from picking, OpenERP is able to add and compute the shipping line.
 

=== modified file 'document/__openerp__.py'
--- document/__openerp__.py	2011-01-14 00:11:01 +0000
+++ document/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,8 +23,9 @@
 {
     'name': 'Integrated Document Management System',
     'version': '2.1',
-    'category': 'Generic Modules/Others',
-    'description': """This is a complete document management system:
+    'category': 'Tools',
+    'description': """Keep track of all your documents in OpenERP
+    This is a complete document management system:
     * User Authentication
     * Document Indexation :- .pptx and .docx files are not support in windows platform.
     * Dashboard for Document that includes:

=== modified file 'document_ftp/__openerp__.py'
--- document_ftp/__openerp__.py	2011-01-14 00:11:01 +0000
+++ document_ftp/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Integrated FTP Server with Document Management System',
     'version': '1.99',
-    'category': 'Generic Modules/Others',
+    'category': 'Tools',
     'description': """This is a support FTP Interface with document management system.
     With this module you would not only be able to access documents through OpenERP
     but you would also be able to connect with them through the file system using the

=== modified file 'document_ics/__openerp__.py'
--- document_ics/__openerp__.py	2011-01-14 00:11:01 +0000
+++ document_ics/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Support for iCal based on Document Management System',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Tools',
     'description': """Allows to synchronise calendars with others applications.""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',

=== modified file 'document_webdav/__openerp__.py'
--- document_webdav/__openerp__.py	2011-01-17 10:26:16 +0000
+++ document_webdav/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -32,7 +32,7 @@
         "name" : "WebDAV server for Document Management",
         "version" : "2.3",
         "author" : "OpenERP SA",
-        "category" : "Generic Modules/Others",
+        "category" : "Tools",
         "website": "http://www.openerp.com",
         "description": """ With this module, the WebDAV server for the documents is activated.
         You can then use any compatible browser to remotely see the attachments of OpenObject.

=== modified file 'email_template/__openerp__.py'
--- email_template/__openerp__.py	2011-01-17 10:26:16 +0000
+++ email_template/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -25,7 +25,7 @@
     "version" : "0.7 RC",
     "author" : "Openlabs",
     "website" : "http://openerp.com",
-    "category" : "Added functionality",
+    "category" : "Tools",
     "depends" : ['marketing', 'base_tools'],
     "description": """
     Email Template is extraction of Power Email basically just to send the emails.

=== modified file 'event/__openerp__.py'
--- event/__openerp__.py	2011-01-14 00:11:01 +0000
+++ event/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,10 +23,10 @@
 {
     'name': 'Event',
     'version': '0.1',
-    'category': 'Generic Modules/Association',
-    'description': """Organization and management of Event.
+    'category': 'Tools',
+    'description': """Organise and manageme your Events.
 
-    This module allow you
+    This module allows you
         * to manage your events and their registrations
         * to use emails to automatically confirm and send acknowledgements for any registration to an event
         * ...

=== modified file 'event_project/__openerp__.py'
--- event_project/__openerp__.py	2011-01-14 00:11:01 +0000
+++ event_project/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Event Project - Create Retro-Planning to manage your Events',
     'version': '0.1',
-    'category': 'Generic Modules/Association',
+    'category': 'Tools',
     'description': """Organization and management of events.
 
     This module allows you to create retro planning for managing your events.
@@ -37,4 +37,4 @@
     'certificate': '0069726863885',
 }
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'fetchmail/__openerp__.py'
--- fetchmail/__openerp__.py	2011-01-17 10:26:16 +0000
+++ fetchmail/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -26,6 +26,7 @@
     "version" : "1.0",
     "depends" : ["base", 'mail_gateway'],
     "author" : "OpenERP SA",
+    "category": 'Tools',
     "description": """Fetchmail: 
     * Fetch email from Pop / IMAP server
     * Support SSL

=== modified file 'google_map/__openerp__.py'
--- google_map/__openerp__.py	2011-01-14 00:11:01 +0000
+++ google_map/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Google Map',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Tools',
     'description': """The module adds google map field in partner address
 so that we can directly open google map from the
 url widget.""",

=== modified file 'hr/__openerp__.py'
--- hr/__openerp__.py	2011-01-14 00:11:01 +0000
+++ hr/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
     "name": "Human Resources",
     "version": "1.1",
     "author": "OpenERP SA",
-    "category": "Generic Modules/Human Resources",
+    "category": "Human Resources",
     "website": "http://www.openerp.com",
     "description": """
     Module for human resource management. You can manage:

=== modified file 'hr_attendance/__openerp__.py'
--- hr_attendance/__openerp__.py	2011-01-14 00:11:01 +0000
+++ hr_attendance/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Attendances Of Employees',
     'version': '1.1',
-    'category': 'Generic Modules/Human Resources',
+    'category': 'Human Resources',
     'description': """
     This module aims to manage employee's attendances.
     Keeps account of the attendances of the employees on the basis of the

=== modified file 'hr_contract/__openerp__.py'
--- hr_contract/__openerp__.py	2011-01-14 00:11:01 +0000
+++ hr_contract/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Human Resources Contracts',
     'version': '1.0',
-    'category': 'Generic Modules/Human Resources',
+    'category': 'Human Resources',
     'description': """
     Add all information on the employee form to manage contracts:
     * Marital status,

=== modified file 'hr_evaluation/__openerp__.py'
--- hr_evaluation/__openerp__.py	2011-01-17 10:26:16 +0000
+++ hr_evaluation/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
     "name" : "Human Resources Evaluation",
     "version": "0.1",
     "author": "OpenERP SA",
-    "category": "Generic Modules/Human Resources",
+    "category": "Human Resources",
     "website": "http://www.openerp.com",
     "depends": ["hr",'hr_recruitment','survey'],
     "description": """

=== modified file 'hr_expense/__openerp__.py'
--- hr_expense/__openerp__.py	2011-01-14 00:11:01 +0000
+++ hr_expense/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Human Resources Expenses Tracking',
     'version': '1.0',
-    'category': 'Generic Modules/Human Resources',
+    'category': 'Human Resources',
     'description': """
     This module aims to manage employee's expenses.
 

=== modified file 'hr_holidays/__openerp__.py'
--- hr_holidays/__openerp__.py	2011-02-23 12:01:08 +0000
+++ hr_holidays/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,8 +23,13 @@
 {
     "name": "Human Resources: Holidays management",
     "version": "1.5",
+<<<<<<< TREE
     "author": ['OpenERP SA', 'Axelor'],
     "category": "Generic Modules/Human Resources",
+=======
+    "author": "OpenERP SA & Axelor",
+    "category": "Human Resources",
+>>>>>>> MERGE-SOURCE
     "website": "http://www.openerp.com",
     "description": """Human Resources: Holidays tracking and workflow
 

=== modified file 'hr_payroll/__openerp__.py'
--- hr_payroll/__openerp__.py	2011-01-17 10:26:16 +0000
+++ hr_payroll/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Human Resource Payroll',
     'version': '1.0',
-    'category': 'Generic Modules/Human Resources',
+    'category': 'Human Resources',
     'description': """Generic Payroll system
     * Employee Details
     * Employee Contracts

=== modified file 'hr_payroll_account/__openerp__.py'
--- hr_payroll_account/__openerp__.py	2011-01-17 10:26:16 +0000
+++ hr_payroll_account/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Human Resource Payroll Accounting',
     'version': '1.0',
-    'category': 'Generic Modules/Human Resources',
+    'category': 'Human Resources',
     'description': """Generic Payroll system Integrated with Accountings
     * Expense Encoding
     * Payment Encoding

=== modified file 'hr_recruitment/__openerp__.py'
--- hr_recruitment/__openerp__.py	2011-03-11 08:44:52 +0000
+++ hr_recruitment/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'HR - Recruitement',
     'version': '1.0',
-    'category': 'Generic Modules/Human Resources',
+    'category': 'Human Resources',
     'description': """
 Manages job positions and the recruitement process. It's integrated with the
 survey module to allow you to define interview for different jobs.

=== modified file 'hr_timesheet/__openerp__.py'
--- hr_timesheet/__openerp__.py	2011-01-14 00:11:01 +0000
+++ hr_timesheet/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Human Resources (Timesheet encoding)',
     'version': '1.0',
-    'category': 'Generic Modules/Human Resources',
+    'category': 'Human Resources',
     'description': """
 This module implements a timesheet system. Each employee can encode and
 track their time spent on the different projects. A project is an

=== modified file 'hr_timesheet_invoice/__openerp__.py'
--- hr_timesheet_invoice/__openerp__.py	2011-01-14 00:11:01 +0000
+++ hr_timesheet_invoice/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,11 +23,11 @@
 {
     'name': 'Invoice on analytic lines',
     'version': '1.0',
-    'category': 'Generic Modules/Accounting',
-    'description': """
+    'category': 'Human Resources',
+    'description': """Generate your Invoices from Expenses, Timesheet Entries, ...
 Module to generate invoices based on costs (human resources, expenses, ...).
 You can define price lists in analytic account, make some theoretical revenue
-reports, eso.""",
+reports, etc.""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account', 'hr_timesheet'],

=== modified file 'hr_timesheet_sheet/__openerp__.py'
--- hr_timesheet_sheet/__openerp__.py	2011-01-14 00:11:01 +0000
+++ hr_timesheet_sheet/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Timesheets',
     'version': '1.0',
-    'category': 'Generic Modules/Human Resources',
+    'category': 'Human Resources',
     'description': """
 This module helps you to easily encode and validate timesheet and attendances
 within the same view. The upper part of the view is for attendances and

=== modified file 'html_view/__openerp__.py'
--- html_view/__openerp__.py	2011-01-14 00:11:01 +0000
+++ html_view/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -2,7 +2,7 @@
     "name" : "Html View",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Generic Modules/Inventory Control",
+    "category" : "Tools",
     "depends" : ['base'],
     "init_xml" : ['html_view.xml'],
     "demo_xml" : [],

=== modified file 'idea/__openerp__.py'
--- idea/__openerp__.py	2011-01-14 00:11:01 +0000
+++ idea/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -25,7 +25,7 @@
     'version': '0.1',
     'category': 'Tools',
     'description': """
-    This module allows your user to easily and efficiently participate in the innovation of the enterprise.
+    This module allows your users to easily and efficiently participate in the innovation of the enterprise.
     It allows everybody to express ideas about different subjects.
     Then, other users can comment on these ideas and vote for particular ideas.
     Each idea has a score based on the different votes.

=== modified file 'knowledge/__openerp__.py'
--- knowledge/__openerp__.py	2011-01-17 10:26:16 +0000
+++ knowledge/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -25,6 +25,7 @@
     "version" : "1.0",
     "depends" : ["base"],
     "author" : "OpenERP SA",
+    "category": 'Tools',
     "description": """Installer for knowledge-based tools
     """,
     'website': 'http://www.openerp.com',

=== modified file 'l10n_be/__openerp__.py'
--- l10n_be/__openerp__.py	2011-01-14 00:11:01 +0000
+++ l10n_be/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 {   'name': 'Belgium - Plan Comptable Minimum Normalise',
     'version': '1.1',
-    'category': 'Localisation/Account Charts',
+    'category': 'Finance',
     'description': """
     This is the base module to manage the accounting chart for Belgium in OpenERP.
 

=== modified file 'l10n_br/__openerp__.py'
--- l10n_br/__openerp__.py	2011-01-17 10:26:16 +0000
+++ l10n_br/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,7 +21,7 @@
 {
     'name': 'Brazilian Localization',
     'description': 'Brazilian Localization',
-    'category': 'Localisation/Account Charts',
+    'category': 'Finance',
     'author': 'OpenERP Brasil',
     'website': 'http://openerpbrasil.org',
     'version': '0.6',

=== modified file 'l10n_ca/__openerp__.py'
--- l10n_ca/__openerp__.py	2011-01-14 00:11:01 +0000
+++ l10n_ca/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
     "version" : "1.0",
     "author" : "Savoir-faire Linux",
     "website" : "http://www.savoirfairelinux.com",
-    "category" : "Localisation/Account Charts",
+    "category" : "Finance",
     "description": "This is the module to manage the english and french canadian accounting chart in OpenERP.",
     "depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
     "init_xml" : [],

=== modified file 'l10n_ch/__openerp__.py'
--- l10n_ch/__openerp__.py	2011-02-28 10:49:36 +0000
+++ l10n_ch/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -63,7 +63,7 @@
 """,
     "version" : "6.0",
     "author" : "Camptocamp SA",
-    "category" : "Localization/Account Charts",
+    "category" : "Finance",
     "website": "http://www.camptocamp.com",
 
     "depends" : [

=== modified file 'l10n_cn/__openerp__.py'
--- l10n_cn/__openerp__.py	2011-01-14 00:11:01 +0000
+++ l10n_cn/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -20,7 +20,7 @@
 {
     "name" : "中国会计科目表",
     "version" : "1.0",
-    "category": "Localisation/Account Charts",
+    "category": "Finance",
     "author" : "openerp-china.org",
     "maintainer":"openerp-china.org",
     "website":"http://openerp-china.org",

=== modified file 'l10n_cr/__openerp__.py'
--- l10n_cr/__openerp__.py	2011-01-17 10:26:16 +0000
+++ l10n_cr/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -38,7 +38,7 @@
     'url': 'http://launchpad.net/openerp-costa-rica',
     'author': 'ClearCorp S.A.',
     'website': 'http://clearcorp.co.cr',
-    'category': 'Localisation/Account Charts',
+    'category': 'Finance',
     'description': """Chart of accounts for Costa Rica
 Includes:
 * account.type

=== modified file 'l10n_de/__openerp__.py'
--- l10n_de/__openerp__.py	2011-01-17 10:26:16 +0000
+++ l10n_de/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -125,7 +125,7 @@
     "version" : "1.0",
     "author" : "openbig.org",
     "website" : "http://www.openbig.org",
-    "category" : "Localisation/Account Charts",
+    "category" : "Finance",
     "description": """Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03.""",
     "depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
     "init_xml" : [ ],

=== modified file 'l10n_ec/__openerp__.py'
--- l10n_ec/__openerp__.py	2011-01-17 10:26:16 +0000
+++ l10n_ec/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -20,7 +20,7 @@
 {
     'name': 'Ecuador - Accounting Chart',
     'version': '1.1',
-    'category': 'Localisation/Account Charts',
+    'category': 'Finance',
     'description': """
     This is the base module to manage the accounting chart for Ecuador in OpenERP.
     """,

=== modified file 'l10n_es/__openerp__.py'
--- l10n_es/__openerp__.py	2011-01-17 10:26:16 +0000
+++ l10n_es/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -26,7 +26,7 @@
     "version" : "3.0",
     "author" : "Spanish Localization Team",
     'website' : 'https://launchpad.net/openerp-spain',
-    "category" : "Localisation/Account Charts",
+    "category" : "Finance",
     "description": """Spanish Charts of Accounts (PGCE 2008)
 
 * Defines the following chart of account templates:

=== modified file 'l10n_fr/__openerp__.py'
--- l10n_fr/__openerp__.py	2011-01-14 00:11:01 +0000
+++ l10n_fr/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -30,7 +30,7 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "website": "http://www.openerp.com",
-    "category" : "Localisation/Account Charts",
+    "category" : "Finance",
     "description": """This is the module to manage the accounting chart for France in OpenERP.
 
 Credits: Sistheo Zeekom CrysaLEAD

=== modified file 'l10n_gr/__openerp__.py'
--- l10n_gr/__openerp__.py	2011-01-13 09:46:36 +0000
+++ l10n_gr/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -24,7 +24,7 @@
     "version" : "0.2",
     "author" : "P. Christeas, OpenERP SA.",
     "website": "http://openerp.hellug.gr/",
-    "category" : "Localisation/Account Charts",
+    "category" : "Finance",
     "description": "This is the base module to manage the accounting chart for Greece.",
     "depends" : ["base", "account", "base_iban", "base_vat", "account_chart"],
     "init_xml" : [],

=== modified file 'l10n_gt/__openerp__.py'
--- l10n_gt/__openerp__.py	2011-01-14 00:11:01 +0000
+++ l10n_gt/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -35,7 +35,7 @@
 {
     'name': 'Guatemala - Plan contable general',
     'version': '3.0',
-    'category': 'Localisation/Account Charts',
+    'category': 'Finance',
     'description': """Agrega una nomenclatura contable para Guatemala. También icluye impuestos y la moneda del Quetzal. -- Adds accounting chart for Guatemala.  It also includes taxes and the Quetzal currency""",
     'author': 'José Rodrigo Fernández Menegazzo',
     'website': 'http://solucionesprisma.com/',

=== modified file 'l10n_in/__openerp__.py'
--- l10n_in/__openerp__.py	2011-02-23 12:01:08 +0000
+++ l10n_in/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -25,8 +25,13 @@
     "description": """
     Indian Accounting : chart of Account
     """,
+<<<<<<< TREE
     "author": ['OpenERP SA', 'Axelor'],
     "category": "Localisation/Account Charts",
+=======
+    "author": 'OpenERP SA & Axelor',
+    "category": "Finance",
+>>>>>>> MERGE-SOURCE
     "depends": [
         "account",
         "account_chart"

=== modified file 'l10n_it/__openerp__.py'
--- l10n_it/__openerp__.py	2011-01-17 10:26:16 +0000
+++ l10n_it/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -33,7 +33,7 @@
     Piano dei conti italiano di un'impresa generica
     """,
     "license": "AGPL-3",
-    "category" : "Localisation/Account Charts",
+    "category" : "Finance",
     'website': 'http://www.openerp-italia.org/',
     'init_xml': [
         ],

=== modified file 'l10n_lu/__openerp__.py'
--- l10n_lu/__openerp__.py	2011-01-14 00:11:01 +0000
+++ l10n_lu/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Luxembourg - Plan Comptable Minimum Normalise',
     'version': '1.0',
-    'category': 'Localisation/Account Charts',
+    'category': 'Finance',
     'description': """
 This module installs:
 

=== modified file 'l10n_ma/__openerp__.py'
--- l10n_ma/__openerp__.py	2011-01-17 10:26:16 +0000
+++ l10n_ma/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
     "name" : "Maroc - Plan Comptable Général",
     "version" : "1.0",
     "author" : "kazacube",
-    "category" : "Localisation/Account Charts",
+    "category" : "Finance",
     "description": "Ce  Module charge le modèle du plan de comptes standard Marocain et permet de générer les états comptables aux normes marocaines (Bilan, CPC (comptes de produits et charges), balance générale à 6 colonnes, Grand livre cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet d'expertise comptable Seddik au cours du troisième trimestre 2010",
     "website": "http://www.kazacube.com",
     "depends" : ["base", "account"],

=== modified file 'l10n_mx/__openerp__.py'
--- l10n_mx/__openerp__.py	2011-01-17 10:26:16 +0000
+++ l10n_mx/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
     "name" : "Mexico - Chart of Account",
     "version" : "1.0",
     "author" : "RelTek Mexico",
-    "category" : "Localisation/Account Charts",
+    "category" : "Finance",
     "description": "This is the module to manage the accounting chart for Mexico in Open ERP.",
     "depends" : ["account", "base_vat", "account_chart"],
     "demo_xml" : [],

=== modified file 'l10n_nl/__openerp__.py'
--- l10n_nl/__openerp__.py	2011-01-14 00:11:01 +0000
+++ l10n_nl/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -88,7 +88,7 @@
 {
     "name" : "Netherlands - Grootboek en BTW rekeningen",
     "version" : "1.5",
-    "category": "Localisation/Account Charts",
+    "category": "Finance",
     "description": """
 Read changelog in file __terp__.py for version information.   
 Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor Nederlandse bedrijven te installeren in OpenERP versie 5.

=== modified file 'l10n_pl/__openerp__.py'
--- l10n_pl/__openerp__.py	2011-01-17 10:26:16 +0000
+++ l10n_pl/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "author" : "Grzegorz Grzelak (Cirrus)",
     "website": "http://www.cirrus.pl",
-    "category" : "Localisation/Account Charts",
+    "category" : "Finance",
     "description": """
      This is the module to manage the accounting chart and taxes for Poland in Open ERP.
      

=== modified file 'l10n_ro/__openerp__.py'
--- l10n_ro/__openerp__.py	2011-01-17 10:26:16 +0000
+++ l10n_ro/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -24,7 +24,7 @@
     "version" : "1.1",
     "author" : "filsys",
     "website": "http://www.filsystem.ro",
-    "category" : "Localisation/Account Charts",
+    "category" : "Finance",
     "depends" : ["account_chart", 'base_vat'],
     "description": "This is the module to manage the accounting chart, VAT structure and Registration Number for Romania in Open ERP.",
     "demo_xml" : [],

=== modified file 'l10n_th/__openerp__.py'
--- l10n_th/__openerp__.py	2011-01-17 10:26:16 +0000
+++ l10n_th/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Thailand - Thai Chart of Accounts',
     'version': '1.0',
-    'category': 'Localisation/Account Charts',
+    'category': 'Finance',
     'description': """
 Chart of accounts for Thailand.
     """,

=== modified file 'l10n_uk/__openerp__.py'
--- l10n_uk/__openerp__.py	2011-01-14 00:11:01 +0000
+++ l10n_uk/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -60,7 +60,7 @@
 {
     'name': 'United Kingdom - minimal',
     'version': '1.1',
-    'category': 'Localisation/Account Charts',
+    'category': 'Finance',
     'description': """This is the base module to manage the accounting chart for United Kingdom in OpenERP.""",
     'author': 'Seath Solutions Ltd',
     'website': 'http://www.seathsolutions.com',

=== modified file 'l10n_ve/__openerp__.py'
--- l10n_ve/__openerp__.py	2011-02-23 12:01:08 +0000
+++ l10n_ve/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -25,8 +25,13 @@
 {
     "name" : "Venezuela -Chart of Account",
     "version" : "1.0",
+<<<<<<< TREE
     "author" : ['OpenERP SA', "Netquatro"],
     "category" : "Localisation/Account Charts",
+=======
+    "author" : "Tiny & Netquatro",
+    "category" : "Finance",
+>>>>>>> MERGE-SOURCE
     "description": 
 '''
 This is the module to manage the accounting chart for Venezuela in Open ERP.

=== modified file 'mail_gateway/__openerp__.py'
--- mail_gateway/__openerp__.py	2011-01-14 00:11:01 +0000
+++ mail_gateway/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Email Gateway System',
     'version': '1.0',
-    'category': 'Generic Modules/Mail Service',
+    'category': 'Tools',
     'description': """The generic email gateway system allows to send and receive emails
     * History for Emails
     * Easy Integration with any Module""",

=== modified file 'marketing/__openerp__.py'
--- marketing/__openerp__.py	2011-01-17 10:26:16 +0000
+++ marketing/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -25,7 +25,7 @@
     "version" : "1.1",
     "depends" : ["base"],
     "author" : "OpenERP SA",
-    "category": 'Generic Modules/Marketing',
+    "category": 'Sales',
     "description": "Menu for Marketing",
     'website': 'http://www.openerp.com',
     'init_xml': [],

=== modified file 'marketing_campaign/__openerp__.py'
--- marketing_campaign/__openerp__.py	2011-01-17 10:26:16 +0000
+++ marketing_campaign/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -29,7 +29,7 @@
                  "decimal_precision"
                 ],
     "author" : "OpenERP SA",
-    "category": 'Generic Modules/Marketing',
+    "category": 'Sales',
     "description": """
 This module provides leads automation through marketing campaigns (campaigns can in fact be defined on any resource, not just CRM Leads).
          The campaigns are dynamic and multi-channels. The process is as follows:

=== modified file 'marketing_campaign_crm_demo/__openerp__.py'
--- marketing_campaign_crm_demo/__openerp__.py	2011-01-17 10:26:16 +0000
+++ marketing_campaign_crm_demo/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -27,7 +27,7 @@
                  "crm",
                 ],
     "author" : "OpenERP SA",
-    "category": 'Generic Modules/Marketing',
+    "category": 'Sales',
     "description": """Demo data for the module marketing_campaign.""",
     'website': 'http://www.openerp.com',
     'init_xml': [],

=== modified file 'membership/__openerp__.py'
--- membership/__openerp__.py	2011-01-14 00:11:01 +0000
+++ membership/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Membership',
     'version': '0.1',
-    'category': 'Generic Modules/Association',
+    'category': 'Tools',
     'description': """
 This module allows you to manage all operations for managing memberships.
 It supports different kind of members:

=== modified file 'mrp/__openerp__.py'
--- mrp/__openerp__.py	2011-02-18 09:53:57 +0000
+++ mrp/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -25,7 +25,7 @@
     "version" : "1.1",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Generic Modules/Production",
+    "category" : "Manufacturing",
     "depends" : ["procurement", "stock", "resource", "purchase", "product","process"],
     "description": """
     This is the base module to manage the manufacturing process in OpenERP.

=== modified file 'mrp_jit/__openerp__.py'
--- mrp_jit/__openerp__.py	2011-01-14 00:11:01 +0000
+++ mrp_jit/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'MRP JIT',
     'version': '1.0',
-    'category': 'Generic Modules/Production',
+    'category': 'Manufacturing',
     'description': """
     This module allows Just In Time computation of procurement orders.
 

=== modified file 'mrp_operations/__openerp__.py'
--- mrp_operations/__openerp__.py	2011-02-18 08:58:56 +0000
+++ mrp_operations/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Work Center Production start end workflow',
     'version': '1.0',
-    'category': 'Generic Modules/Production',
+    'category': 'Manufacturing',
     'description': """
      This module adds state, date_start,date_stop in production order operation lines
      (in the "Work Centers" tab)

=== modified file 'mrp_repair/__openerp__.py'
--- mrp_repair/__openerp__.py	2011-01-14 00:11:01 +0000
+++ mrp_repair/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Products Repairs Module - Manage All products Repairs',
     'version': '1.0',
-    'category': 'Custom',
+    'category': 'Tools',
     'description': """
            The aim is to have a complete module to manage all products repairs. The following topics should be covered by this module:
            * Add/remove products in the reparation

=== modified file 'mrp_subproduct/__openerp__.py'
--- mrp_subproduct/__openerp__.py	2011-01-14 00:11:01 +0000
+++ mrp_subproduct/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'MRP Sub Product - To produce several products from one production order',
     'version': '1.0',
-    'category': 'Generic Modules/Production',
+    'category': 'Manufacturing',
     'description': """
 This module allows you to produce several products from one production order.
 You can configure sub-products in the bill of material.

=== modified file 'multi_company/__openerp__.py'
--- multi_company/__openerp__.py	2011-01-17 10:26:16 +0000
+++ multi_company/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Multi Company',
     'version': '1.0',
-    'category': 'Custom',
+    'category': 'Tools',
     'description': """
     Multicompany module is for managing a multicompany environment.
     This module is the base module for other multicompany modules.

=== modified file 'outlook/__openerp__.py'
--- outlook/__openerp__.py	2011-01-17 10:26:16 +0000
+++ outlook/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -26,8 +26,8 @@
     'author' : 'OpenERP SA',
     'website' : 'http://www.openerp.com/',
     'depends' : ['base', 'mail_gateway'],
-    'category' : 'Generic Modules/Outlook interface',
-    'description': '''
+    'category' : 'Tools',
+    'description': '''Make a link between Outlook and OpenERP
       This module provide the Outlook plug-in. 
 
       Outlook plug-in allows you to select an object that you’d like to add

=== modified file 'pad/__openerp__.py'
--- pad/__openerp__.py	2011-02-15 13:27:07 +0000
+++ pad/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -2,7 +2,7 @@
 {
     'name': 'Enhanced support for (Ether)Pad attachments',
     'version': '1.0.3',
-    'category': 'Generic Modules/Others',
+    'category': 'Tools',
     'description': """
 Adds enhanced support for (Ether)Pad attachments in the web client, lets the
 company customize which Pad installation should be used to link to new pads

=== modified file 'point_of_sale/__openerp__.py'
--- point_of_sale/__openerp__.py	2011-01-17 10:26:16 +0000
+++ point_of_sale/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Point Of Sale',
     'version': '1.0',
-    'category': 'Generic Modules/Sales & Purchases',
+    'category': 'Sales',
     'description': """
 Main features :
  - Fast encoding of the sale.

=== modified file 'process/__openerp__.py'
--- process/__openerp__.py	2011-01-14 00:11:01 +0000
+++ process/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Enterprise Process',
     'version': '1.0',
-    'category': 'Generic Modules/Base',
+    'category': 'Tools',
     'description': """
      This module shows the basic processes involved
      in the selected modules and in the sequence they

=== modified file 'procurement/__openerp__.py'
--- procurement/__openerp__.py	2011-02-03 13:15:11 +0000
+++ procurement/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
-    "category" : "Generic Modules/Production",
+    "category" : "Warehouse",
     "depends" : ["base","process", "product", "stock"],
     "description": """
     This is the module for computing Procurements.

=== modified file 'product/__openerp__.py'
--- product/__openerp__.py	2011-01-17 08:00:48 +0000
+++ product/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -24,7 +24,7 @@
     "name" : "Products & Pricelists",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Generic Modules/Inventory Control",
+    "category" : "Warehouse",
     "depends" : ["base", "process", "decimal_precision"],
     "init_xml" : [],
     "demo_xml" : ["product_demo.xml"],

=== modified file 'product_expiry/__openerp__.py'
--- product_expiry/__openerp__.py	2011-01-17 10:26:16 +0000
+++ product_expiry/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,7 +21,7 @@
     "name" : "Products date of expiry",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Enterprise Specific Modules/Food Industries",
+    "category" : "Warehouse",
     "depends" : ["stock"],
     "init_xml" : [],
     "demo_xml" : ["product_expiry_demo.xml"],

=== modified file 'product_manufacturer/__openerp__.py'
--- product_manufacturer/__openerp__.py	2011-01-17 10:26:16 +0000
+++ product_manufacturer/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,7 +21,7 @@
     "name" : "Products Attributes & Manufacturers",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Enterprise Specific Modules/Manufacturer Industries",
+    "category" : "Tools",
     "depends" : ["stock"],
     "init_xml" : [],
     "demo_xml" : [],

=== modified file 'product_margin/__openerp__.py'
--- product_margin/__openerp__.py	2011-01-14 00:11:01 +0000
+++ product_margin/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Margins in Product',
     'version': '1.0',
-    'category': 'Custom',
+    'category': 'Sales',
     'description': """
 Adds a reporting menu in products that computes sales, purchases, margins
 and other interesting indicators based on invoices. The wizard to launch

=== modified file 'product_visible_discount/__openerp__.py'
--- product_visible_discount/__openerp__.py	2011-01-17 10:26:16 +0000
+++ product_visible_discount/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,9 +21,9 @@
     "name": "Visible Discount",
     "version": "1.0",
     "author": "OpenERP SA",
-    "category": "Generic Modules/Sales & Purchases",
+    "category": "Sales",
     "description": """
-    This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.
+    This module lets you calculate discounts on Sales Order lines and Invoice lines according to the partner's pricelist.
     To this end, a new check box named "Visible Discount" is added to the pricelist form.
     Example:
         For the product PC1 and the partner "Asustek": if listprice=450, and the price calculated using Asustek's pricelist is 225

=== modified file 'project/__openerp__.py'
--- project/__openerp__.py	2011-01-14 00:11:01 +0000
+++ project/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -25,7 +25,7 @@
     "version": "1.1",
     "author": "OpenERP SA",
     "website": "http://www.openerp.com",
-    "category": "Generic Modules/Projects & Services",
+    "category": "Project Management",
     "depends": ["product", "analytic", "board"],
     "description": """Project management module tracks multi-level projects, tasks,
 work done on tasks, eso. It is able to render planning, order tasks, eso.

=== modified file 'project_caldav/__openerp__.py'
--- project_caldav/__openerp__.py	2011-01-17 10:26:16 +0000
+++ project_caldav/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
     "name": "CalDAV for task management",
     "version": "1.1",
     "author": "OpenERP SA",
-    "category": "Generic Modules/Others",
+    "category": "Project Management",
     "description": """ Synchronize between Project task and Caldav Vtodo.""",
     "depends": ["project", "caldav", "base_calendar"],
     "init_xml": ["project_caldav_data.xml", 'project_caldav_setup.xml', ],

=== modified file 'project_gtd/__openerp__.py'
--- project_gtd/__openerp__.py	2011-01-14 00:11:01 +0000
+++ project_gtd/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Getting Things Done - Time Management Module',
     'version': '1.0',
-    'category': 'Generic Modules/Projects & Services',
+    'category': 'Project Management',
     'description': """
 This module implements all concepts defined by the Getting Things Done
 methodology. This world-wide used methodology is used for personal

=== modified file 'project_issue/__openerp__.py'
--- project_issue/__openerp__.py	2011-01-17 10:26:16 +0000
+++ project_issue/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Issue Management in Project Management',
     'version': '1.0',
-    'category': 'Generic Modules/CRM & SRM',
+    'category': 'Project Management',
     'description': """
         This module provide Issues/Bugs Management in Project
     """,

=== modified file 'project_issue_sheet/__openerp__.py'
--- project_issue_sheet/__openerp__.py	2011-01-17 10:26:16 +0000
+++ project_issue_sheet/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Add the Timesheet support for Issue Management in Project Management',
     'version': '1.0',
-    'category': 'Generic Modules/CRM & SRM',
+    'category': 'Project Management',
     'description': """
                     This module adds the Timesheet support for the Issues/Bugs Management in Project
                 """,

=== modified file 'project_long_term/__openerp__.py'
--- project_long_term/__openerp__.py	2011-01-14 09:34:28 +0000
+++ project_long_term/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -24,7 +24,7 @@
     "version": "1.1",
     "author": "OpenERP SA",
     "website": "http://www.openerp.com",
-    "category": "Generic Modules/Projects & Services",
+    "category": "Project Management",
     "depends": ["resource", "project"],
     "description": """
 Long Term Project management module that tracks planning, scheduling, resources allocation.

=== modified file 'project_mailgate/__openerp__.py'
--- project_mailgate/__openerp__.py	2011-01-14 00:11:01 +0000
+++ project_mailgate/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -25,7 +25,7 @@
     "version": "1.1",
     "author": "OpenERP SA",
     "website": "http://www.openerp.com",
-    "category": "Generic Modules/Projects & Services",
+    "category": "Project Management",
     "depends": ["project", "mail_gateway"],
     "description": """This module is an interface that synchronises mails with OpenERP Project Task.
 

=== modified file 'project_messages/__openerp__.py'
--- project_messages/__openerp__.py	2011-01-17 10:26:16 +0000
+++ project_messages/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -25,6 +25,7 @@
     "version": "1.0",
     "depends": ["project"],
     "author": "OpenERP SA",
+    "category": 'Project Management',
     "description": """
     This module provides the functionality to send messages within a project.
     A user can send messages individually to other user. He can even broadcast

=== modified file 'project_mrp/__openerp__.py'
--- project_mrp/__openerp__.py	2011-01-14 00:11:01 +0000
+++ project_mrp/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Procurement and Project Management integration',
     'version': '1.0',
-    'category': 'Generic Modules/Projects & Services',
+    'category': 'Project Management',
     'description': """
 This module creates a link between procurement orders
 containing "service" lines and project management tasks.

=== modified file 'project_planning/__openerp__.py'
--- project_planning/__openerp__.py	2011-01-14 00:11:01 +0000
+++ project_planning/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,8 +23,8 @@
 {
     'name': 'Planning Management Module',
     'version': '1.0',
-    'category': 'Generic Modules/Human Resources',
-    'description': """
+    'category': 'Project Management',
+    'description': """Keep track of your planning
 This module helps you to manage your plannings.
 
 This module is based on the analytic accounting and is totally integrated with

=== modified file 'project_retro_planning/__openerp__.py'
--- project_retro_planning/__openerp__.py	2011-01-14 00:11:01 +0000
+++ project_retro_planning/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Project Retro planning',
     'version': '0.1',
-    'category': 'Generic Modules/Projects & Services',
+    'category': 'Project Management',
     'description': """
         - If end date of project is changed
           then the deadline date and start date for all the tasks will change accordingly  """,

=== modified file 'project_scrum/__openerp__.py'
--- project_scrum/__openerp__.py	2011-01-17 10:26:16 +0000
+++ project_scrum/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Scrum, Agile Development Method',
     'version': '1.0',
-    'category': 'Enterprise Specific Modules/Information Technology',
+    'category': 'Project Management',
     'description': """
     This module implements all concepts defined by the scrum project
     management methodology for IT companies:

=== modified file 'project_timesheet/__openerp__.py'
--- project_timesheet/__openerp__.py	2011-01-14 00:11:01 +0000
+++ project_timesheet/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Project Timesheet',
     'version': '1.0',
-    'category': 'Generic Modules/Human Resources',
+    'category': 'Project Management',
     'description': """
         This module lets you transfer the entries under tasks defined for Project Management to
         the Timesheet line entries for particular date and particular user  with the effect of creating, editing and deleting either ways.

=== modified file 'purchase/__openerp__.py'
--- purchase/__openerp__.py	2011-01-17 08:00:48 +0000
+++ purchase/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Purchase Management',
     'version': '1.1',
-    'category': 'Generic Modules/Sales & Purchases',
+    'category': 'Purchases',
     'description': """
     Purchase module is for generating a purchase order for purchase of goods from a supplier.
     A supplier invoice is created for the particular order placed

=== modified file 'purchase_analytic_plans/__openerp__.py'
--- purchase_analytic_plans/__openerp__.py	2011-01-14 00:11:01 +0000
+++ purchase_analytic_plans/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Purchase Analytic Distribution Management',
     'version': '1.0',
-    'category': 'Generic Modules/Sales & Purchases',
+    'category': 'Purchases',
     'description': """
     The base module to manage analytic distribution and purchase orders.
     """,

=== modified file 'purchase_double_validation/__openerp__.py'
--- purchase_double_validation/__openerp__.py	2011-01-17 10:26:16 +0000
+++ purchase_double_validation/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     "name" : "purchase_double_validation",
     "version" : "1.1",
-    "category": 'Generic Modules/Sales & Purchases',
+    "category": 'Purchases',
     "depends" : ["base","purchase"],
     "author" : 'OpenERP SA',
     "description": """

=== modified file 'purchase_requisition/__openerp__.py'
--- purchase_requisition/__openerp__.py	2011-01-17 10:26:16 +0000
+++ purchase_requisition/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,7 +21,7 @@
     "name" : "Purchase - Purchase Requisition",
     "version" : "0.1",
     "author" : "OpenERP SA",
-    "category" : "Generic Modules/Sales & Purchases",
+    "category" : "Purchases",
     "website" : "http://www.openerp.com",
     "description": """
     This module allows you to manage your Purchase Requisition.

=== modified file 'report_intrastat/__openerp__.py'
--- report_intrastat/__openerp__.py	2011-01-14 00:11:01 +0000
+++ report_intrastat/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Intrastat Reporting - Reporting',
     'version': '1.0',
-    'category': 'Generic Modules/Inventory Control',
+    'category': 'Warehouse',
     'description': """
     A module that adds intrastat reports.
     This module gives the details of the goods traded between the countries of European Union """,

=== modified file 'report_webkit/__openerp__.py'
--- report_webkit/__openerp__.py	2011-01-17 10:26:16 +0000
+++ report_webkit/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -69,7 +69,7 @@
     "version" : "0.9",
     "depends" : ["base"],
     "author" : "Camptocamp SA - NBessi",
-    "category": "Reports/Webkit",
+    "category": "Tools",
     "url": "http://http://www.camptocamp.com/",
     "data": [ "security/ir.model.access.csv", 
               "data.xml",

=== modified file 'report_webkit_sample/__openerp__.py'
--- report_webkit_sample/__openerp__.py	2011-01-17 10:26:16 +0000
+++ report_webkit_sample/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -41,7 +41,7 @@
                     """,
     "version" : "0.9",
     "depends" : ["base", "account", "report_webkit"],
-    "category": "Reports/Webkit",
+    "category": "Tools",
     "author" : "Camptocamp SA - NBessi",
     "url": "http://www.camptocamp.com/",
     "data": ["report_webkit_html_view.xml",

=== modified file 'resource/__openerp__.py'
--- resource/__openerp__.py	2011-01-14 00:11:01 +0000
+++ resource/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,11 +23,11 @@
     "name" : "Resource",
     "version" : "1.1",
     "author" : "OpenERP SA",
-    "category" : "Generic Modules/Projects & Services",
+    "category" : "Project Management",
     "website" : "http://www.openerp.com",
-    "description": """
+    "description": """Schedule your Resources and keep a Resource Calendar
     Module for resource management
-     A resource represent something that can be scheduled
+     A resource represents something that can be scheduled
      (a developer on a task or a work center on manufacturing orders).
      This module manages a resource calendar associated to every resource.
      It also manages the leaves of every resource.

=== modified file 'sale/__openerp__.py'
--- sale/__openerp__.py	2011-01-14 00:11:01 +0000
+++ sale/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,8 +22,8 @@
 {
     'name': 'Sales Management',
     'version': '1.0',
-    'category': 'Generic Modules/Sales & Purchases',
-    'description': """
+    'category': 'Sales',
+    'description': """Manage your Quotations and Sales Orders
     The base module to manage quotations and sales orders.
 
     * Workflow with validation steps:

=== modified file 'sale_analytic_plans/__openerp__.py'
--- sale_analytic_plans/__openerp__.py	2011-01-14 00:11:01 +0000
+++ sale_analytic_plans/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Sales Analytic Distribution Management',
     'version': '1.0',
-    'category': 'Generic Modules/Sales & Purchases',
+    'category': 'Sales',
     'description': """
     The base module to manage analytic distribution and sales orders.
     """,
@@ -36,4 +36,4 @@
     'active': False,
     'certificate': '0066055860861',
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'sale_crm/__openerp__.py'
--- sale_crm/__openerp__.py	2011-01-14 00:11:01 +0000
+++ sale_crm/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Creates Sales order from Opportunity',
     'version': '1.0',
-    'category': 'Generic Modules/Sales & Purchases',
+    'category': 'Sales',
     'description': """
 This module adds a shortcut on one or several opportunity cases in the CRM.
 This shortcut allows you to generate a sales order based on the selected case.

=== modified file 'sale_journal/__openerp__.py'
--- sale_journal/__openerp__.py	2011-01-14 00:11:01 +0000
+++ sale_journal/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Managing sales and deliveries by journal',
     'version': '1.0',
-    'category': 'Generic Modules/Sales & Purchases',
+    'category': 'Sales',
     'description': """
     The sales journal modules allows you to categorise your
     sales and deliveries (picking lists) between different journals.

=== modified file 'sale_layout/__openerp__.py'
--- sale_layout/__openerp__.py	2011-01-17 10:26:16 +0000
+++ sale_layout/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -33,7 +33,7 @@
 
     """,
     "website" : "http://www.openerp.com",
-    "category" : "Generic Modules/Sales & Purchases",
+    "category" : "Sales",
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [

=== modified file 'sale_margin/__openerp__.py'
--- sale_margin/__openerp__.py	2011-01-17 10:26:16 +0000
+++ sale_margin/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,7 +21,7 @@
 {
     "name":"Margins in Sales Order",
     "version":"1.0",
-    "category" : "Generic Modules/Sales & Purchases",
+    "category" : "Sales",
     "description": """ 
     This module adds the 'Margin' on sales order,
     which gives the profitability by calculating the difference between the Unit Price and Cost Price

=== modified file 'sale_mrp/__openerp__.py'
--- sale_mrp/__openerp__.py	2011-01-14 00:11:01 +0000
+++ sale_mrp/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Sales and MRP Management',
     'version': '1.0',
-    'category': 'Generic Modules/Sales & MRP',
+    'category': 'Sales',
     'description': """
     This module provides facility to the user to install mrp and sales modules
     at a time. It is basically used when we want to keep track of production

=== modified file 'sale_order_dates/__openerp__.py'
--- sale_order_dates/__openerp__.py	2011-01-17 10:26:16 +0000
+++ sale_order_dates/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Sales Order Dates',
     'version': '1.0',
-    'category': 'Generic Modules/CRM & SRM',
+    'category': 'Sales',
     'description': """
 Add commitment, requested and effective dates on the sales order.
 """,

=== modified file 'share/__openerp__.py'
--- share/__openerp__.py	2011-02-14 11:45:07 +0000
+++ share/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -25,7 +25,7 @@
     "version" : "1.3",
     "depends" : ["base"],
     "author" : "OpenERP SA",
-    "category": 'Generic Modules',
+    "category": 'Tools',
     "description": """
 
     This module adds generic sharing tools to your current OpenERP database,

=== modified file 'stock/__openerp__.py'
--- stock/__openerp__.py	2011-01-14 00:11:01 +0000
+++ stock/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -41,7 +41,7 @@
     """,
     "website" : "http://www.openerp.com",
     "depends" : ["product", "account"],
-    "category" : "Generic Modules/Inventory Control",
+    "category" : "Warehouse",
     "init_xml" : [],
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [

=== modified file 'stock_invoice_directly/__openerp__.py'
--- stock_invoice_directly/__openerp__.py	2011-01-14 00:11:01 +0000
+++ stock_invoice_directly/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Invoice Picking Directly',
     'version': '1.0',
-    'category': 'Generic Modules/Sales & Purchases',
+    'category': 'Warehouse',
     'description': """
         When you send or deliver goods, this module automatically launch
         the invoicing wizard if the delivery is to be invoiced.

=== modified file 'stock_location/__openerp__.py'
--- stock_location/__openerp__.py	2011-01-14 00:11:01 +0000
+++ stock_location/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Warehouse Locations Paths',
     'version': '1.0',
-    'category': 'Generic Modules/Inventory Control',
+    'category': 'Warehouse',
     'description': """
 This module supplements the Warehouse application by adding support for per-product
 location paths, effectively implementing Push and Pull inventory flows.

=== modified file 'stock_no_autopicking/__openerp__.py'
--- stock_no_autopicking/__openerp__.py	2011-01-14 00:11:01 +0000
+++ stock_no_autopicking/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -23,7 +23,7 @@
 {
     'name': 'Stock No Auto-Picking',
     'version': '1.0',
-    'category': 'Generic Modules/Production',
+    'category': 'Warehouse',
     'description': """
     This module allows an intermediate picking process to provide raw materials
     to production orders.

=== modified file 'stock_planning/__openerp__.py'
--- stock_planning/__openerp__.py	2011-02-23 12:01:08 +0000
+++ stock_planning/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,8 +22,13 @@
 {
     "name":"Master Procurement Schedule",
     "version":"1.1",
+<<<<<<< TREE
     "author":["OpenERP SA",  "Grzegorz Grzelak (Cirrus)"],
     "category":"Custom",
+=======
+    "author":"OpenERP SA and Grzegorz Grzelak (Cirrus)",
+    "category":"Warehouse",
+>>>>>>> MERGE-SOURCE
     "depends":["hr","stock","sale"],
     "description": """
 This module is based on original OpenERP SA module stock_planning version 1.0 of the same name Master Procurement Schedule.

=== modified file 'thunderbird/__openerp__.py'
--- thunderbird/__openerp__.py	2011-02-23 12:01:08 +0000
+++ thunderbird/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -25,8 +25,8 @@
     "author" : ['OpenERP SA', 'Axelor'],
     "website" : "http://www.openerp.com/",
     "depends" : ["base","mail_gateway"],
-    "category" : "Generic Modules/Thunderbird interface",
-    "description": """
+    "category" : "Tools",
+    "description": """Make a link between Thunderbird and OpenERP
       This module is required for the thuderbird plug-in to work
       properly.
       The Plugin allows you archive email and its attachments to the selected 

=== modified file 'users_ldap/__openerp__.py'
--- users_ldap/__openerp__.py	2011-01-19 16:56:36 +0000
+++ users_ldap/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -29,7 +29,7 @@
 
 
     "website" : "http://www.openerp.com",
-    "category" : "Generic Modules/Others",
+    "category" : "Tools",
     "init_xml" : [
     ],
     "demo_xml" : [

=== modified file 'web_livechat/__openerp__.py'
--- web_livechat/__openerp__.py	2011-02-23 12:01:08 +0000
+++ web_livechat/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,7 +21,7 @@
 {
     'name': 'Live Chat Support',
     'version': '1.1',
-    'category': 'Generic Modules/Others',
+    'category': 'Tools',
     'description': "Enable live chat support for whom have a maintenance contract",
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',

=== modified file 'web_uservoice/__openerp__.py'
--- web_uservoice/__openerp__.py	2011-02-23 12:01:08 +0000
+++ web_uservoice/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -21,7 +21,7 @@
 {
     'name': 'Add uservoice button in header',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Tools',
     'description': "",
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',

=== modified file 'wiki/__openerp__.py'
--- wiki/__openerp__.py	2011-02-23 12:01:08 +0000
+++ wiki/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Document Management - Wiki',
     'version': '1.0.1',
-    'category': 'Generic Modules/Others',
+    'category': 'Tools',
     'description': """
 The base module to manage documents(wiki)
 

=== modified file 'wiki_faq/__openerp__.py'
--- wiki_faq/__openerp__.py	2011-01-17 10:26:16 +0000
+++ wiki_faq/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Document Management - Wiki - FAQ',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Tools',
     'description': """This module provides a wiki FAQ Template
     """,
     'author': 'OpenERP SA',

=== modified file 'wiki_quality_manual/__openerp__.py'
--- wiki_quality_manual/__openerp__.py	2011-01-17 10:26:16 +0000
+++ wiki_quality_manual/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Document Management - Wiki - Quality Manual',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Tools',
     'description': """Quality Manual Template
     """,
     'author': 'OpenERP SA',

=== modified file 'wiki_sale_faq/__openerp__.py'
--- wiki_sale_faq/__openerp__.py	2011-01-17 10:26:16 +0000
+++ wiki_sale_faq/__openerp__.py	2011-03-17 10:58:38 +0000
@@ -22,7 +22,7 @@
 {
     'name': 'Wiki -Sale - FAQ',
     'version': '1.0',
-    'category': 'Generic Modules/Others',
+    'category': 'Tools',
     'description': """This module provides a wiki FAQ Template
     """,
     'author': 'OpenERP SA',