Merge lp:~akretion-team/project-service/add-project-action-item into lp:~project-core-editors/project-service/trunk

[Alexis de Lattre]

This merge proposal adds the module "project_action_item".

Extract from the module description :

This module adds action items on project tasks. When a user has completed the action item of a task, he can click on a button "Done with Timesheet" that starts a wizard ; this wizard will mark the action item as done and will create a timesheet line.

The idea behind this module is the following : on a task, we have the timesheet lines that give you the history of the actions made for that task... but we don't have anything to store the actions that must be carried out for that action (apart from the text field "description"). So, with this module : on a task, the timesheet lines (object hr.analytic.timesheet) still store the "past" actions carried out ; the action items (new object project.action.item) in "todo" state store the future actions that must be carried out. And we have a wizard to set an action item from todo to done and generate the corresponding timesheet line.

[Daniel Reis (dreis-pt)]

Very nice feature Alexis.

I tried it out, and I have some comments:

* I would be nice to inform where the lp branch "hr_timesheet_task" can be found, at least until openerpapps.info rules the world.
* The "Done with timesheet" is not a real button. It took me some time to realize it's test was clickable.
* IMO "Done with timesheet" is a confusing label. I would prefer "Log on Timesheet" or the even simpler "Done".
* Actions should heave a sequence field, and be manually reordered in the Task Actions tab.
* If you have the "Manage time estimation on tasks" feature activated, the Task's estimated time should be computed as the total Actions estimated time (in the demo data, the Tasks estimated time is 22h and the Action estimated time is 70h).
* When an Action is Done, you can't see the actual time spent.
* At the time you are creating the Action list, you should be able to set if you expect it to be billable (or expected Invoicing Ratio).
* You can't log time on an Action without completing it. The demo action "Develop final version" is 42h long, will surely span more than a week, and you will surely won't be able to wait until it's completed to log the time spent.
I suggest the wizard to let you log time on timesheet for an action, but keep it as not done / in progress.

Just some food for thought; it may be a bad idea, but:
What if instead of "Actions" we had "Child Tasks"? If that implementation strategy doesn't bring a lot of difficulties, It would open up a lot of interesting use cases ...

review: Needs Fixing

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Hello Daniel,

I just want t mention that yesterday I talked with Alexis and I spontaneously made exactly the same remark as you with the concept of children tasks instead of that new actions object.

There are several modules trying to fix the need for a standard Workbench Breakdown Structure (WBS from PMI) in OpenERP.

Ferdinand Gassauer at C2C2 maintained a parent-child task hierarchy module for years (not remembering the link though) and there is also this project_scope_wbs PMI WBS module from Efficient now that would eventually be interesting to bring into OCA:
http://bazaar.launchpad.net/~eficent/eficent-openerp-project-management/7.0/files

On our side at Akretion we will also soon push an other module called project_feature that also aim at managing different granularity scales for projects, this time bridging operational tasks with the customer metric expressed with a new object called project.feature.

So there is definitely effort in that direction and we should avoid "leaky abstraction". That is as you said, if with minimum effort would could make it work with a hierarchy instead of introducing that action object, that would be cool.

If that is not possible, we should try to make it at least compatible with the modules trying to bring WBS hierarchy.

All in all, this module seems great, but we should double check if we can make the most of it before blessing it to OCA.

Regards

[JB (eficent.com) (jb.eficent)]

Hello Alexis, Daniel and Raphaël,

The module developed by Alexis is a valid option me. Let me expose the two alternatives that I can see as being valid.

First of all, some key definitions of project management terminology as defined by PMI:
- Control Account
A control account is a management control point where scope, budget, actual cost, and schedule are integrated and compared to the earned value for performance measurement (3).

- Planning Package
A planning package is a work breakdown structure component below the control account with known work content but without detailed schedule activities (3).

- Work Package
Same as a planning package, but with detailed activites defined within.
Work package is a more deliverable oriented definition of the work to be completed (identifies work to be done to complete the project scope, but does not provide the low level detail).

- Activty
Activities represent the effort needed to complete a work package. Each work package is decomposed into the activities required to produce the work package deliverables (4). Activities more specifically identify the individual low level actions needed to complete the work package.

- Milestone
Milestones are similar to regular schedule activities, with the same structure and
attributes, but they have zero duration because milestones represent a moment in time (5).

Now let's see how OpenERP seems to be mapping these concepts.
- Control Account --> project.project
- Planning Package --> project.task
- Work Package --> project.task
- Activity --> ?
- Milestone -> ?

From a PMI terminology perspective, OpenERP's project.task is now being used more as a work-package than as an activity (1),(2):
- project.task is now being used to assign work to be done without detailed breakdown (work packages) from other modules such project.issue or sales order lines that are related to internally procured service items.
- project.task is built with the capability to define multiple stages required to complete the work (analysis, design, ..). That is unnecessary in activities, but useful in work packages.

Now let's see how can we completely map in OpenERP the PMI concepts. I can see two options here:
Option 1 -> Use project.project to implement work packages and project.task to implement activities.
Option 2 -> Use project.task to implement work packages and project.action.item to implement activities.

Option 1 adheres to my current project management modules (https://launchpad.net/eficent-openerp-project-management), but has the following limitations:
1) Project Issue module should create project.project records as workd packages instead of project.task
2) Sale module should create project.project records as work packages instead of project.task.

Option 2 would require a significant redesign of my modules.

Mapping of concepts in Option 1:
Control Account --> project.project
Planning Package --> project.project
Work Package --> project.project
Activity --> project.task
Milestone -> project.task

Mapping of concepts in Option 2:
Control Account --> project.project
Planning Package --> project.task
Work Package --> project.task
Activity --> project.action.item
Milestone -> ...

[lp:~akretion-team/project-service/add-project-action-item]

35. By Alexis de Lattre on 2014-04-23

Implement some suggestions of Daniel Reis :
- explain where to find the module hr_timesheet_task in module description
- add state "In Progress" and adapt the wizard and buttons
- add field "to_invoice" on action item, that will be copied to the timesheet
- change "Done with timesheet" to "Done" in the tree view.

36. By Alexis de Lattre on 2014-04-24

Continue to implement the remarks of Daniel :
- add computed field timesheet_hours on project.action.item
- replace the native field 'planned_hours' on task by a computed field (sum of action items)
Update some strings and field names (Quantity -> Hours)
Flake8 validation

