[MERGE] merged with trunk-development-branch

bzr revid: hmo@tinyerp.com-20111213094656-4l13bf8hgub5hdr0

diff --combined addons/hr_expense/__openerp__.py
index 0d7be99,e0a8a00..4e91155
--- 1/addons/hr_expense/__openerp__.py
--- 2/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@@ -21,7 -21,7 +21,7 @@@
  
  
  {
-     'name': 'Expenses',
+     'name': 'Expenses Management',
      'version': '1.0',
      'category': 'Human Resources',
      'complexity': "easy",
@@@ -62,12 -62,12 +62,13 @@@ re-invoice your customer's expenses if 
      'demo_xml': [
          'hr_expense_demo.xml',
          ],
 -    'test': ['test/test_hr_expense.yml',
 -             'test/hr_expense_report.yml',
 +    'test': [
 +             'test/expense_demo.yml',
 +             'test/expense_process.yml',
               ],
      'installable': True,
      'active': False,
      'certificate': '0062479841789',
+     'application': True,
  }
  # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: