Merge lp:~acsone-openerp/hr-timesheet/migration_hr_timesheet_taskV7 into lp:~hr-core-editors/hr-timesheet/7.0

[Laetitia Gangloff (Acsone)]

Migration of the module hr_timesheet_task and following improvement:

-Add task column in "My Current Timesheet" view (updating existing qweb/js/css).

-In hr_analytic_timesheet_view.xml remove hr_timesheet.hr_timesheet_line_search record because it is already done in hr_timesheet_invoice (herited from timesheet_task).

-In task_id domain add ('project_id.analytic_account_id','=',account_id) to filter on task related to the selected project.

[lp:~acsone-openerp/hr-timesheet/migration_hr_timesheet_taskV7]

43. By Stéphane Bidoul (Acsone) on 2013-03-26

[FIX] restore filters and change their labels now that we have more room in the new search widget

44. By Stéphane Bidoul (Acsone) on 2013-03-26

[IMP] remove tabs and cleanup whitespace, clarify comments and rename a variable for clarity

[Stéphane Bidoul (Acsone) (sbi)]

I pushed a fix to restore and slightly improve the Current Year/Month/Week filters.

I did manual testing and it works fine.

The code in timesheet.js is duplicating a lot of code of hr_timesheet_sheet, but there is no other way around unless proper hooks are inserted upstream.

review: Approve (approve)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Hello,

There are some cleaning that could be done in .py files

-> Remove osv.memory
import orm and use orm.TransiantModel instead

from openerp.osv import osv, orm

class MyWizard(orm.TransientModel):

-> Remove useless class instantiations
like on l516 remove the "ProjectTask()".

And in XML, it would better to use simpler relative xpath when possible
like l535 could be "///field[@name='work_ids']" (if it had been done previously the change wouldn't have been needed)

Thanks

review: Needs Fixing (code)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

///field[@name='work_ids'] is //field[@name='work_ids'] :)

[lp:~acsone-openerp/hr-timesheet/migration_hr_timesheet_taskV7]

45. By Laetitia Gangloff (Acsone) on 2013-03-28

hr_timesheet_task/timesheet_task: replace some xpath by field in view. remove instanciation from project_task.py. Remove unused wizard and tmp_file. Rename aa_ids in timesheet_ids. Correct some issues with work_ids. Add french translation.

46. By Laetitia Gangloff (Acsone) on 2013-03-28

timesheet_task/hr_timesheet_task: correct label in translation. Cosmetic change in openerp.py

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

Hello,

we remove wizard from hr_timesheet_task because it is never used (not in __init__.py), and tmp_file from timesheet_task.
We remove useless class instantiations in project_task.py.
we change xpath to have a more readable and maintainable view.
we correct some problems with the work_ids (renamed in timesheet_ids).
we add french translations.

Regards

[Stéphane Bidoul (Acsone) (sbi)]

review: Approve (code and test)

[Stéphane Bidoul (Acsone) (sbi)]

Hi Laetitia,

Can you add a comment to clarify the purpose and behavior of this code.
This looks tricky enough to warrant some comments :)

for col in ['effective_hours', 'planned_hours', 'total_hours', 'progress_rate']:
   assert project.project._columns[col].store['project.task'][1][2] == 'work_ids', _('work_ids seems to be not present in project.project')
   project.project._columns[col].store['project.task'][1][2] = 'timesheet_ids'

Nitpicking: redundant code in copy_data:

+ if default is None:
+ default = {}
+ default = default or {}

review: Needs Fixing (code)

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

The goal of timesheet_task is to replace projeck.task.work with aa lines.
In original __openerp__:
'description': """Replace project.task.work items linked to task
                   with hr.analytic.timesheet""",

We do not want to add a new relation named timesheet_ids. The goal is replace this base behavior else you have to maintain two vision of working and add a second set of indicator. I do not say that keeping work done + timesheet line relation is not a valid approach but it does not fit the original goal of the addon who was to get rid of project.task.work by replacing the relation.

review: Needs Fixing

[Stéphane Bidoul (Acsone) (sbi)]

Hi Nicolas,

The goal is not to add a new relation but indeed redefine work_ids to become a relation to hr.analytic.timesheet.

In the previous version, this was done by redefining work_ids, but OpenERP 7.0 now complains about this (see comments from Laetitia there: https://code.launchpad.net/~laetitia-gangloff/hr-timesheet/migrationV7/+merge/148260). Maybe this new behaviour of 7.0 can be considered a bug?

This is the reason we have to create this new field (and sort-of depreate work_ids).

Best regards,

-sbi

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello,

Ok I see your point that is an annoying bug, I will propose to try to replace the view in XML instead of inheriting it and ensure it has a low priority. Eventually we can keep the inherit. I know it is a little nasty but I don't think there is a simple way to fix the root bug.

Regards

Nicolas

[lp:~acsone-openerp/hr-timesheet/migration_hr_timesheet_taskV7]

47. By Laetitia Gangloff (Acsone) on 2013-04-03

in timesheet_task replace XML view instead of inherited it.

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

Hello,

as you suggested, I replace the view instead of inheritting it.
In addition, I kept work_ids instead of a timesheet_ids.

Thanks

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Thanks for the work

I think you should just change the inheritances of deprecated alias osv.osv
On l864, l919, l928

And other to be removed as well if it exists

See osv.py
-----------------
# deprecated - for backward compatibility.
osv = Model
osv_memory = TransientModel
osv_abstract = AbstractModel # ;-)
-----------------

http://help.openerp.com/question/8112/about-deprecated-models-in-v7/

So you need to use orm.Model and for me we are good there.

The license could also be changed to AGPL if you have the time to do it.

Otherwise it's look good

Thanks

review: Needs Fixing

[lp:~acsone-openerp/hr-timesheet/migration_hr_timesheet_taskV7]

48. By Laetitia Gangloff (Acsone) on 2013-04-03

in project_task used osv.Model instead of osv.osv. Update licence part.

49. By Laetitia Gangloff (Acsone) on 2013-04-03

in project_task used orm.Model instead of osv.Model.

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

I use orm.Model instead of osv.osv and I try to update licence part.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Ok thanks for your changes

LGTM now :)

review: Approve (code)

[Stéphane Bidoul (Acsone) (sbi)]

review: Approve (code & test)

[Stéphane Bidoul (Acsone) (sbi)]

If there are no more comments, can someone with commit rights merge this one?

We have some additional improvements we would like to propose, but these are separate from the v7 migration and will be part of another MP on top of this one.

Thanks,

-sbi

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Done

=== modified file 'hr_timesheet_task/__init__.py'
--- hr_timesheet_task/__init__.py	2012-06-06 13:14:12 +0000
+++ hr_timesheet_task/__init__.py	2013-04-03 11:31:22 +0000
@@ -1,30 +1,20 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Joel Grand-guillaume (Camptocamp)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Author : Joel Grand-guillaume (Camptocamp)
+#    Copyright 2013 Camptocamp SA
+#
+#    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/>.
 #
 ##############################################################################