[Alexis de Lattre (alexis-via)]

@Daniel Reis

I have implemented all your remarks :

* I would be nice to inform where the lp branch "hr_timesheet_task" can be found, at least until openerpapps.info rules the world.

=> Done

* The "Done with timesheet" is not a real button. It took me some time to realize it's test was clickable.

=> What do you suggest for that ?

* IMO "Done with timesheet" is a confusing label. I would prefer "Log on Timesheet" or the even simpler "Done".

=> We now have 2 buttons : "Done" and "Progress"

* Actions should heave a sequence field, and be manually reordered in the Task Actions tab.

=> They have that since my first commit :) Re-ordering action items works fine.

* If you have the "Manage time estimation on tasks" feature activated, the Task's estimated time should be computed as the total Actions estimated time (in the demo data, the Tasks estimated time is 22h and the Action estimated time is 70h).

=> Done?

* When an Action is Done, you can't see the actual time spent.

=> I added a field "timesheet_hours" on action items

* At the time you are creating the Action list, you should be able to set if you expect it to be billable (or expected Invoicing Ratio).

=> Done.

* You can't log time on an Action without completing it. The demo action "Develop final version" is 42h long, will surely span more than a week, and you will surely won't be able to wait until it's completed to log the time spent.
I suggest the wizard to let you log time on timesheet for an action, but keep it as not done / in progress.

=> Very good idea. Action items now have 3 states instead of 2 : todo, in progress and done.

[lp:~akretion-team/project-service/add-project-action-item]

37. By Alexis de Lattre on 2014-04-25

Add icon on button in tree view
Add related field projet_id
Now that we have both "todo" and "progress", the state field should always be visible.

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Considering the suggestion from Jordi that WBS is better implemented using a project hierarchy than a task hierarchy (it's true that OpenERP has some support for a hierarchy of projects), then I approve Alexis' merge.

review: Approve

[lp:~akretion-team/project-service/add-project-action-item]

38. By Alexis de Lattre on 2014-04-25

[Usability] Put action items above timesheets, in the same tab

[Daniel Reis (dreis-pt)]

Great work Alexis. I hope you don't think it's too nitpicking, but I still have some (mostly UI) comments.

Regarding the "Manage time estimation on tasks" feature, you did a good job, but were tricked but thr ORM limitations: the "Initially planned hours" at the top of the Task form is now correct, but the "Remaining" and "Total Time" at the bottom still calculate as before. (Maybe you need to keep task estimated time a plain float updated when you write on an Action's.)

My UI suggestions are:

1) I find confusing to have both Actions and Work Ids on the same page. Maybe move Actions to a new form Page?
2) Add a read only "Actual Hours" after "Estimated Hours" and remove the "State" field. This gives better information with the same number of columns.
3) Replace the two icon button with a single "Log Time" classic button (I think the icon buttons are no longer used in v7), and instead have two action buttons on the wizard to log time on an Action ("Log and Continue", "Log and Complete"). This also makes the "Action Item Complete" checkbox unnecessary.
4) Remove the menu "Action Items": it's the same as the "My Action Items" menu, except that it has a removable default filter.

[lp:~akretion-team/project-service/add-project-action-item]

39. By Alexis de Lattre on 2014-04-26

[Usability] implement some of the remarks of Daniel Reis :
- one menu entry instead of 2
- display "Worked Hours" in Tree view and re-order cols

[Alexis de Lattre (alexis-via)]

@Daniel : about your UI suggestions :

1) I have precisely changed the task view so that the Actions and Works Ids are in the same tab, so that a user can see what he has done and what he has left to do in the same screen. I find it very usefull.

2) I added the field "Worked Hours" in the tree view ; I kept the "State" field because I find it usefull and there is enough room to keep it

3) The icon buttons are still used in v7 in the tree views (and only in tree views). For example, on the form view of a delivery order, there are 3 icon buttons : Scrap Products, Put in current pack, Put in new pack. So it's coherent with the rest of OpenERP.

4) I agree with you ; I kept only one menu entry "Action Items", with the filter.

[lp:~akretion-team/project-service/add-project-action-item]

40. By Alexis de Lattre on 2014-05-05

[Usability] Larger display for the action description.

[Lorenzo Battistini (elbati)]

Thanks Alexis,
some style notes

project_action_item/__openerp__.py:52:9: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/project.py:65:17: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/project.py:66:13: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/project.py:71:13: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/project.py:76:9: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/project.py:93:9: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/project.py:100:13: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/project.py:106:13: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/project.py:113:13: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/project.py:141:9: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/project.py:176:17: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/project.py:179:9: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/wizard/update_action_generate_timesheet.py:39:9: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/wizard/update_action_generate_timesheet.py:66:13: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/wizard/update_action_generate_timesheet.py:89:13: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/wizard/update_action_generate_timesheet.py:98:17: E123 closing bracket does not match indentation of opening bracket's line
project_action_item/wizard/update_action_generate_timesheet.py:136:17: E123 closing bracket does not match indentation of opening bracket's line

project_action_item/__openerp__.py:34:80: E501 line too long (250 > 79 characters)
project_action_item/__openerp__.py:36:80: E501 line too long (115 > 79 characters)
project_action_item/__openerp__.py:38:80: E501 line too long (120 > 79 characters)
project_action_item/__openerp__.py:51:80: E501 line too long (82 > 79 characters)

review: Needs Fixing

[Alexis de Lattre (alexis-via)]

@Lorenzo :

You have a non-default configuration for flake8 ; as you can see below, flake8 gives me 0 error on the python files (except in __openerp__.py).

% flake8 project_action_item
project_action_item/__init__.py:23:1: F401 'project' imported but unused
project_action_item/__init__.py:24:1: F401 'wizard' imported but unused
project_action_item/__openerp__.py:34:80: E501 line too long (250 > 79 characters)
project_action_item/__openerp__.py:36:80: E501 line too long (115 > 79 characters)
project_action_item/__openerp__.py:38:80: E501 line too long (120 > 79 characters)
project_action_item/__openerp__.py:51:80: E501 line too long (82 > 79 characters)
project_action_item/wizard/__init__.py:23:1: F401 'update_action_generate_timesheet' imported but unused

[Lorenzo Battistini (elbati)]

Uh, I'm using this
http://bazaar.launchpad.net/~openerp-community-reviewer/lp-community-utils/openerp-reviewers-nag/view/32/checkout-flake8.sh#L40
+
https://github.com/nbessi/openerp-conventions

