-[MERGE]:Merge wiht lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: sbh@tinyerp.com-20100609105425-fsootcjd2kr7nyaa

diff --cc addons/account/__openerp__.py
Simple merge

diff --cc addons/account/account_view.xml
Simple merge

diff --cc addons/project/__openerp__.py
index 1529bb7,09b2c01..5d53596
--- 1/addons/project/__openerp__.py
--- 2/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@@ -48,13 -43,13 +48,16 @@@ work done on tasks, eso. It is able to 
          "project_installer.xml",
          "report/project_report_view.xml",
          "wizard/project_close_task_view.xml",
 +        "board_project_view.xml",
 +        'board_project_manager_view.xml'
      ],
      'demo_xml': [
 -        'project_demo.xml'
 +        'project_demo.xml',
 +        'board_project_demo.xml',
      ],
+     'test':[
+             'test/test_project.yml'
+             ],
      'installable': True,
      'active': False,
      'certificate': '0075116868317',

diff --cc addons/project_issue/__openerp__.py
index 221915b,f9f38fc..7339399
--- 1/addons/project_issue/__openerp__.py
--- 2/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@@ -45,9 -45,12 +45,13 @@@
          'report/project_issue_report_view.xml',
          'security/project_issue_security.xml',
          'security/ir.model.access.csv',
 +        "board_project_issue_view.xml",
       ],
      'demo_xml': ['project_issue_demo.xml'],
+     'test' : [
+               'test/convert_issue_to_task.yml',
+               'test/test_project_issue_states.yml'
+             ],
      'installable': True,
      'active': False,
  }

diff --cc addons/project_planning/__openerp__.py
Simple merge