=== modified file 'hr_timesheet_task/__openerp__.py'
--- hr_timesheet_task/__openerp__.py	2012-12-13 12:20:12 +0000
+++ hr_timesheet_task/__openerp__.py	2013-04-03 11:31:22 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Author: Nicolas Bessi
-#    Copyright 2012 Camptocamp SA
+#    Copyright 2013 Camptocamp SA
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,21 +19,25 @@
 #
 ##############################################################################
 {'name' : 'Task in time sheet',
- 'version' : '0.1',
+ 'version' : '0.2',
  'author' : 'Camptocamp',
- 'maintainer': 'Camptocamp',
+ 'maintainer': 'Camptocamp - Acsone SA/NV',
  'category': 'Human Resources',
- 'complexity': "normal", #easy, normal, expert
  'depends' : ['timesheet_task', 'hr_timesheet_sheet'],
  'description': """Replace project.task.work items linked to task
                    with hr.analytic.timesheet""",
  'website': 'http://www.camptocamp.com',
- 'init_xml': [],
- 'update_xml': ['hr_timesheet_sheet_view.xml', 'hr_analytic_timesheet_view.xml'],
- 'demo_xml': [],
- 'tests': [],
- 'installable': False,
+ 'data': ['hr_timesheet_sheet_view.xml', 'hr_analytic_timesheet_view.xml'],
+ 'js' : ['static/src/js/timesheet.js'],
+ 'css': ['static/src/css/timesheet.css',],
+ 'qweb': ['static/src/xml/timesheet.xml'],
+ 'demo': [],
+ 'test': [],
+ 'installable': True,
  'images' : [],
  'auto_install': False,
  'license': 'AGPL-3',
- 'application': True}
\ No newline at end of file
+ 'application': True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'hr_timesheet_task/hr_analytic_timesheet_view.xml'
--- hr_timesheet_task/hr_analytic_timesheet_view.xml	2012-10-23 15:06:03 +0000
+++ hr_timesheet_task/hr_analytic_timesheet_view.xml	2013-04-03 11:31:22 +0000
@@ -9,10 +9,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/group/field[@name='user_id']" position="after">
+                <field name="user_id" position="after">
                     <field name="task_id" context="{ 'account_id' : account_id}"
-                        domain="[('state','=','open')]"/>
-                </xpath>
+                        domain="[('state','=','open'), ('project_id.analytic_account_id','=',account_id)]"/>
+                </field>
             </field>
         </record>
         <record id="hr_timesheet.hr_timesheet_line_tree" model="ir.ui.view">
@@ -25,7 +25,7 @@
                     <field name="date" on_change="on_change_date(date)"/>
                     <field domain="[('type','=','normal')]" name="account_id"/>
                     <field name="task_id" context="{'account_id' : account_id}"
-                        domain="[('state','=','open')]"/>
+                        domain="[('state','=','open'), ('project_id.analytic_account_id','=',account_id)]"/>
                     <field name="name"/>
                     <field name="unit_amount"
                         on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id, journal_id)"
@@ -52,9 +52,9 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <xpath expr="/search/group/field[@name='date']" position="after">
+                <field name="date" position="after">
                     <field name="task_id"/>
-                </xpath>
+                </field>
                 <xpath
                     expr="/search/group[@string='Group By...']/filter[@string='Analytic account']"
                     position="after">
@@ -62,16 +62,17 @@
                     />
                 </xpath>
                 <!-- Add dates filter -->
-                <xpath expr="/search/group/filter[@name='today']" position="before">
-                    <filter icon="terp-go-year" string="  Year  "
+                <xpath expr="/search/group" position="before">
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-go-year" string="Current Year"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                         help="Current Year"/>
-                    <filter icon="terp-go-month" string="   Month   " name="month"
-                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                    <filter icon="terp-go-month" string="Current Month" name="month"
+                        domain="[('date','&lt;=',(context_today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(context_today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Current Month"/>
-                    <filter icon="terp-go-week" string="    Week    " separator="1" name="week"
-                        domain="[('date','&gt;=',(datetime.date.today()+relativedelta(days=-6,weekday=0)).strftime('%%Y-%%m-%%d')),('date','&lt;=',(datetime.date.today()+relativedelta(weekday=6)).strftime('%%Y-%%m-%%d'))]"
-                        help="Current week"/>
+                    <filter icon="terp-go-week" string="Current Week" separator="1" name="week"
+                        domain="[('date','&gt;=',(context_today()+relativedelta(days=-6,weekday=0)).strftime('%%Y-%%m-%%d')),('date','&lt;=',(context_today()+relativedelta(weekday=6)).strftime('%%Y-%%m-%%d'))]"
+                        help="Current Week"/>
                 </xpath>
 
             </field>
@@ -80,19 +81,5 @@
         <record id="hr_timesheet.act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
             <field name="context">{"search_default_user_id":uid, "search_default_week":1}</field>
         </record>
-        <record id="hr_timesheet_line_search_to_invoice_filter" model="ir.ui.view">
-            <field name="name">hr.analytic.timesheet.search.toinvoice.filter</field>
-            <field name="model">hr.analytic.timesheet</field>
-            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <xpath expr="/search/group[1]/filter[@name='today']" position="after">
-                    <separator orientation="vertical"/>
-                    <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}"
-                        domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]"
-                        icon="terp-dolar"/>
-                </xpath>
-            </field>
-        </record>
     </data>
 </openerp>

=== modified file 'hr_timesheet_task/hr_timesheet_sheet_view.xml'
--- hr_timesheet_task/hr_timesheet_sheet_view.xml	2012-10-23 15:06:03 +0000
+++ hr_timesheet_task/hr_timesheet_sheet_view.xml	2013-04-03 11:31:22 +0000
@@ -1,27 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record id="view_hr_timesheet_sheet_filter_custom" model="ir.ui.view">
             <field name="name">hr_timesheet_sheet.sheet.filter</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
             <field name="inherit_id" ref="hr_timesheet_sheet.view_hr_timesheet_sheet_filter"/>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <xpath expr="/search/group/filter[@string='To Approve']" position="after">
+                <filter name="to_approve" position="after">
                     <separator orientation="vertical"/>
-                    <filter icon="terp-go-year" string="  Year  "
+                    <filter icon="terp-go-year" string="Current Year"
                         domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_from','&gt;=',time.strftime('%%Y-01-01'))]"
                         help="Current Year"/>
-                    <filter icon="terp-go-month" string="   Month   " name="month"
-                        domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                    <filter icon="terp-go-month" string="Current Month" name="month"
+                        domain="[('date_from','&lt;=',(context_today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(context_today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Current Month"/>
-                    <filter icon="terp-go-week" string="    Week    " separator="1" name="week"
-                        domain="[('date_from','&gt;=',(datetime.date.today()+relativedelta(days=-6,weekday=0)).strftime('%%Y-%%m-%%d')),('date_from','&lt;=',(datetime.date.today()+relativedelta(weekday=6)).strftime('%%Y-%%m-%%d'))]"
-                        help="Current week"/>
-                </xpath>
+                    <filter icon="terp-go-week" string="Current Week" separator="1" name="week"
+                        domain="[('date_from','&gt;=',(context_today()+relativedelta(days=-6,weekday=0)).strftime('%%Y-%%m-%%d')),('date_from','&lt;=',(context_today()+relativedelta(weekday=6)).strftime('%%Y-%%m-%%d'))]"
+                        help="Current Week"/>
+                </filter>
 
             </field>
         </record>