The command
'flake8 project_action_item --ignore E501'
is the responsible for adding those output lines.
But I don't understand why

review: Abstain

[Alexis de Lattre (alexis-via)]

@Daniel

I have implemented and/or answered your UI remarks at the end of April. Could you update your review status (currently Needs Fixing) ?

[Daniel Reis (dreis-pt)]

This project is now hosted on https://github.com/OCA/project-service. Please move your proposal there.
This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

[Alexis de Lattre (alexis-via)]

@Daniel :

I won't move this MP in the short term, because I am not familiar with git. By the way, if you had updated your "Needs fixing" review status after I implemented your remarks back in April, this MP would probably have been merged before the move to github !!! So it would have avoided all this additional work to move the MP to github !!!

[Daniel Reis (dreis-pt)]

Alexis: I understand it was an avoidable inconvenience.
Since I caused it I'll take the burden for to move.
I'll update the status here.

[Alexis de Lattre (alexis-via)]

@Daniel

Thanks a lot for your proposal... it is very much appreciated !

[Daniel Reis (dreis-pt)]

This MP has moved to GitHub:
https://github.com/OCA/project-service/pull/1

Unmerged revisions

40. By Alexis de Lattre on 2014-05-05

[Usability] Larger display for the action description.

39. By Alexis de Lattre on 2014-04-26

[Usability] implement some of the remarks of Daniel Reis :
- one menu entry instead of 2
- display "Worked Hours" in Tree view and re-order cols

38. By Alexis de Lattre on 2014-04-25

[Usability] Put action items above timesheets, in the same tab

37. By Alexis de Lattre on 2014-04-25

Add icon on button in tree view
Add related field projet_id
Now that we have both "todo" and "progress", the state field should always be visible.

36. By Alexis de Lattre on 2014-04-24

Continue to implement the remarks of Daniel :
- add computed field timesheet_hours on project.action.item
- replace the native field 'planned_hours' on task by a computed field (sum of action items)
Update some strings and field names (Quantity -> Hours)
Flake8 validation

35. By Alexis de Lattre on 2014-04-23

Implement some suggestions of Daniel Reis :
- explain where to find the module hr_timesheet_task in module description
- add state "In Progress" and adapt the wizard and buttons
- add field "to_invoice" on action item, that will be copied to the timesheet
- change "Done with timesheet" to "Done" in the tree view.

34. By Alexis de Lattre on 2014-04-16

Add module project_action_item.

=== added directory 'project_action_item'
=== added file 'project_action_item/__init__.py'
--- project_action_item/__init__.py	1970-01-01 00:00:00 +0000
+++ project_action_item/__init__.py	2014-05-05 12:05:37 +0000
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Project Action Item module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import project
+from . import wizard

=== added file 'project_action_item/__openerp__.py'
--- project_action_item/__openerp__.py	1970-01-01 00:00:00 +0000
+++ project_action_item/__openerp__.py	2014-05-05 12:05:37 +0000
@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Project Action Item module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Project Action Item',
+    'version': '0.1',
+    'category': 'Project Management',
+    'license': 'AGPL-3',
+    'summary': 'Adds action items on tasks',
+    'description': """
+Project Action Item
+===================
+
+This module adds action items on project tasks. When a user has completed the action item of a task, he can click on a button *Done with Timesheet* that starts a wizard ; this wizard will mark the action item as done and will create a timesheet line.
+
+This module depends on the module *hr_timesheet_task* which is available on http://code.launchpad.net/hr-timesheet.
+
+Please contact Alexis de Lattre from Akretion <[e-mail]> for any help or question about this module.
+    """,
+    'author': 'Akretion',
+    'website': 'http://www.akretion.com',
+    'depends': ['project', 'hr_timesheet_task'],
+    'data': [
+        'wizard/update_action_generate_timesheet_view.xml',
+        'project_view.xml',
+        'security/ir.model.access.csv',
+    ],
+    'demo': ['project_demo.xml'],
+    'images': [
+        'static/src/img/screenshots/task_with_action_items.jpg',
+        'static/src/img/screenshots/create_timesheet_from_action_item_wizard.jpg',
+        ],
+    'installable': True,
+}

