diff --git a/addons/analytic_contract_expense_project/__init__.py b/addons/analytic_contract_expense_project/__init__.py
deleted file mode 100644
index 05c84916922..00000000000
--- a/addons/analytic_contract_expense_project/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import analytic_contract_expense_project
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/__openerp__.py b/addons/analytic_contract_expense_project/__openerp__.py
deleted file mode 100644
index 8996e9f7565..00000000000
--- a/addons/analytic_contract_expense_project/__openerp__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-
-{
- 'name': 'Projects Management: hr_expense link',
- 'version': '1.1',
- 'category': 'Hidden',
- 'description': """
-This module is for modifying project view to show some data related to the hr_expense module.
-=============================================================================================
-""",
- 'author': 'OpenERP S.A.',
- 'website': 'http://www.openerp.com/',
- 'depends': ['analytic_contract_hr_expense','project'],
- 'data': ['analytic_contract_expense_project_view.xml'],
- 'demo': [],
- 'css' : [],
- 'installable': True,
- 'auto_install': True,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project.py b/addons/analytic_contract_expense_project/analytic_contract_expense_project.py
deleted file mode 100644
index efbb8b75a9e..00000000000
--- a/addons/analytic_contract_expense_project/analytic_contract_expense_project.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-from osv import osv
-
-class project_project(osv.osv):
- _inherit = "project.project"
-
- def open_hr_expense(self, cr, uid, ids, context=None):
- account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
- return self.pool.get('account.analytic.account').open_hr_expense(cr, uid, account_ids, context=context)
-
- def hr_to_invoice_expense(self, cr, uid, ids, context=None):
- account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
- return self.pool.get('account.analytic.account').hr_to_invoice_expense(cr, uid, account_ids, context=context)
-
-project_project()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml b/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
deleted file mode 100644
index f461ed224b8..00000000000
--- a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
- project.project.form.expense.inherit
- project.project
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/analytic_contract_project/__init__.py b/addons/analytic_contract_project/__init__.py
deleted file mode 100644
index dd60ac32096..00000000000
--- a/addons/analytic_contract_project/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import analytic_contract_project
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_project/__openerp__.py b/addons/analytic_contract_project/__openerp__.py
deleted file mode 100644
index 9c0be102760..00000000000
--- a/addons/analytic_contract_project/__openerp__.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-{
- 'name' : 'Contract on Project',
- 'version': '1.1',
- 'author' : 'OpenERP SA',
- 'category': 'Hidden',
- 'website' : 'http://www.openerp.com',
- 'depends' : ['project', 'account_analytic_analysis'],
- 'description': """
-Add "Contract Data" in project view.
-====================================
- """,
- 'data': ['analytic_contract_project_view.xml'],
- 'demo': [],
- 'installable': True,
- 'auto_install': True,
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_project/analytic_contract_project.py b/addons/analytic_contract_project/analytic_contract_project.py
deleted file mode 100644
index 1ffab1246c9..00000000000
--- a/addons/analytic_contract_project/analytic_contract_project.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-from osv import fields, osv
-from tools.translate import _
-
-class project_project(osv.osv):
- _inherit = 'project.project'
-
- _defaults = {
- 'use_timesheets': True,
- }
-
- def open_sale_order_lines(self,cr,uid,ids,context=None):
- account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
- return self.pool.get('account.analytic.account').open_sale_order_lines(cr, uid, account_ids, context=context)
-
- def open_timesheets_to_invoice(self,cr,uid,ids,context=None):
- if context is None:
- context = {}
- analytic_account_id = self.browse(cr, uid, ids[0], context=context).analytic_account_id.id
- context.update({'search_default_account_id': analytic_account_id, 'default_account_id': analytic_account_id, 'search_default_to_invoice': 1})
- return {
- 'type': 'ir.actions.act_window',
- 'name': _('Timesheet Lines to Invoice'),
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'context': context,
- 'domain' : [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'general')],
- 'res_model': 'account.analytic.line',
- 'nodestroy': True,
- }
-
- def open_timesheets(self, cr, uid, ids, context=None):
- """ open Timesheets view """
- project = self.browse(cr, uid, ids[0], context)
- try:
- journal_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_timesheet', 'analytic_journal').id
- except ValueError:
- journal_id = False
- view_context = {
- 'search_default_account_id': [project.analytic_account_id.id],
- 'default_account_id': project.analytic_account_id.id,
- 'default_journal_id': journal_id,
- }
- return {
- 'type': 'ir.actions.act_window',
- 'name': _('Bill Tasks Works'),
- 'res_model': 'account.analytic.line',
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'context': view_context,
- 'nodestroy': True,
- }
-project_project()
-
-class task(osv.osv):
- _inherit = "project.task"
-
- def create(self, cr, uid, vals, context=None):
- task_id = super(task, self).create(cr, uid, vals, context=context)
- task_browse = self.browse(cr, uid, task_id, context=context)
- if task_browse.project_id.analytic_account_id:
- self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task %s has been created.") % (task_browse.name), context=context)
- return task_id
-task()
diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
deleted file mode 100644
index ad897efdfe3..00000000000
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
- project.project.form.inherit
- project.project
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Inherit contract form : adding UoM
- account.analytic.account
-
- 50
-
-
-
-
-
-
-
-
diff --git a/addons/project/project.py b/addons/project/project.py
index ab1c3c47dfe..21684c81418 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1265,7 +1265,7 @@ class account_analytic_account(osv.osv):
_inherit = 'account.analytic.account'
_description = 'Analytic Account'
_columns = {
- 'use_tasks': fields.boolean('Tasks Mgmt.',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"),
+ 'use_tasks': fields.boolean('Tasks',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"),
'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
}
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1eae4018d25..9fe8d6a3193 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -76,33 +76,29 @@
-
-