+
         <record id="hr_timesheet_sheet.act_hr_timesheet_sheet_form" model="ir.actions.act_window">
             <field name="context">{'search_default_my_timesheet':1}</field>
         </record>
@@ -32,16 +34,16 @@
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
                 <xpath
-                    expr="/form/notebook/page[@string='Daily']/field[@name='timesheet_ids']/tree[@string='Timesheet Lines']/field[@name='account_id']"
+                    expr="/form/sheet/notebook/page[@string='Details']/field[@name='timesheet_ids']/tree[@string='Timesheet Activities']/field[@name='account_id']"
                     position="after">
                     <field name="task_id" context="{'account_id' : account_id}"
-                        domain="[('state','=','open')]"/>
+                        domain="[('state','=','open'), ('project_id.analytic_account_id','=',account_id)]"/>
                 </xpath>
                 <xpath
-                    expr="/form/notebook/page[@string='Daily']/field[@name='timesheet_ids']/form[@string='Timesheet Lines']/field[@name='account_id']"
+                    expr="/form/sheet/notebook/page[@string='Details']/field[@name='timesheet_ids']/form[@string='Timesheet Activities']/field[@name='account_id']"
                     position="after">
                     <field name="task_id" context="{'account_id' : account_id}"
-                        domain="[('state','=','open')]"/>
+                        domain="[('state','=','open'), ('project_id.analytic_account_id','=',account_id)]"/>
                 </xpath>
             </field>
         </record>

=== added directory 'hr_timesheet_task/i18n'
=== added file 'hr_timesheet_task/i18n/fr.po'
--- hr_timesheet_task/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ hr_timesheet_task/i18n/fr.po	2013-04-03 11:31:22 +0000
@@ -0,0 +1,42 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* hr_timesheet_task
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-28 15:37+0000\n"
+"PO-Revision-Date: 2013-03-28 15:37+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: hr_timesheet_task
+#: view:hr.analytic.timesheet:0
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Current Week"
+msgstr "Semaine en cours"
+
+#. module: hr_timesheet_task
+#: view:hr.analytic.timesheet:0
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Current Year"
+msgstr "Année en cours"
+
+#. module: hr_timesheet_task
+#. openerp-web
+#: code:addons/hr_timesheet_task/static/src/xml/timesheet.xml:8
+#: view:hr.analytic.timesheet:0
+#, python-format
+msgid "Task"
+msgstr "Tâche"
+
+#. module: hr_timesheet_task
+#: view:hr.analytic.timesheet:0
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Current Month"
+msgstr "Mois en cours"

=== added directory 'hr_timesheet_task/static'
=== added directory 'hr_timesheet_task/static/src'
=== added directory 'hr_timesheet_task/static/src/css'
=== added file 'hr_timesheet_task/static/src/css/timesheet.css'
--- hr_timesheet_task/static/src/css/timesheet.css	1970-01-01 00:00:00 +0000
+++ hr_timesheet_task/static/src/css/timesheet.css	2013-04-03 11:31:22 +0000
@@ -0,0 +1,7 @@
+@charset "utf-8";
+.openerp .oe_timesheet_weekly .oe_timesheet_weekly_task {
+  text-align: left;
+}
+.openerp .oe_timesheet_weekly .oe_timesheet_task_col {
+  text-align: left;
+}
\ No newline at end of file