=== added directory 'project_action_item/i18n'
=== added file 'project_action_item/i18n/fr.po'
--- project_action_item/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ project_action_item/i18n/fr.po	2014-05-05 12:05:37 +0000
@@ -0,0 +1,277 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_action_item
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-04-24 21:17+0000\n"
+"PO-Revision-Date: 2014-04-24 21:17+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project_action_item
+#: field:hr.analytic.timesheet,action_item_id:0
+#: view:project.action.item:0
+msgid "Action Item"
+msgstr "Point d'action"
+
+#. module: project_action_item
+#: field:project.action.item.timesheet,completed:0
+msgid "Action Item Completed"
+msgstr "Point d'action fini"
+
+#. module: project_action_item
+#: model:ir.actions.act_window,name:project_action_item.project_action_item_action
+#: model:ir.ui.menu,name:project_action_item.project_action_item_menu
+#: view:project.action.item:0
+#: view:project.task:0
+#: field:project.task,action_item_ids:0
+msgid "Action Items"
+msgstr "Points d'action"
+
+#. module: project_action_item
+#: field:project.task,done_action_item_ids:0
+msgid "Action Items Done"
+msgstr "Points d'action faits"
+
+#. module: project_action_item
+#: field:project.task,to_work_action_item_ids:0
+msgid "Action Items To Do"
+msgstr "Points d'action à faire"
+
+#. module: project_action_item
+#: view:project.task:0
+msgid "Action Items To Work On"
+msgstr "Points d'action à travailler"
+
+#. module: project_action_item
+#: field:project.action.item,user_id:0
+msgid "Assigned To"
+msgstr "Assigné à"
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Back to To Do"
+msgstr "Revenir à À faire"
+
+#. module: project_action_item
+#: view:project.action.item.timesheet:0
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: project_action_item
+#: field:project.action.item,create_uid:0
+msgid "Created By"
+msgstr "Créé par"
+
+#. module: project_action_item
+#: field:project.action.item,create_date:0
+msgid "Creation Date"
+msgstr "Date de création"
+
+#. module: project_action_item
+#: field:project.action.item.timesheet,date:0
+msgid "Date"
+msgstr "Date"
+
+#. module: project_action_item
+#: field:project.action.item,date_done:0
+msgid "Date Done"
+msgstr "Fait le"
+
+#. module: project_action_item
+#: field:project.action.item,date_deadline:0
+msgid "Deadline"
+msgstr "Date limite"
+
+#. module: project_action_item
+#: field:project.action.item,name:0
+#: view:project.task:0
+msgid "Description"
+msgstr "Description"
+
+#. module: project_action_item
+#: view:project.action.item:0
+#: selection:project.action.item,state:0
+msgid "Done"
+msgstr "Fait"
+
+#. module: project_action_item
+#: code:addons/project_action_item/wizard/update_action_generate_timesheet.py:51
+#, python-format
+msgid "Error:"
+msgstr "Erreur :"
+
+#. module: project_action_item
+#: field:project.action.item,estimated_hours:0
+msgid "Estimated Hours"
+msgstr "Heures estimées"
+
+#. module: project_action_item
+#: field:project.action.item,to_invoice:0
+msgid "Expected Invoicing Ratio"
+msgstr "Expected Invoicing Ratio"
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Group By..."
+msgstr "Groupé par..."
+
+#. module: project_action_item
+#: selection:project.action.item,state:0
+msgid "In Progress"
+msgstr "En cours"
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Mark as Done"
+msgstr "Marquer comme fait"
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Mark as Done with Timesheet"
+msgstr "Marquer comme fait avec feuille de temps"
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Mark as In Progress"
+msgstr "Marquer comme en cours"
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Mark as Progress with Timesheet"
+msgstr "Marquer comme en cours avec feuille de temps"
+
+#. module: project_action_item
+#: model:ir.actions.act_window,name:project_action_item.my_project_action_item_action
+#: model:ir.ui.menu,name:project_action_item.my_project_action_item_menu
+#: view:project.action.item:0
+msgid "My Action Items"
+msgstr "Mes points d'action"
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "My Action Items To Work On"
+msgstr "Mes points d'action à travailler"
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Progress"
+msgstr "Avancer"
+
+#. module: project_action_item
+#: model:ir.model,name:project_action_item.model_project_action_item
+msgid "Project Action Items"
+msgstr "Points d'action projet"
+
+#. module: project_action_item
+#: field:project.action.item,task_id:0
+msgid "Related Task"
+msgstr "Tâche associée"
+
+#. module: project_action_item
+#: field:project.action.item,timesheet_ids:0
+msgid "Related Timesheets"
+msgstr "Feuilles de temps associées"
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Search Action Items"
+msgstr "Recherche de points d'action"
+
+#. module: project_action_item
+#: field:project.action.item,sequence:0
+msgid "Sequence"
+msgstr "Séquence"
+
+#. module: project_action_item
+#: field:project.action.item,state:0
+msgid "State"
+msgstr "État"
+
+#. module: project_action_item
+#: code:addons/project_action_item/wizard/update_action_generate_timesheet.py:127
+#: model:ir.model,name:project_action_item.model_project_task
+#: view:project.action.item:0
+#, python-format
+msgid "Task"
+msgstr "Tâche"
+
+#. module: project_action_item
+#: code:addons/project_action_item/wizard/update_action_generate_timesheet.py:52
+#, python-format
+msgid "This action item is not linked to a task, so we cannot generate a timesheet from it."
+msgstr "Ce point d'action n'est pas lié à une tâche, donc on ne peut pas générer de feuille de temps à partir de celui-ci."
+
+#. module: project_action_item
+#: help:project.action.item,timesheet_hours:0
+msgid "This is the sum of the related timesheets."
+msgstr "Ce champ est la somme des feuilles de temps associées."
+
+#. module: project_action_item
+#: field:project.action.item.timesheet,to_invoice:0
+msgid "Timesheet Invoicing Ratio"
+msgstr "Timesheet Invoicing Ratio"
+
+#. module: project_action_item
+#: model:ir.model,name:project_action_item.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Ligne de feuille de temps"
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Timesheets"
+msgstr "Feuilles de temps"
+
+#. module: project_action_item
+#: selection:project.action.item,state:0
+msgid "To Do"
+msgstr "À faire"
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "To Work On"
+msgstr "À travailler"
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Total Estimated Hours"
+msgstr "Nb d'heures total estimée"
+
+#. module: project_action_item
+#: code:addons/project_action_item/project.py:121
+#: model:ir.actions.act_window,name:project_action_item.project_action_item_timesheet_action
+#: model:ir.model,name:project_action_item.model_project_action_item_timesheet
+#: view:project.action.item.timesheet:0
+#, python-format
+msgid "Update Action Item and Create Timesheet Line"
+msgstr "Mettre à jour le point d'action et créer la ligne de feuille de temps"
+
+#. module: project_action_item
+#: view:project.action.item.timesheet:0
+msgid "Update Action and Create Timesheet"
+msgstr "Mettre à jour le point d'action et créer la feuille de temps"
+
+#. module: project_action_item
+#: view:project.action.item:0
+#: field:project.action.item.timesheet,user_id:0
+msgid "User"
+msgstr "Utilisateur"
+
+#. module: project_action_item
+#: field:project.action.item.timesheet,name:0
+msgid "Work Description"
+msgstr "Description du travail réalisé"
+
+#. module: project_action_item
+#: field:project.action.item,timesheet_hours:0
+#: field:project.action.item.timesheet,hours:0
+msgid "Worked Hours"
+msgstr "Heures travaillées"
+