=== added directory 'hr_timesheet_task/static/src/js'
=== added file 'hr_timesheet_task/static/src/js/timesheet.js'
--- hr_timesheet_task/static/src/js/timesheet.js	1970-01-01 00:00:00 +0000
+++ hr_timesheet_task/static/src/js/timesheet.js	2013-04-03 11:31:22 +0000
@@ -0,0 +1,252 @@
+openerp.hr_timesheet_task = function(instance) { 
+
+    var module = instance.hr_timesheet_sheet
+
+    module.WeeklyTimesheet.include({
+        events: {
+            "click .oe_timesheet_weekly_account a": "go_to",
+            "click .oe_timesheet_weekly_task a": "go_to_task",
+        },
+        go_to_task : function(event) {
+            var id = JSON.parse($(event.target).data("task-id"));
+            this.do_action({
+                type: 'ir.actions.act_window',
+                res_model: "project.task",
+                res_id: id,
+                views: [[false, 'form']],
+                target: 'current'
+            });
+        },
+        initialize_content: function() {
+            var self = this;
+            if (self.setting)
+                return;
+            // don't render anything until we have date_to and date_from
+            if (!self.get("date_to") || !self.get("date_from"))
+                return;
+            this.destroy_content();
+
+            // it's important to use those vars to avoid race conditions
+            var dates;
+            var accounts;
+            var account_names;
+            var task_names;
+            var default_get;
+            return this.render_drop.add(new instance.web.Model("hr.analytic.timesheet").call("default_get", [
+                ['account_id','task_id','general_account_id','journal_id','date','name','user_id','product_id','product_uom_id','to_invoice','amount','unit_amount'],
+                new instance.web.CompoundContext({'user_id': self.get('user_id')})]).then(function(result) {
+                default_get = result;
+                // calculating dates
+                dates = [];
+                var start = self.get("date_from");
+                var end = self.get("date_to");
+                while (start <= end) {
+                    dates.push(start);
+                    start = start.clone().addDays(1);
+                }
+
+                timesheet_lines = _(self.get("sheets")).chain()
+                .map(function(el) {
+                    // much simpler to use only the id in all cases
+                    if (typeof(el.account_id) === "object")
+                        el.account_id = el.account_id[0];
+                    if (typeof(el.task_id) === "object")
+                        el.task_id = el.task_id[0];
+                    return el;
+                }).value();
+
+                // group by account
+                var timesheet_lines_by_account_id = _.groupBy(timesheet_lines, function(el) {
+                    return el.account_id;
+                });
+
+                // group by account and task
+                var timesheet_lines_by_account_id_task_id = _.groupBy(timesheet_lines, function(el) {
+                    return [el.account_id, el.task_id];
+                });
+
+                var account_ids = _.map(_.keys(timesheet_lines_by_account_id), function(el) { return el === "false" ? false : Number(el) });
+
+                return new instance.web.Model("hr.analytic.timesheet").call("multi_on_change_account_id", [[], account_ids,
+                    new instance.web.CompoundContext({'user_id': self.get('user_id')})]).then(function(accounts_defaults) {
+                    accounts = _(timesheet_lines_by_account_id_task_id).chain().map(function(lines, account_id_task_id) {
+                        account_defaults = _.extend({}, default_get, (accounts_defaults[lines[0].account_id] || {}).value || {});
+                        // group by days
+                        var index = _.groupBy(lines, "date");
+                        var days = _.map(dates, function(date) {
+                            var day = {day: date, lines: index[instance.web.date_to_str(date)] || []};
+                            // add line where we will insert/remove hours
+                            var to_add = _.find(day.lines, function(line) { return line.name === self.description_line });
+                            if (to_add) {
+                                day.lines = _.without(day.lines, to_add);
+                                day.lines.unshift(to_add);
+                            } else {
+                                day.lines.unshift(_.extend(_.clone(account_defaults), {
+                                    name: self.description_line,
+                                    unit_amount: 0,
+                                    date: instance.web.date_to_str(date),
+                                    account_id: lines[0].account_id,
+                                    task_id: lines[0].task_id,
+                                }));
+                            }
+                            return day;
+                        });
+                        return {account_task: account_id_task_id, account: lines[0].account_id, task: lines[0].task_id, days: days, account_defaults: account_defaults};
+                    }).value();
+
+                    // we need the name_get of the analytic accounts
+                    return new instance.web.Model("account.analytic.account").call("name_get", [_.pluck(accounts, "account"),
+                        new instance.web.CompoundContext()]).then(function(result) {
+                        account_names = {};
+                        _.each(result, function(el) {
+                            account_names[el[0]] = el[1];
+                        });
+                        // we need the name_get of the tasks
+                        return new instance.web.Model("project.task").call("name_get", [_(accounts).chain().pluck("task").filter(function(el) { return el; }).value(),
+                            new instance.web.CompoundContext()]).then(function(result) {
+                            task_names = {};
+                            _.each(result, function(el) {
+                                task_names[el[0]] = el[1];
+                            });
+                            accounts = _.sortBy(accounts, function(el) {
+                                return account_names[el.account];
+                            });
+                        });
+                    });
+                });
+            })).then(function(result) {
+                // we put all the gathered data in self, then we render
+                self.dates = dates;
+                self.accounts = accounts;
+                self.account_names = account_names;
+                self.task_names = task_names;
+                self.default_get = default_get;
+                //real rendering
+                self.display_data();
+            });
+        },
+        init_add_account: function() {
+            var self = this;
+            if (self.dfm)
+                return;
+            self.$(".oe_timesheet_weekly_add_row").show();
+            self.dfm = new instance.web.form.DefaultFieldManager(self);
+            self.dfm.extend_field_desc({
+                account: {
+                    relation: "account.analytic.account",
+                },
+                task: {
+                    relation: "project.task",
+                },
+            });
+            self.account_m2o = new instance.web.form.FieldMany2One(self.dfm, {
+                attrs: {
+                    name: "account",
+                    type: "many2one",
+                    domain: [
+                        ['type','in',['normal', 'contract']],
+                        ['state', '<>', 'close'],
+                        ['use_timesheets','=',1],
+                    ],
+                    context: {
+                        default_use_timesheets: 1,
+                        default_type: "contract",
+                    },
+                    modifiers: '{"required": true}',
+                },
+            });
+            self.task_m2o = new instance.web.form.FieldMany2One(self.dfm, {
+                attrs: {
+                    name: "task",
+                    type: "many2one",
+                    domain: [
+                        // at this moment, it is always an empty list 
+                        ['project_id.analytic_account_id','=',self.account_m2o.get_value()]
+                    ],
+                },
+            });
+            self.task_m2o.prependTo(self.$(".oe_timesheet_weekly_add_row td"));
+            self.account_m2o.prependTo(self.$(".oe_timesheet_weekly_add_row td"));
+
+            // when account_m2o loses focus, value can be changed, 
+            // update task_m2o to show only tasks related to the selected project
+            self.account_m2o.$input.focusout(function(){
+                var account_id = self.account_m2o.get_value();
+                if (account_id === false) { return; }
+                self.task_m2o.init(self.dfm, {
+                    attrs: {
+                        name: "task",
+                        type: "many2one",
+                        domain: [
+                            ['state','=','open'],
+                            // show only tasks linked to the selected project
+                            ['project_id.analytic_account_id','=',account_id],
+                            // ignore tasks already in the timesheet
+                            ['id', 'not in', _.pluck(self.accounts, "task")],
+                        ],
+                        context: {
+                            'account_id': account_id,
+                        },
+                    },
+                });
+            });
+
+            self.$(".oe_timesheet_weekly_add_row button").click(function() {
+                var id = self.account_m2o.get_value();
+                if (id === false) {
+                    self.dfm.set({display_invalid_fields: true});
+                    return;
+                }
+                var ops = self.generate_o2m_value();
+                new instance.web.Model("hr.analytic.timesheet").call("on_change_account_id", [[], id]).then(function(res) {
+                    var def = _.extend({}, self.default_get, res.value, {
+                        name: self.description_line,
+                        unit_amount: 0,
+                        date: instance.web.date_to_str(self.dates[0]),
+                        account_id: id,
+                        task_id: self.task_m2o.get_value(),
+                    });
+                    ops.push(def);
+                    self.set({"sheets": ops});
+                });
+            });
+        },
+        get_box: function(account, day_count) {
+            return this.$('[data-account-task="' + account.account_task + '"][data-day-count="' + day_count + '"]');
+        },
+        get_total: function(account) {
+            return this.$('[data-account-task-total="' + account.account_task + '"]');
+        },
+        generate_o2m_value: function() {
+            var self = this;
+            var ops = [];
+
+            _.each(self.accounts, function(account) {
+                var auth_keys = _.extend(_.clone(account.account_defaults), {
+                    name: true, unit_amount: true, date: true, account_id: true, task_id: true,
+                });
+                _.each(account.days, function(day) {
+                    _.each(day.lines, function(line) {
+                        if (line.unit_amount !== 0) {
+                            var tmp = _.clone(line);
+                            tmp.id = undefined;
+                            _.each(line, function(v, k) {
+                                if (v instanceof Array) {
+                                    tmp[k] = v[0];
+                                }
+                            });
+                            // we have to remove some keys, because analytic lines are shitty
+                            _.each(_.keys(tmp), function(key) {
+                                if (auth_keys[key] === undefined) {
+                                    tmp[key] = undefined;
+                                }
+                            });
+                            ops.push(tmp);
+                        }
+                    });
+                });
+            });
+            return ops;
+        },
+    });
+};