=== added file 'project_action_item/i18n/project_action_item.pot'
--- project_action_item/i18n/project_action_item.pot	1970-01-01 00:00:00 +0000
+++ project_action_item/i18n/project_action_item.pot	2014-05-05 12:05:37 +0000
@@ -0,0 +1,277 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_action_item
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-04-24 21:17+0000\n"
+"PO-Revision-Date: 2014-04-24 21:17+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project_action_item
+#: field:hr.analytic.timesheet,action_item_id:0
+#: view:project.action.item:0
+msgid "Action Item"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item.timesheet,completed:0
+msgid "Action Item Completed"
+msgstr ""
+
+#. module: project_action_item
+#: model:ir.actions.act_window,name:project_action_item.project_action_item_action
+#: model:ir.ui.menu,name:project_action_item.project_action_item_menu
+#: view:project.action.item:0
+#: view:project.task:0
+#: field:project.task,action_item_ids:0
+msgid "Action Items"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.task,done_action_item_ids:0
+msgid "Action Items Done"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.task,to_work_action_item_ids:0
+msgid "Action Items To Do"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.task:0
+msgid "Action Items To Work On"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item,user_id:0
+msgid "Assigned To"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Back to To Do"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item.timesheet:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item,create_uid:0
+msgid "Created By"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item.timesheet,date:0
+msgid "Date"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item,date_done:0
+msgid "Date Done"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item,name:0
+#: view:project.task:0
+msgid "Description"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item:0
+#: selection:project.action.item,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_action_item
+#: code:addons/project_action_item/wizard/update_action_generate_timesheet.py:51
+#, python-format
+msgid "Error:"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item,estimated_hours:0
+msgid "Estimated Hours"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item,to_invoice:0
+msgid "Expected Invoicing Ratio"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Group By..."
+msgstr ""
+
+#. module: project_action_item
+#: selection:project.action.item,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Mark as Done"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Mark as Done with Timesheet"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Mark as In Progress"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Mark as Progress with Timesheet"
+msgstr ""
+
+#. module: project_action_item
+#: model:ir.actions.act_window,name:project_action_item.my_project_action_item_action
+#: model:ir.ui.menu,name:project_action_item.my_project_action_item_menu
+#: view:project.action.item:0
+msgid "My Action Items"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "My Action Items To Work On"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_action_item
+#: model:ir.model,name:project_action_item.model_project_action_item
+msgid "Project Action Items"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item,task_id:0
+msgid "Related Task"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item,timesheet_ids:0
+msgid "Related Timesheets"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Search Action Items"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item,state:0
+msgid "State"
+msgstr ""
+
+#. module: project_action_item
+#: code:addons/project_action_item/wizard/update_action_generate_timesheet.py:127
+#: model:ir.model,name:project_action_item.model_project_task
+#: view:project.action.item:0
+#, python-format
+msgid "Task"
+msgstr ""
+
+#. module: project_action_item
+#: code:addons/project_action_item/wizard/update_action_generate_timesheet.py:52
+#, python-format
+msgid "This action item is not linked to a task, so we cannot generate a timesheet from it."
+msgstr ""
+
+#. module: project_action_item
+#: help:project.action.item,timesheet_hours:0
+msgid "This is the sum of the related timesheets."
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item.timesheet,to_invoice:0
+msgid "Timesheet Invoicing Ratio"
+msgstr ""
+
+#. module: project_action_item
+#: model:ir.model,name:project_action_item.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Timesheets"
+msgstr ""
+
+#. module: project_action_item
+#: selection:project.action.item,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "To Work On"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item:0
+msgid "Total Estimated Hours"
+msgstr ""
+
+#. module: project_action_item
+#: code:addons/project_action_item/project.py:121
+#: model:ir.actions.act_window,name:project_action_item.project_action_item_timesheet_action
+#: model:ir.model,name:project_action_item.model_project_action_item_timesheet
+#: view:project.action.item.timesheet:0
+#, python-format
+msgid "Update Action Item and Create Timesheet Line"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item.timesheet:0
+msgid "Update Action and Create Timesheet"
+msgstr ""
+
+#. module: project_action_item
+#: view:project.action.item:0
+#: field:project.action.item.timesheet,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item.timesheet,name:0
+msgid "Work Description"
+msgstr ""
+
+#. module: project_action_item
+#: field:project.action.item,timesheet_hours:0
+#: field:project.action.item.timesheet,hours:0
+msgid "Worked Hours"
+msgstr ""
+