=== added directory 'hr_timesheet_task/static/src/xml'
=== added file 'hr_timesheet_task/static/src/xml/timesheet.xml'
--- hr_timesheet_task/static/src/xml/timesheet.xml	1970-01-01 00:00:00 +0000
+++ hr_timesheet_task/static/src/xml/timesheet.xml	2013-04-03 11:31:22 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates>
+    <t t-extend="hr_timesheet_sheet.WeeklyTimesheet">
+	   
+       <!-- Add a task column -->
+       <t t-jquery="th.oe_timesheet_first_col" t-operation="after">
+            <th class="oe_timesheet_task_col">Task</th>
+        </t>
+
+        <!-- Replace all line created with the foreach to take account of task -->
+        <t t-jquery="tr:not([class]):nth-child(n+2)" t-operation="replace">
+            <tr t-foreach="widget.accounts" t-as="account">
+                <td class="oe_timesheet_weekly_account"><a href="javascript:void(0)" t-att-data-id="JSON.stringify(account.account)"><t t-esc="widget.account_names[account.account]"/></a></td>
+                <td class="oe_timesheet_weekly_task"><a href="javascript:void(0)" t-att-data-task-id="JSON.stringify(account.task)"><t t-esc="widget.task_names[account.task]" /></a></td>
+                <t t-set="day_count" t-value="0"/>
+                <t t-foreach="account.days" t-as="day">
+                    <td t-att-class="(Date.compare(day.day, Date.today()) === 0 ? 'oe_timesheet_weekly_today' : '')">
+                        <input t-if="!widget.get('effective_readonly')" class="oe_timesheet_weekly_input" 
+                            t-att-data-account-task="account.account_task" t-att-data-day-count="day_count" type="text"/>
+                        <span t-if="widget.get('effective_readonly')" class="oe_timesheet_weekly_box" 
+                            t-att-data-account-task="account.account_task" t-att-data-day-count="day_count"/>
+                        <t t-set="day_count" t-value="day_count + 1"/>
+                    </td>
+                </t>
+                <td t-att-data-account-task-total="account.account_task" class="oe_timesheet_total"> </td>
+            </tr>
+        </t>
+
+        <!-- Add line in the last tr before the first element -->
+        <t t-jquery="tr.oe_timesheet_total > td:first-child" t-operation="after">
+            <td> </td>
+        </t>
+    </t>
+</templates>

=== removed directory 'hr_timesheet_task/wizard'
=== removed file 'hr_timesheet_task/wizard/__init__.py'
--- hr_timesheet_task/wizard/__init__.py	2011-08-12 12:53:16 +0000
+++ hr_timesheet_task/wizard/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-import associate_analytic_timesheet
-import dissociate_analytic_timesheet
-import hr_timesheet_invoice_create

=== removed file 'hr_timesheet_task/wizard/associate_analytic_timesheet.py'
--- hr_timesheet_task/wizard/associate_analytic_timesheet.py	2011-08-12 12:53:16 +0000
+++ hr_timesheet_task/wizard/associate_analytic_timesheet.py	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author Guewen Baconnier. Copyright Camptocamp SA
-#
-##############################################################################
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-
-from osv import osv
-
-
-class AssociateInvoice(osv.osv_memory):
-    _inherit = 'associate.aal.to.invoice'
-
-    def associate_aal(self, cr, uid, ids, context):
-        """ If the wizard is called from hr.analytic.timesheet (inherits account.analytic.line)
-            We get the account.analytic.line ids and call the wizard with them """
-        if context.get('active_model', False) == 'hr.analytic.timesheet':
-            at_obj = self.pool.get('hr.analytic.timesheet')
-            at_ids = context.get('active_ids', False)
-            aal_ids = [at.line_id.id for at in at_obj.browse(cr, uid, at_ids, context)]
-            context['active_ids'] = aal_ids
-
-        return super(AssociateInvoice, self).associate_aal(cr, uid, ids, context)
-
-AssociateInvoice()

=== removed file 'hr_timesheet_task/wizard/dissociate_analytic_timesheet.py'
--- hr_timesheet_task/wizard/dissociate_analytic_timesheet.py	2011-08-12 12:53:16 +0000
+++ hr_timesheet_task/wizard/dissociate_analytic_timesheet.py	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author Guewen Baconnier. Copyright Camptocamp SA
-#
-##############################################################################
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-
-from osv import osv
-
-
-class DissociateInvoice(osv.osv_memory):
-    _inherit = 'dissociate.aal.to.invoice'
-
-    def dissociate_aal(self, cr, uid, ids, context):
-        """ If the wizard is called from hr.analytic.timesheet (inherits account.analytic.line)
-            We get the account.analytic.line ids and call the wizard with them """
-        if context.get('active_model', False) == 'hr.analytic.timesheet':
-            at_obj = self.pool.get('hr.analytic.timesheet')
-            at_ids = context.get('active_ids', False)
-            aal_ids = [at.line_id.id for at in at_obj.browse(cr, uid, at_ids, context)]
-            context['active_ids'] = aal_ids
-        return super(DissociateInvoice, self).dissociate_aal(cr, uid, ids, context)
-
-DissociateInvoice()

=== removed file 'hr_timesheet_task/wizard/hr_timesheet_invoice_create.py'
--- hr_timesheet_task/wizard/hr_timesheet_invoice_create.py	2011-08-12 12:53:16 +0000
+++ hr_timesheet_task/wizard/hr_timesheet_invoice_create.py	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author Guewen Baconnier. Copyright Camptocamp SA
-#
-##############################################################################
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-from osv import osv
-
-
-class hr_timesheet_invoice_create(osv.osv_memory):
-    _inherit = 'hr.timesheet.invoice.create'
-
-    def do_create(self, cr, uid, ids, context=None):
-        """ If the wizard is called from hr.analytic.timesheet (inherits account.analytic.line)
-            We get the account.analytic.line ids and call the wizard with them """
-        if context.get('active_model', False) == 'hr.analytic.timesheet':
-            at_obj = self.pool.get('hr.analytic.timesheet')
-            at_ids = context.get('active_ids', False)
-            aal_ids = [at.line_id.id for at in at_obj.browse(cr, uid, at_ids, context)]
-            context['active_ids'] = aal_ids
-        return super(hr_timesheet_invoice_create, self).do_create(cr, uid, ids, context)
-
-hr_timesheet_invoice_create()

=== removed file 'hr_timesheet_task/wizard/wizard_actions.xml'
--- hr_timesheet_task/wizard/wizard_actions.xml	2011-08-12 12:53:16 +0000
+++ hr_timesheet_task/wizard/wizard_actions.xml	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-
-    <act_window name="Associate Analytic Lines"
-        res_model="associate.aal.to.invoice"
-        src_model="hr.analytic.timesheet"
-        key2="client_action_multi"
-        view_mode="form"
-        view_type="form"
-        target="new"
-        id="action_associate_at_invoice"/>
-
-    <act_window name="Dissociate Analytic Lines"
-        res_model="dissociate.aal.to.invoice"
-        src_model="hr.analytic.timesheet"
-        key2="client_action_multi"
-        view_mode="form"
-        view_type="form"
-        target="new"
-        id="action_dissociate_at_invoice"/>
-
-    <record model="ir.values" id="hr_analytic_timesheet_invoice_create_values">
-        <field name="model_id" ref="model_hr_analytic_timesheet" />
-        <field name="object" eval="1" />
-        <field name="name">Invoice analytic lines</field>
-        <field name="key2">client_action_multi</field>
-        <field name="value" eval="'ir.actions.act_window,' + str(ref('hr_timesheet_invoice.action_hr_timesheet_invoice_create'))" />
-        <field name="key">action</field>
-        <field name="model">hr.analytic.timesheet</field>
-    </record>
-
-</data>
-</openerp>

=== modified file 'timesheet_task/__init__.py'
--- timesheet_task/__init__.py	2012-06-06 13:14:12 +0000
+++ timesheet_task/__init__.py	2013-04-03 11:31:22 +0000
@@ -1,29 +1,21 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# author Nicolas Bessi
-# Copyright Camptocamp 2012
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Author: Nicolas Bessi
+#    Copyright 2013 Camptocamp SA
+#
+#    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_task
\ No newline at end of file