=== added file 'project_action_item/project.py'
--- project_action_item/project.py	1970-01-01 00:00:00 +0000
+++ project_action_item/project.py	2014-05-05 12:05:37 +0000
@@ -0,0 +1,179 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Project Action Item module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+from openerp.tools.translate import _
+
+
+class project_action_item(orm.Model):
+    _name = "project.action.item"
+    _description = "Project Action Items"
+
+    def _compute_timesheet_hours(
+            self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for action in self.browse(cr, uid, ids, context=context):
+            res[action.id] = 0
+            for timesheet in action.timesheet_ids:
+                res[action.id] += timesheet.unit_amount
+        return res
+
+    def _get_action_from_timesheet(self, cr, uid, ids, context=None):
+        return self.pool['project.action.item'].search(
+            cr, uid, [('timesheet_ids', 'in', ids)], context=context)
+
+    _columns = {
+        'task_id': fields.many2one('project.task', 'Related Task'),
+        'project_id': fields.related(
+            'task_id', 'project_id', type='many2one',
+            relation="project.project", readonly=True, string="Project"),
+        'name': fields.char('Description', size=256, required=True),
+        'date_deadline': fields.date('Deadline'),
+        'date_done': fields.date('Date Done'),
+        'user_id': fields.many2one('res.users', 'Assigned To'),
+        'estimated_hours': fields.float('Estimated Hours'),
+        'to_invoice': fields.many2one(
+            'hr_timesheet_invoice.factor', 'Expected Invoicing Ratio'),
+        'timesheet_ids': fields.one2many(
+            'hr.analytic.timesheet', 'action_item_id', 'Related Timesheets'),
+        'timesheet_hours': fields.function(
+            _compute_timesheet_hours, type='float',
+            string="Worked Hours", readonly=True, store={
+                'hr.analytic.timesheet': (
+                    _get_action_from_timesheet,
+                    ['unit_amount', 'action_item_id'],
+                    10),
+                }, help="This is the sum of the related timesheets."
+            ),
+        'state': fields.selection([
+            ('todo', 'To Do'),
+            ('progress', 'In Progress'),
+            ('done', 'Done'),
+            ], 'State', readonly=True),
+        'create_uid': fields.many2one(
+            'res.users', 'Created By', readonly=True),
+        'create_date': fields.datetime('Creation Date', readonly=True),
+        'sequence': fields.integer('Sequence'),
+        }
+
+    def _get_default_invoice_ratio(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        active_id = context.get('active_id')
+        active_model = context.get('active_model')
+        if active_model == 'project.task' and active_id:
+            task = self.pool['project.task'].browse(
+                cr, uid, active_id, context=context)
+            return task.project_id and task.project_id.to_invoice.id or False
+        else:
+            return False
+
+    _defaults = {
+        'state': 'todo',
+        'to_invoice': _get_default_invoice_ratio,
+        }
+
+    def set_to_done(self, cr, uid, ids, context=None):
+        today = fields.date.context_today(self, cr, uid, context=context)
+        self.write(cr, uid, ids, {
+            'state': 'done',
+            'date_done': today,
+            }, context=context)
+        return
+
+    def set_to_progress(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {
+            'state': 'progress',
+            }, context=context)
+        return
+
+    def back_to_todo(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {
+            'state': 'todo',
+            'date_done': False,
+            }, context=context)
+        return
+
+    def action_item_done_with_timesheet_wizard(
+            self, cr, uid, ids, context=None):
+        # I cannot pass the context is the button of a tree view,
+        # that's why I wrote a special function for that...
+        if context is None:
+            context = {}
+        context['action_item_completed'] = True
+        return {
+            'name': _('Update Action Item and Create Timesheet Line'),
+            'type': 'ir.actions.act_window',
+            'res_model': 'project.action.item.timesheet',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'nodestroy': True,
+            'target': 'new',
+            'context': context,
+        }
+
+
+class hr_analytic_timesheet(orm.Model):
+    _inherit = "hr.analytic.timesheet"
+
+    _columns = {
+        'action_item_id': fields.many2one(
+            'project.action.item', 'Action Item'),
+        }
+
+
+class project_task(orm.Model):
+    _inherit = "project.task"
+
+    def _compute_planned_hours(
+            self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for task in self.browse(cr, uid, ids, context=context):
+            res[task.id] = 0
+            for action in task.action_item_ids:
+                res[task.id] += action.estimated_hours
+        return res
+
+    def _get_task_from_action(self, cr, uid, ids, context=None):
+        return self.pool['project.task'].search(
+            cr, uid, [('action_item_ids', 'in', ids)], context=context)
+
+    _columns = {
+        'to_work_action_item_ids': fields.one2many(
+            'project.action.item', 'task_id', 'Action Items To Do',
+            domain=[('state', 'in', ('todo', 'progress'))]),
+        'done_action_item_ids': fields.one2many(
+            'project.action.item', 'task_id', 'Action Items Done',
+            domain=[('state', '=', 'done')]),
+        'action_item_ids': fields.one2many(
+            'project.action.item', 'task_id', 'Action Items'),
+        'planned_hours': fields.function(
+            _compute_planned_hours, type="float",
+            string="Initially Planned Hours", store={
+                'project.action.item': (
+                    _get_task_from_action,
+                    ['estimated_hours', 'task_id'],
+                    10),
+                },
+            help="Estimated time to do the task. It is the sum of the "
+            "estimated time of all the action items of this task."),
+        }

=== added file 'project_action_item/project_demo.xml'
--- project_action_item/project_demo.xml	1970-01-01 00:00:00 +0000
+++ project_action_item/project_demo.xml	2014-05-05 12:05:37 +0000
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="1">
+
+<record id="action_item_1" model="project.action.item">
+    <field name="name">Write specs</field>
+    <field name="task_id" ref="project.project_task_8"/>
+    <field name="user_id" ref="base.user_demo"/>
+    <field name="estimated_hours">4.5</field>
+    <field name="sequence">1</field>
+</record>
+
+<record id="action_item_2" model="project.action.item">
+    <field name="name">Develop a proto</field>
+    <field name="task_id" ref="project.project_task_8"/>
+    <field name="user_id" ref="base.user_demo"/>
+    <field name="estimated_hours">16</field>
+    <field name="sequence">2</field>
+</record>
+
+<record id="action_item_3" model="project.action.item">
+    <field name="name">Show proto to management</field>
+    <field name="task_id" ref="project.project_task_8"/>
+    <field name="user_id" ref="base.user_demo"/>
+    <field name="estimated_hours">1</field>
+    <field name="sequence">3</field>
+</record>
+
+<record id="action_item_4" model="project.action.item">
+    <field name="name">Update specs after management meeting</field>
+    <field name="task_id" ref="project.project_task_8"/>
+    <field name="user_id" ref="base.user_demo"/>
+    <field name="estimated_hours">1</field>
+    <field name="sequence">4</field>
+</record>
+
+<record id="action_item_5" model="project.action.item">
+    <field name="name">Develop final version</field>
+    <field name="task_id" ref="project.project_task_8"/>
+    <field name="user_id" ref="base.user_demo"/>
+    <field name="estimated_hours">42</field>
+    <field name="sequence">5</field>
+</record>
+
+<record id="action_item_6" model="project.action.item">
+    <field name="name">Show final version to usability team</field>
+    <field name="task_id" ref="project.project_task_8"/>
+    <field name="user_id" ref="base.user_demo"/>
+    <field name="estimated_hours">3</field>
+    <field name="sequence">6</field>
+</record>
+
+<record id="action_item_7" model="project.action.item">
+    <field name="name">Merge proposal and review</field>
+    <field name="task_id" ref="project.project_task_8"/>
+    <field name="user_id" ref="base.user_demo"/>
+    <field name="estimated_hours">3.5</field>
+    <field name="sequence">7</field>
+</record>
+
+
+
+</data>
+</openerp>

=== added file 'project_action_item/project_view.xml'
--- project_action_item/project_view.xml	1970-01-01 00:00:00 +0000
+++ project_action_item/project_view.xml	2014-05-05 12:05:37 +0000
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2014 Akretion (http://www.akretion.com/)
+    @author: Alexis de Lattre <[e-mail]>
+    The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+<record id="project_action_item_form" model="ir.ui.view">
+    <field name="name">project_action_item.form</field>
+    <field name="model">project.action.item</field>
+    <field name="arch" type="xml">
+        <form string="Action Item" version="7.0">
+            <header>
+                <button name="%(project_action_item_timesheet_action)d"
+                    type="action" string="Mark as Done with Timesheet"
+                    class="oe_highlight" states="todo,progress"
+                    context="{'action_item_completed': True}"/>
+                <button name="%(project_action_item_timesheet_action)d"
+                    type="action" string="Mark as Progress with Timesheet"
+                    class="oe_highlight" states="todo,progress"
+                    context="{'action_item_completed': False}" />
+                <button name="set_to_progress" type="object"
+                    string="Mark as In Progress" states="todo"/>
+                <button name="set_to_done" type="object"
+                    string="Mark as Done" states="todo,progress"/>
+                <button name="back_to_todo" type="object"
+                    string="Back to To Do" states="done,progress"/>
+                <field name="state" widget="statusbar"/>
+            </header>
+            <group name="main">
+                <field name="project_id"
+                    invisible="not context.get('project_action_item_main_view')"/>
+                <field name="task_id"
+                    invisible="not context.get('project_action_item_main_view')"/>
+                <field name="name" widget="text"/>
+                <field name="date_deadline"/>
+                <field name="date_done" states="done"/>
+                <field name="estimated_hours" widget="float_time"/>
+                <field name="timesheet_hours" widget="float_time"/>
+                <field name="user_id"/>
+                <field name="to_invoice"/>
+                <field name="create_date"/>
+                <field name="create_uid"/>
+                <field name="sequence" invisible="1"/>
+            </group>
+            <group main="timesheet" string="Timesheets">
+                <field name="timesheet_ids" nolabel="1"/>
+            </group>
+        </form>
+    </field>
+</record>
+
+<record id="project_action_item_tree" model="ir.ui.view">
+    <field name="name">project_action_item.tree</field>
+    <field name="model">project.action.item</field>
+    <field name="arch" type="xml">
+        <tree string="Action Items" editable="bottom" colors="blue:state=='todo';grey:state=='progress'">
+            <field name="name"/>
+            <field name="project_id"
+                invisible="not context.get('project_action_item_main_view')"/>
+            <field name="task_id"
+                invisible="not context.get('project_action_item_main_view')"/>
+            <field name="date_deadline"/>
+            <field name="user_id"/>
+            <field name="estimated_hours"
+                widget="float_time" sum="Total Estimated Hours"/>
+            <field name="timesheet_hours"
+                widget="float_time" sum="Total Estimated Hours"/>
+            <field name="to_invoice"/>
+            <button name="%(project_action_item_timesheet_action)d"
+                type="action" string="Progress" states="todo,progress"
+                icon="gtk-go-forward"
+                context="{'action_item_completed': False}"/>
+            <button name="action_item_done_with_timesheet_wizard"
+                type="object" icon="terp-gtk-jump-to-ltr" string="Done"
+                states="todo,progress"/>
+            <field name="state"/>
+            <field name="sequence" invisible="1"/>
+        </tree>
+    </field>
+</record>
+
+<record id="project_action_item_search" model="ir.ui.view">
+    <field name="name">project_action_item.search</field>
+    <field name="model">project.action.item</field>
+    <field name="arch" type="xml">
+        <search string="Search Action Items">
+            <field name="name" />
+            <filter name="my_action_items_to_work"
+                string="My Action Items To Work On"
+                domain="[('user_id', '=', uid), ('state', 'in', ('todo', 'progress'))]"/>
+            <filter name="my_action_items" string="My Action Items"
+                domain="[('user_id', '=', uid)]"/>
+            <filter name="to_work" string="To Work On"
+                domain="[('state', 'in', ('todo', 'progress'))]" />
+            <filter name="done" string="Done"
+                domain="[('state', '=', 'done')]" />
+            <group string="Group By..." name="groupby">
+                <filter name="user_id_groupby" string="User"
+                    context="{'group_by': 'user_id'}"/>
+                <filter name="task_groupby" string="Task"
+                    context="{'group_by': 'task_id'}"/>
+            </group>
+        </search>
+    </field>
+</record>
+
+<record id="project_action_item_action" model="ir.actions.act_window">
+    <field name="name">Action Items</field>
+    <field name="res_model">project.action.item</field>
+    <field name="view_type">form</field>
+    <field name="view_mode">tree,form</field>
+    <field name="context">{'project_action_item_main_view': True, 'search_default_my_action_items_to_work': 1}</field>
+</record>
+
+
+<menuitem id="project_action_item_menu" action="project_action_item_action"
+    parent="project.menu_project_management" sequence="11"/>
+
+<!-- add todo action items on tasks -->
+<record id="view_task_form2" model="ir.ui.view">
+    <field name="name">add.action.items.on.tasks.form</field>
+    <field name="model">project.task</field>
+    <field name="inherit_id" ref="project.view_task_form2"/>
+    <field name="arch" type="xml">
+        <field name="work_ids" position="before">
+            <group name="to_work_action_items" string="Action Items To Work On">
+                <field name="to_work_action_item_ids" nolabel="1"/>
+            </group>
+            <separator string="Timesheets" />
+        </field>
+    </field>
+</record>
+
+<!-- add link to action item on timesheet -->
+<record id="hr_timesheet_line_form" model="ir.ui.view">
+    <field name="name">add.action.items.on.timesheet.form</field>
+    <field name="model">hr.analytic.timesheet</field>
+    <field name="inherit_id" ref="hr_timesheet_task.hr_timesheet_line_form"/>
+    <field name="arch" type="xml">
+        <field name="task_id" position="after">
+            <field name="action_item_id"/>
+        </field>
+    </field>
+</record>
+
+</data>
+</openerp>

=== added directory 'project_action_item/security'
=== added file 'project_action_item/security/ir.model.access.csv'
--- project_action_item/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ project_action_item/security/ir.model.access.csv	2014-05-05 12:05:37 +0000
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_project_action_item_user,Full access on action items to Project Users,model_project_action_item,project.group_project_user,1,1,1,1

=== added directory 'project_action_item/static'
=== added directory 'project_action_item/static/src'
=== added directory 'project_action_item/static/src/img'
=== added directory 'project_action_item/static/src/img/screenshots'
=== added file 'project_action_item/static/src/img/screenshots/create_timesheet_from_action_item_wizard.jpg'
Binary files project_action_item/static/src/img/screenshots/create_timesheet_from_action_item_wizard.jpg	1970-01-01 00:00:00 +0000 and project_action_item/static/src/img/screenshots/create_timesheet_from_action_item_wizard.jpg	2014-05-05 12:05:37 +0000 differ
=== added file 'project_action_item/static/src/img/screenshots/task_with_action_items.jpg'
Binary files project_action_item/static/src/img/screenshots/task_with_action_items.jpg	1970-01-01 00:00:00 +0000 and project_action_item/static/src/img/screenshots/task_with_action_items.jpg	2014-05-05 12:05:37 +0000 differ
=== added directory 'project_action_item/wizard'
=== added file 'project_action_item/wizard/__init__.py'
--- project_action_item/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ project_action_item/wizard/__init__.py	2014-05-05 12:05:37 +0000
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Project Action Item module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import update_action_generate_timesheet

=== added file 'project_action_item/wizard/update_action_generate_timesheet.py'
--- project_action_item/wizard/update_action_generate_timesheet.py	1970-01-01 00:00:00 +0000
+++ project_action_item/wizard/update_action_generate_timesheet.py	2014-05-05 12:05:37 +0000
@@ -0,0 +1,137 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Project Action Item module for OpenERP
+#    Copyright (C) 2014 Akretion (http://www.akretion.com)
+#    @author Alexis de Lattre <[e-mail]>
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+from openerp.tools.translate import _
+
+
+class project_action_item_timesheet(orm.TransientModel):
+    _name = 'project.action.item.timesheet'
+    _description = 'Update Action Item and Create Timesheet Line'
+
+    _columns = {
+        'date': fields.date('Date', required=True),
+        'user_id': fields.many2one('res.users', 'User', required=True),
+        'hours': fields.float('Worked Hours'),
+        'name': fields.char('Work Description', size=256, required=True),
+        'to_invoice': fields.many2one(
+            'hr_timesheet_invoice.factor', 'Timesheet Invoicing Ratio'),
+        'completed': fields.boolean('Action Item Completed'),
+        }
+
+    def default_get(self, cr, uid, fields_list, context=None):
+        if context is None:
+            context = {}
+        active_id = context.get('active_id')
+        res = {}
+        if active_id:
+            item = self.pool['project.action.item'].browse(
+                cr, uid, active_id, context=context)
+            if not item.task_id:
+                raise orm.except_orm(
+                    _('Error:'),
+                    _("This action item is not linked to a task, "
+                        "so we cannot generate a timesheet from it."))
+            remaining = item.estimated_hours - item.timesheet_hours
+            if remaining < 0:
+                remaining = 0
+            res = {
+                'name': item.name,
+                'quantity': remaining,
+                'to_invoice': item.to_invoice.id or False,
+            }
+        res.update({
+            'user_id': uid,
+            'date': fields.date.context_today(self, cr, uid, context=context),
+            'completed': context.get('action_item_completed'),
+            })
+        return res
+
+    def _prepare_timesheet(self, cr, uid, action_item, wizard, context=None):
+        task_id = action_item.task_id.id
+        to_invoice = wizard.to_invoice.id or False
+        res_user = self.pool['hr.analytic.timesheet'].on_change_user_id(
+            cr, uid, False, context['user_id'])
+        journal_id = res_user['value']['journal_id']
+        product_id = res_user['value']['product_id']
+        res_unit = self.pool['hr.analytic.timesheet'].on_change_unit_amount(
+            cr, uid, False, product_id, wizard.hours, False, unit=False,
+            journal_id=journal_id, task_id=task_id, to_invoice=to_invoice,
+            context=context)
+        res_unit['value'].update({
+            'name': wizard.name,
+            'date': wizard.date,
+            'user_id': wizard.user_id.id,
+            'unit_amount': wizard.hours,
+            'journal_id': journal_id,
+            'task_id': task_id,
+            'to_invoice': to_invoice,
+            'action_item_id': action_item.id,
+            })
+        return res_unit['value']
+
+    def _prepare_action_item_update(
+            self, cr, uid, action_item, wizard, context=None):
+        if wizard.completed:
+            res = {
+                'state': 'done',
+                'date_done': wizard.date,
+                }
+        else:
+            res = {'state': 'progress'}
+        return res
+
+    def update_action_create_timesheet(self, cr, uid, ids, context=None):
+        assert len(ids) == 1, "Only one ID"
+        wizard = self.browse(cr, uid, ids[0], context=context)
+        if context is None:
+            context = {}
+        action_item_id = context['active_id']
+        ts_ctx = context.copy()
+        ts_ctx['user_id'] = wizard.user_id.id
+        action_item_obj = self.pool['project.action.item']
+        action_item = action_item_obj.browse(
+            cr, uid, action_item_id, context=context)
+        ts_vals = self._prepare_timesheet(
+            cr, uid, action_item, wizard, context=ts_ctx)
+        self.pool['hr.analytic.timesheet'].create(
+            cr, uid, ts_vals, context=ts_ctx)
+        action_vals = self._prepare_action_item_update(
+            cr, uid, action_item, wizard, context=context)
+        self.pool['project.action.item'].write(
+            cr, uid, action_item_id, action_vals, context=context)
+        if context.get('project_action_item_main_view'):
+            res = True
+        else:
+            # refresh the view of the task after completion of the wizard
+            res = {
+                'name': _('Task'),
+                'type': 'ir.actions.act_window',
+                'res_model': 'project.task',
+                'view_type': 'form',
+                'view_mode': 'form,tree,kanban,calendar,gantt,graph',
+                'nodestroy': False,
+                'target': 'current',
+                'res_id': action_item.task_id.id,
+                'context': context,
+                }
+        return res

=== added file 'project_action_item/wizard/update_action_generate_timesheet_view.xml'
--- project_action_item/wizard/update_action_generate_timesheet_view.xml	1970-01-01 00:00:00 +0000
+++ project_action_item/wizard/update_action_generate_timesheet_view.xml	2014-05-05 12:05:37 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2014 Akretion (http://www.akretion.com/)
+    @author: Alexis de Lattre <[e-mail]>
+    The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+<record id="project_action_item_timesheet_form" model="ir.ui.view">
+    <field name="name">project_action_item_timesheet.form</field>
+    <field name="model">project.action.item.timesheet</field>
+    <field name="arch" type="xml">
+        <form string="Update Action Item and Create Timesheet Line" version="7.0">
+            <group name="main">
+                <field name="name" widget="text"/>
+                <field name="date"/>
+                <field name="hours" widget="float_time"/>
+                <field name="user_id"/>
+                <field name="to_invoice"/>
+                <field name="completed"/>
+            </group>
+            <footer>
+                <button name="update_action_create_timesheet" type="object"
+                    string="Update Action and Create Timesheet" class="oe_highlight"/>
+                <button special="cancel" string="Cancel" class="oe_link"/>
+            </footer>
+        </form>
+    </field>
+</record>
+
+<record id="project_action_item_timesheet_action" model="ir.actions.act_window">
+    <field name="name">Update Action Item and Create Timesheet Line</field>
+    <field name="res_model">project.action.item.timesheet</field>
+    <field name="view_type">form</field>
+    <field name="view_mode">form</field>
+    <field name="target">new</field>
+</record>
+
+</data>
+</openerp>