=== modified file 'timesheet_task/__openerp__.py'
--- timesheet_task/__openerp__.py	2012-12-13 12:20:12 +0000
+++ timesheet_task/__openerp__.py	2013-04-03 11:31:22 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Author: Nicolas Bessi
-#    Copyright 2012 Camptocamp SA
+#    Copyright 2013 Camptocamp SA
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,23 +19,22 @@
 #
 ##############################################################################
 {'name' : 'Analytic Task',
- 'version' : '0.1',
+ 'version' : '0.2',
  'author' : 'Camptocamp',
- 'maintainer': 'Camptocamp',
+ 'maintainer': 'Camptocamp - Acsone SA/NV',
  'category': 'Human Resources',
- 'complexity': "normal", #easy, normal, expert
- 'depends' : ['hr_timesheet', 'project', 'hr_timesheet_invoice'],
+ 'depends' : ['project', 'hr_timesheet_invoice'],
  'description': """Replace project.task.work items linked to task
                    with hr.analytic.timesheet""",
  'website': 'http://www.camptocamp.com',
- 'init_xml': [],
- 'update_xml': ['project_task_view.xml'],
- 'demo_xml': [],
- 'tests': [],
- 'installable': False,
+ 'data': ['project_task_view.xml'],
+ 'demo': [],
+ 'test': [],
+ 'installable': True,
  'images' : [],
  'auto_install': False,
  'license': 'AGPL-3',
- 'application': True}
- #'icon': '/MODULE_NAME/static/src/images/XXX.png',
- 
\ No newline at end of file
+ 'application': True,
+}
+ 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'timesheet_task/i18n'
=== added file 'timesheet_task/i18n/fr.po'
--- timesheet_task/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ timesheet_task/i18n/fr.po	2013-04-03 11:31:22 +0000
@@ -0,0 +1,53 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* timesheet_task
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-28 15:26+0000\n"
+"PO-Revision-Date: 2013-03-28 15:26+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: timesheet_task
+#: field:account.analytic.line,task_id:0
+#: model:ir.model,name:timesheet_task.model_project_task
+msgid "Task"
+msgstr "Tâche"
+
+#. module: timesheet_task
+#: model:ir.model,name:timesheet_task.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Ligne analytique"
+
+#. module: timesheet_task
+#: view:project.task:0
+msgid "Total time"
+msgstr "Temps total"
+
+#. module: timesheet_task
+#: view:project.task:0
+msgid "Task Work"
+msgstr "Travail effectué"
+
+#. module: timesheet_task
+#: field:project.task,timesheet_ids:0
+msgid "Work done"
+msgstr "Travail effectué"
+
+#. module: timesheet_task
+#: model:ir.model,name:timesheet_task.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Ligne de prestation"
+
+#. module: timesheet_task
+#: view:project.task:0
+msgid "Total cost"
+msgstr "Coût total"
+

=== modified file 'timesheet_task/project_task.py'
--- timesheet_task/project_task.py	2012-10-26 13:01:39 +0000
+++ timesheet_task/project_task.py	2013-04-03 11:31:22 +0000
@@ -1,38 +1,30 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# author Nicolas Bessi
-# Copyright Camptocamp 2012
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Author: Nicolas Bessi
+#    Copyright 2013 Camptocamp SA
+#
+#    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 osv import osv, fields
+from openerp.osv import orm, fields
 
 TASK_WATCHERS = ['work_ids', 'remaining_hours', 'planned_hours']
-AA_WATCHERS = ['unit_amount', 'product_uom_id', 'account_id', 'to_invoice', 'task_id']
+TIMESHEET_WATCHERS = ['unit_amount', 'product_uom_id', 'account_id', 'to_invoice', 'task_id']
 
-class ProjectTask(osv.osv):
+class ProjectTask(orm.Model):
     _inherit = "project.task"
     _name = "project.task"
 
@@ -53,8 +45,8 @@
             res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
             res[task.id]['progress'] = 0.0
             if (task.remaining_hours + hours.get(task.id, 0.0)):
-                res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2)
-            if task.state in ('done','cancelled'):
+                res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99), 2)
+            if task.state in ('done', 'cancelled'):
                 res[task.id]['progress'] = 100.0
         return res
 
@@ -67,26 +59,27 @@
 
 
     _columns = {'work_ids': fields.one2many('hr.analytic.timesheet', 'task_id', 'Work done'),
+                
 
     'effective_hours': fields.function(_progress_rate, multi="progress", method=True, string='Time Spent',
                                        help="Sum of spent hours of all tasks related to this project and its child projects.",
-                                       store = {'project.task': (lambda self, cr, uid, ids, c={}: ids, TASK_WATCHERS, 20),
-                                                'account.analytic.line': (_get_analytic_line, AA_WATCHERS, 20)}),
+                                       store={'project.task': (lambda self, cr, uid, ids, c={}: ids, TASK_WATCHERS, 20),
+                                                'account.analytic.line': (_get_analytic_line, TIMESHEET_WATCHERS, 20)}),
 
     'delay_hours': fields.function(_progress_rate, multi="progress", method=True, string='Deduced Hours',
                                     help="Sum of spent hours with invoice factor of all tasks related to this project and its child projects.",
-                                    store = {'project.task': (lambda self, cr, uid, ids, c={}: ids, TASK_WATCHERS, 20),
-                                             'account.analytic.line': (_get_analytic_line, AA_WATCHERS, 20)}),
+                                    store={'project.task': (lambda self, cr, uid, ids, c={}: ids, TASK_WATCHERS, 20),
+                                             'account.analytic.line': (_get_analytic_line, TIMESHEET_WATCHERS, 20)}),
 
     'total_hours': fields.function(_progress_rate, multi="progress", method=True, string='Total Time',
                                    help="Sum of total hours of all tasks related to this project and its child projects.",
-                                   store = {'project.task': (lambda self, cr, uid, ids, c={}: ids, TASK_WATCHERS, 20),
-                                            'account.analytic.line': (_get_analytic_line, AA_WATCHERS, 20)}),
+                                   store={'project.task': (lambda self, cr, uid, ids, c={}: ids, TASK_WATCHERS, 20),
+                                            'account.analytic.line': (_get_analytic_line, TIMESHEET_WATCHERS, 20)}),
 
     'progress': fields.function(_progress_rate, multi="progress", method=True, string='Progress', type='float', group_operator="avg",
                                      help="Percent of tasks closed according to the total of tasks todo.",
-                                     store = {'project.task': (lambda self, cr, uid, ids, c={}: ids, TASK_WATCHERS, 20),
-                                              'account.analytic.line': (_get_analytic_line, AA_WATCHERS, 20)})}
+                                     store={'project.task': (lambda self, cr, uid, ids, c={}: ids, TASK_WATCHERS, 20),
+                                              'account.analytic.line': (_get_analytic_line, TIMESHEET_WATCHERS, 20)})}
     
     def write(self, cr, uid, ids, vals, context=None):
         res = super(ProjectTask, self).write(cr, uid, ids, vals, context=context)
@@ -99,9 +92,7 @@
                 ts_obj.write(cr, uid, [w.id for w in task.work_ids], {'account_id': account_id}, context=context)
         return res
 
-ProjectTask()
-
-class HrAnalyticTimesheet(osv.osv):
+class HrAnalyticTimesheet(orm.Model):
     _inherit = "hr.analytic.timesheet"
     _name = "hr.analytic.timesheet"
 
@@ -125,9 +116,7 @@
                     res['value']['to_invoice'] = p.to_invoice.id
         return res
 
-HrAnalyticTimesheet()
-
-class AccountAnalyticLine(osv.osv):
+class AccountAnalyticLine(orm.Model):
     """We add task_id on AA and manage update of linked task indicators"""
     _inherit = "account.analytic.line"
     _name = "account.analytic.line"
@@ -142,7 +131,7 @@
             return 0.0
         fact_obj = self.pool.get('hr_timesheet_invoice.factor')
         factor = 100.0 - float(fact_obj.browse(cr, uid, factor_id).factor)
-        return (float(hours)/100.00)*factor
+        return (float(hours) / 100.00) * factor
 
     def _set_remaining_hours_create(self, cr, uid, vals, context=None):
         if not vals.get('task_id'):
@@ -161,9 +150,9 @@
         for line in self.browse(cr, uid, ids):
             # in OpenERP if we set a value to nil vals become False
             old_task_id = line.task_id and line.task_id.id or None
-            new_task_id = vals.get('task_id', old_task_id) #if no task_id in vals we assume it is equal to old
+            new_task_id = vals.get('task_id', old_task_id)  # if no task_id in vals we assume it is equal to old
 
-            #we look if value has changed
+            # we look if value has changed
             if (new_task_id != old_task_id) and old_task_id:
                 self._set_remaining_hours_unlink(cr, uid, [line.id], context)
                 if new_task_id:
@@ -205,14 +194,12 @@
     def create(self, cr, uid, vals, context=None):
         if vals.get('task_id'):
             self._set_remaining_hours_create(cr, uid, vals, context)
-        return super(AccountAnalyticLine,self).create(cr, uid, vals, context=context)
+        return super(AccountAnalyticLine, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
-        self. _set_remaining_hours_write(cr, uid, ids, vals, context=context)
+        self._set_remaining_hours_write(cr, uid, ids, vals, context=context)
         return super(AccountAnalyticLine, self).write(cr, uid, ids, vals, context=context)
 
     def unlink(self, cr, uid, ids, context=None):
         self._set_remaining_hours_unlink(cr, uid, ids, context)
         return super(AccountAnalyticLine, self).unlink(cr, uid, ids, context=context)
-
-AccountAnalyticLine()

=== modified file 'timesheet_task/project_task_view.xml'
--- timesheet_task/project_task_view.xml	2012-06-06 13:14:12 +0000
+++ timesheet_task/project_task_view.xml	2013-04-03 11:31:22 +0000
@@ -1,46 +1,212 @@
 <openerp>
     <data>
-        #---------------------------------------------------------------------------------------------------------
-        #   Adapt task views
-        #---------------------------------------------------------------------------------------------------------
-        <record id="view_task_form2" model="ir.ui.view">
+
+        #---------------------------------------------------------------------------------------------------------
+        # Adapt task views
+        #---------------------------------------------------------------------------------------------------------
+        <!-- Replace the view project.view_task_form2 instead of inheriting 
+            it and set a low priority. This replacement is to avoid the following error: 
+            
+            ERROR timesheet openerp.osv.orm: Can't find field 'hours' in the following view parts
+            composing the view of object model 'project.task':
+            * project.task.form 
+            
+            Either you wrongly customized this view, or some modules bringing those views are not
+            compatible with your current data model ERROR timesheet openerp.addons.base.ir.ir_ui_view:
+            Can't render view for model: project.task -->
+
+        <record id="project.view_task_form2" model="ir.ui.view">
             <field name="name">project.task.form</field>
             <field name="model">project.task</field>
-            <field name="inherit_id" ref="project.view_task_form2"/>
-            <field name="type">form</field>
+            <field eval="1" name="priority" />
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='work_ids']" position="replace">
-                    <field colspan="4" name="work_ids" nolabel="1" attrs="{'invisible':[('state','in',['draft'])],'readonly':[('state','=','done')]}">
-                        <tree string="Task Work" editable="top">
-                            <field name="user_id" on_change="on_change_user_id(user_id)" required="1" invisible="1"/>
-                            <field name="name"/>
-                            <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id, parent.id, to_invoice)" sum="Total time" widget="float_time"/>
-                            <field name="date" on_change="on_change_date(date)"/>
-                            <field name="journal_id" invisible="1"/>
-                            <field domain="[('type','=','normal')]" name="account_id" invisible="1"/>
-                            <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id, parent.id, to_invoice)" required="1" domain="[('type','=','service')]" invisible="1"/>
-                            <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id, parent.id, to_invoice)" invisible="1"/>
-                            <field name="amount" sum="Total cost" invisible="1"/>
-                            <field name="general_account_id" invisible="1"/>
-                            <field name="to_invoice" />
-                        </tree>
-                        <form string="Task Work" editable="top">
-                            <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
-                            <field name="name" default_focus="1"/>
-                            <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id, parent.id, to_invoice)" sum="Total time" widget="float_time"/>
-                            <field name="date" on_change="on_change_date(date)"/>
-                            <field name="journal_id" invisible="1"/>
-                            <field domain="[('type','=','normal')]" name="account_id" invisible="1"/>
-                            <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id, parent.id, to_invoice)" required="1" domain="[('type','=','service')]" invisible="1"/>
-                            <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id, parent.id, to_invoice)" invisible="1"/>
-                            <field name="amount" sum="Total cost" invisible="1"/>
-                            <field name="general_account_id" invisible="1"/>
-                            <field name="to_invoice" />
-                        </form>
-                    </field>
-                </xpath>
+                <form string="Project" version="7.0">
+                    <header>
+                        <!-- <button name="do_open" string="Start Task" type="object" 
+                            states="draft,pending" class="oe_highlight"/> <button name="do_draft" string="Draft" 
+                            type="object" states="cancel,done"/> -->
+                        <button name="project_task_reevaluate"
+                            string="Reactivate" type="object" states="cancelled,done"
+                            context="{'button_reactivate':True}" groups="base.group_user" />
+                        <button name="action_close" string="Done"
+                            type="object" states="draft,open,pending"
+                            groups="base.group_user" />
+                        <button name="do_cancel" string="Cancel Task"
+                            type="object" states="draft,open,pending"
+                            groups="base.group_user" />
+                        <field name="stage_id" widget="statusbar"
+                            clickable="True" />
+                    </header>
+                    <sheet string="Task">
+                        <h1>
+                            <field name="name" placeholder="Task summary..." />
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="project_id"
+                                    on_change="onchange_project(project_id)"
+                                    context="{'default_use_tasks':1}" />
+                                <field name="user_id"
+                                    attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"
+                                    options='{"no_open": True}' />
+                                <field name="planned_hours"
+                                    widget="float_time"
+                                    groups="project.group_time_work_estimation_tasks"
+                                    on_change="onchange_planned(planned_hours, effective_hours)" />
+                            </group>
+                            <group>
+                                <field name="date_deadline"
+                                    attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" />
+                                <field name="categ_ids" widget="many2many_tags" />
+                                <field name="progress" widget="progressbar"
+                                    groups="project.group_time_work_estimation_tasks"
+                                    attrs="{'invisible':[('state','=','cancelled')]}" />
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Description">
+                                <field name="description"
+                                    attrs="{'readonly':[('state','=','done')]}"
+                                    placeholder="Add a Description..." />
+                                <field name="work_ids">
+                                    <tree string="Task Work"
+                                        editable="top">
+                                        <field name="user_id"
+                                            on_change="on_change_user_id(user_id)"
+                                            required="1" invisible="1" />
+                                        <field name="name" />
+                                        <field name="unit_amount"
+                                            on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id, parent.id, to_invoice)"
+                                            sum="Total time" widget="float_time" />
+                                        <field name="date"
+                                            on_change="on_change_date(date)" />
+                                        <field name="journal_id"
+                                            invisible="1" />
+                                        <field domain="[('type','=','normal')]"
+                                            name="account_id" invisible="1" />
+                                        <field name="product_id"
+                                            on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id, parent.id, to_invoice)"
+                                            required="1"
+                                            domain="[('type','=','service')]"
+                                            invisible="1" />
+                                        <field name="product_uom_id"
+                                            on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id, parent.id, to_invoice)"
+                                            invisible="1" />
+                                        <field name="amount" sum="Total cost"
+                                            invisible="1" />
+                                        <field name="general_account_id"
+                                            invisible="1" />
+                                        <field name="to_invoice" />
+                                    </tree>
+                                    <form string="Task Work"
+                                        editable="top">
+                                        <field name="user_id"
+                                            on_change="on_change_user_id(user_id)"
+                                            required="1" />
+                                        <field name="name"
+                                            default_focus="1" />
+                                        <field name="unit_amount"
+                                            on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id, parent.id, to_invoice)"
+                                            sum="Total time" widget="float_time" />
+                                        <field name="date"
+                                            on_change="on_change_date(date)" />
+                                        <field name="journal_id"
+                                            invisible="1" />
+                                        <field domain="[('type','=','normal')]"
+                                            name="account_id" invisible="1" />
+                                        <field name="product_id"
+                                            on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id, parent.id, to_invoice)"
+                                            required="1"
+                                            domain="[('type','=','service')]"
+                                            invisible="1" />
+                                        <field name="product_uom_id"
+                                            on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id, parent.id, to_invoice)"
+                                            invisible="1" />
+                                        <field name="amount" sum="Total cost"
+                                            invisible="1" />
+                                        <field name="general_account_id"
+                                            invisible="1" />
+                                        <field name="to_invoice" />
+                                    </form>
+                                </field>
+                                <group>
+                                    <group class="oe_subtotal_footer oe_right"
+                                        name="project_hours"
+                                        groups="project.group_time_work_estimation_tasks">
+                                        <field name="effective_hours"
+                                            widget="float_time" />
+                                        <label for="remaining_hours"
+                                            string="Remaining"
+                                            groups="project.group_time_work_estimation_tasks" />
+                                        <div>
+                                            <field name="remaining_hours"
+                                                widget="float_time"
+                                                attrs="{'readonly':[('state','in',('done','cancelled'))]}"
+                                                groups="project.group_time_work_estimation_tasks" />
+                                        </div>
+                                        <field name="total_hours"
+                                            widget="float_time"
+                                            class="oe_subtotal_footer_separator" />
+                                    </group>
+                                </group>
+                                <div class="oe_clear" />
+                            </page>
+                            <page string="Delegation"
+                                groups="project.group_delegate_task">
+                                <button
+                                    name="%(project.action_project_task_delegate)d"
+                                    string="Delegate" type="action"
+                                    states="pending,open,draft" groups="project.group_delegate_task" />
+                                <separator string="Parent Tasks" />
+                                <field name="parent_ids" />
+                                <separator string="Delegated tasks" />
+                                <field name="child_ids">
+                                    <tree string="Delegated tasks">
+                                        <field name="name" />
+                                        <field name="user_id" />
+                                        <field name="stage_id" />
+                                        <field name="state"
+                                            invisible="1" />
+                                        <field name="effective_hours"
+                                            widget="float_time" />
+                                        <field name="progress"
+                                            widget="progressbar" />
+                                        <field name="remaining_hours"
+                                            widget="float_time" />
+                                        <field name="date_deadline" />
+                                    </tree>
+                                </field>
+                            </page>
+                            <page string="Extra Info"
+                                attrs="{'readonly':[('state','=','done')]}">
+                                <group col="4">
+                                    <field name="priority" groups="base.group_user" />
+                                    <field name="sequence" />
+                                    <field name="partner_id" />
+                                    <field name="state" invisible="1" />
+                                    <field name="company_id"
+                                        groups="base.group_multi_company"
+                                        widget="selection" />
+                                </group>
+                                <group>
+                                    <group string="Gantt View">
+                                        <field name="date_start" />
+                                        <field name="date_end" />
+                                    </group>
+                                    <group>
+                                    </group>
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"
+                            groups="base.group_user" />
+                        <field name="message_ids" widget="mail_thread" />
+                    </div>
+                </form>
             </field>
         </record>
-        
+
     </data>
 </openerp>
\ No newline at end of file

=== removed file 'timesheet_task/tmp_file_for_project_indicator.py'
--- timesheet_task/tmp_file_for_project_indicator.py	2012-06-06 13:14:12 +0000
+++ timesheet_task/tmp_file_for_project_indicator.py	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-def _progress_rate(self, cr, uid, ids, names, arg, context=None):
-    """As OpenERP SA made a query for this function field (perf. reason obviously), 
-    I must overide it all."""
-    result = {}.fromkeys(ids, 0.0)
-    progress = {}
-    if not ids:
-        return res
-    cr.execute('''SELECT project_id,
-                         sum(planned_hours) as sum_planned_hours,
-                         sum(total_hours) as sum_total_hours,
-                         sum(effective_hours) as sum_effective_hours,
-                         sum(remaining_hours) as remaining_hours,
-                         sum(deduced_hours) as deduced_hours
-                  FROM project_task
-                  WHERE  project_id in %s 
-                   AND state<>'cancelled'
-                  GROUP BY project_id''', (tuple(ids),))
-                 
-    res = cr.dictfetchall()
-    for stat in res:
-        project = self.browse(cr, uid, res['project_id'], context=context)
-        progr = (stat['sum_planned_hours'] and 
-                 round(100.0 * stat['sum_total_hours'] / stat['sum_planned_hours'], 2) or 0.0),
-        result[project.id] = {'planned_hours': stat['sum_planned_hours'],
-                              'effective_hours': stat['sum_effective_hours'],
-                              'total_hours': stat['sum_total_hours'],
-                              'progress_rate': progr,
-                              'deduced_hours': stat['sum_deduced_hours']}
-    return res
\ No newline at end of file