Merge lp:~camptocamp/hr-timesheet/add-test-for-task-project-indicators-jge into lp:~hr-core-editors/hr-timesheet/7.0

[Nicolas Bessi - Camptocamp]

[IMP] in timesheet_task module:
    Fix propagation of indicator at project level when aa/timesheet line are altered
    Fix remaining_hours when a task is added on aa line without task

Add YAML tests
Improve tooltips of indicators

[IMP] in timesheet_task module:
    Fix propagation of indicator at project level when aa/timesheet line are altered
    Fix remaining_hours when a task is added on aa line without task

Add YAML tests
Improve tooltips of indicators

Please feel free to correct english.

[lp:~camptocamp/hr-timesheet/add-test-for-task-project-indicators-jge]

69. By Nicolas Bessi - Camptocamp on 2013-09-20

[REVERT] wrongly merged revisions

70. By Nicolas Bessi - Camptocamp on 2013-10-02

[FIX] comment english

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

LGTM, Thanks

review: Approve (code review + tests)

[lp:~camptocamp/hr-timesheet/add-test-for-task-project-indicators-jge]

71. By Guewen Baconnier @ Camptocamp on 2013-10-08

[IMP] description in manifest, some typos and layout

72. By Guewen Baconnier @ Camptocamp on 2013-10-08

[FIX] no mutable in args

73. By Guewen Baconnier @ Camptocamp on 2013-10-08

[FIX] alignment

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Pushed some nitpicker's changes.
LGTM, thanks

review: Approve (code review)

=== modified file 'timesheet_task/__openerp__.py'
--- timesheet_task/__openerp__.py	2013-04-03 11:20:21 +0000
+++ timesheet_task/__openerp__.py	2013-10-08 11:06:42 +0000
@@ -18,18 +18,29 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-{'name' : 'Analytic Task',
+{'name' : 'Analytic Timesheet In Task',
  'version' : '0.2',
  'author' : 'Camptocamp',
- 'maintainer': 'Camptocamp - Acsone SA/NV',
+ 'maintainer': 'Camptocamp, Acsone SA/NV',
  'category': 'Human Resources',
  'depends' : ['project', 'hr_timesheet_invoice'],
- 'description': """Replace project.task.work items linked to task
-                   with hr.analytic.timesheet""",
+ 'description': """
+Replace task work items (project.task.work) linked to task with
+timesheet lines (hr.analytic.timesheet).
+
+Unless the module project_timesheet, it allows to have only one single
+object that handles and records time spent by employees, making more
+coherence for the end user. This way, time entered through timesheet
+lines or tasks is the same. As long as a timesheet lines has an
+associated task, it will compute the related indicators.
+
+Used with the module hr_timesheet_task, it also allows users to complete
+task information through the timesheet sheet (hr.timesheet.sheet).
+    """,
  'website': 'http://www.camptocamp.com',
  'data': ['project_task_view.xml'],
  'demo': [],
- 'test': [],
+ 'test': ['test/task_timesheet_indicators.yml'],
  'installable': True,
  'images' : [],
  'auto_install': False,

=== modified file 'timesheet_task/project_task.py'
--- timesheet_task/project_task.py	2013-08-14 15:05:12 +0000
+++ timesheet_task/project_task.py	2013-10-08 11:06:42 +0000
@@ -20,23 +20,23 @@
 ##############################################################################
 
 from openerp.osv import orm, fields
+from openerp import SUPERUSER_ID
 
-TASK_WATCHERS = ['work_ids', 'remaining_hours', 'planned_hours']
-TIMESHEET_WATCHERS = ['unit_amount', 'product_uom_id', 'account_id', 'to_invoice', 'task_id']
+TASK_WATCHERS = ['work_ids', 'remaining_hours', 'effective_hours', 'planned_hours']
+TIMESHEET_WATCHERS = ['unit_amount', 'product_uom_id', 'account_id', 'task_id']
 
 class ProjectTask(orm.Model):
     _inherit = "project.task"
     _name = "project.task"
 
-
     def _progress_rate(self, cr, uid, ids, names, arg, context=None):
         """TODO improve code taken for OpenERP"""
         res = {}
-        cr.execute("""SELECT task_id, COALESCE(SUM(unit_amount),0) 
-                        FROM account_analytic_line 
-                      WHERE task_id IN %s 
+        cr.execute("""SELECT task_id, COALESCE(SUM(unit_amount),0)
+                        FROM account_analytic_line
+                      WHERE task_id IN %s
                       GROUP BY task_id""", (tuple(ids),))
-                      
+
         hours = dict(cr.fetchall())
         for task in self.browse(cr, uid, ids, context=context):
             res[task.id] = {}
@@ -51,47 +51,59 @@
         return res
 
 
+    def _store_set_values(self, cr, uid, ids, fields, context=None):
+        # Hack to avoid redefining most of function fields of project.project model
+        # This is mainly due to the fact that orm _store_set_values use direct access to database.
+        # So when modifiy aa line the _store_set_values as it uses cursor directly to update tasks
+        # project triggers on task are not called
+        res = super(ProjectTask, self)._store_set_values(cr, uid, ids, fields, context=context)
+        for row in self.browse(cr, SUPERUSER_ID, ids, context=context):
+            project = row.project_id
+            project.write({'parent_id': project.parent_id.id})
+        return res
+
+
     def _get_analytic_line(self, cr, uid, ids, context=None):
         result = []
         for aal in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context):
             if aal.task_id: result.append(aal.task_id.id)
         return result
 
-
-    _columns = {'work_ids': fields.one2many('hr.analytic.timesheet', 'task_id', 'Work done'),
-                
-
-    'effective_hours': fields.function(_progress_rate, multi="progress", 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, TIMESHEET_WATCHERS, 20)}),
-
-    'delay_hours': fields.function(_progress_rate, multi="progress", 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, TIMESHEET_WATCHERS, 20)}),
-
-    'total_hours': fields.function(_progress_rate, multi="progress", 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, TIMESHEET_WATCHERS, 20)}),
-
-    'progress': fields.function(_progress_rate, multi="progress", 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, TIMESHEET_WATCHERS, 20)})}
-    
+    _columns = {
+        'work_ids': fields.one2many('hr.analytic.timesheet', 'task_id', 'Work done'),
+        'effective_hours': fields.function(_progress_rate, multi="progress", string='Time Spent',
+                                           help="Computed using the sum of the task work done (timesheet lines "
+                                                "associated on this task).",
+                                           store={'project.task': (lambda self, cr, uid, ids, c=None: ids, TASK_WATCHERS, 20),
+                                                  'account.analytic.line': (_get_analytic_line, TIMESHEET_WATCHERS, 20)}),
+        'delay_hours': fields.function(_progress_rate, multi="progress", string='Deduced Hours',
+                                       help="Computed as difference between planned hours by the project manager "
+                                            "and the total hours of the task.",
+                                       store={'project.task': (lambda self, cr, uid, ids, c=None: ids, TASK_WATCHERS, 20),
+                                              'account.analytic.line': (_get_analytic_line, TIMESHEET_WATCHERS, 20)}),
+        'total_hours': fields.function(_progress_rate, multi="progress", string='Total Time',
+                                       help="Computed as: Time Spent + Remaining Time.",
+                                       store={'project.task': (lambda self, cr, uid, ids, c=None: ids, TASK_WATCHERS, 20),
+                                              'account.analytic.line': (_get_analytic_line, TIMESHEET_WATCHERS, 20)}),
+        'progress': fields.function(_progress_rate, multi="progress", string='Progress', type='float', group_operator="avg",
+                                    help="If the task has a progress of 99.99% you should close the task if it's "
+                                         "finished or reevaluate the time",
+                                    store={'project.task': (lambda self, cr, uid, ids, c=None: 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)
         if vals.get('project_id'):
             ts_obj = self.pool.get('hr.analytic.timesheet')
             project_obj = self.pool.get('project.project')
-            project = project_obj.browse(cr, uid, vals['project_id'], context)
+            project = project_obj.browse(cr, uid, vals['project_id'], context=context)
             account_id = project.analytic_account_id.id
             for task in self.browse(cr, uid, ids, context=context):
                 ts_obj.write(cr, uid, [w.id for w in task.work_ids], {'account_id': account_id}, context=context)
         return res
 
+
 class HrAnalyticTimesheet(orm.Model):
     """
     Add field:
@@ -123,7 +135,8 @@
     _name = "hr.analytic.timesheet"
 
     def on_change_unit_amount(self, cr, uid, sheet_id, prod_id, unit_amount, company_id,
-                              unit=False, journal_id=False, task_id=False, to_invoice=False, context=None):
+                              unit=False, journal_id=False, task_id=False, to_invoice=False,
+                              context=None):
         res = super(HrAnalyticTimesheet, self).on_change_unit_amount(cr,
                                                                      uid,
                                                                      sheet_id,
@@ -149,16 +162,17 @@
         return dict.fromkeys(ids, False)
 
     _columns = {
-            'hr_analytic_timesheet_id': fields.function(_get_dummy_hr_analytic_timesheet_id, string='Related Timeline Id', type='boolean')
+            'hr_analytic_timesheet_id': fields.function(_get_dummy_hr_analytic_timesheet_id,
+                                                        string='Related Timeline Id',
+                                                        type='boolean')
             }
 
+
 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"
 
-
-
     _columns = {'task_id': fields.many2one('project.task', 'Task')}
 
     def _check_task_project(self, cr, uid, ids):
@@ -172,22 +186,22 @@
         (_check_task_project, 'Error! Task must belong to the project.', ['task_id','account_id']),
     ]
 
-    def _compute_hours_with_factor(self, cr, uid, hours, factor_id, context=None):
-        if not hours or not factor_id:
-            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
+
+    def _trigger_projects(self, cr, uid, task_ids, context=None):
+        t_obj = self.pool['project.task']
+        for task in t_obj.browse(cr, SUPERUSER_ID, task_ids, context=context):
+            project = task.project_id
+            project.write({'parent_id': project.parent_id.id})
+        return task_ids
 
     def _set_remaining_hours_create(self, cr, uid, vals, context=None):
         if not vals.get('task_id'):
             return
         hours = vals.get('unit_amount', 0.0)
-        factor_id = vals.get('to_invoice')
-        comp_hours = self._compute_hours_with_factor(cr, uid, hours, factor_id, context)
-        if comp_hours:
-            cr.execute('update project_task set remaining_hours=remaining_hours - %s where id=%s',
-                       (comp_hours, vals['task_id']))
+        # We can not do a write else we will have a recursion error
+        cr.execute('update project_task set remaining_hours=remaining_hours - %s where id=%s',
+                   (hours, vals['task_id']))
+        self._trigger_projects(cr, uid, [vals['task_id']], context=context)
         return vals
 
     def _set_remaining_hours_write(self, cr, uid, ids, vals, context=None):
@@ -196,8 +210,8 @@
         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
-
+            # if no task_id in vals we assume it is equal to old
+            new_task_id = vals.get('task_id', old_task_id)
             # 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)
@@ -207,20 +221,19 @@
                                                line.to_invoice and line.to_invoice.id or False),
                             'unit_amount': vals.get('unit_amount', line.unit_amount)}
                     self._set_remaining_hours_create(cr, uid, data, context)
+                    self._trigger_projects(cr, uid, list(set([old_task_id, new_task_id])),
+                                           context=context)
                 return ids
             if new_task_id:
                 hours = vals.get('unit_amount', line.unit_amount)
-                factor_id = vals.get('to_invoice', line.to_invoice and line.to_invoice.id or False)
-                comp_hours = self._compute_hours_with_factor(cr, uid, hours, factor_id, context)
-                old_factor = line.to_invoice and line.to_invoice.id or False
-                old_comp_hours = self._compute_hours_with_factor(cr, uid, line.unit_amount,
-                                                                 old_factor, context)
-                # we always execute request because invoice factor can be set to gratis
+                old_hours = line.unit_amount if old_task_id else 0.0
+                # We can not do a write else we will have a recursion error
                 cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s',
-                               (comp_hours, old_comp_hours, new_task_id))
+                           (hours, old_hours, new_task_id))
+                self._trigger_projects(cr, uid, [new_task_id], context=context)
+
         return ids
 
-
     def _set_remaining_hours_unlink(self, cr, uid, ids, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -228,15 +241,10 @@
             if not line.task_id:
                 continue
             hours = line.unit_amount or 0.0
-            factor_id = line.to_invoice and line.to_invoice.id or False
-            comp_hours = self._compute_hours_with_factor(cr, uid, hours, factor_id, context)
-            if comp_hours:
-                cr.execute('update project_task set remaining_hours=remaining_hours + %s where id=%s',
-                           (comp_hours, line.task_id.id))
+            cr.execute('update project_task set remaining_hours=remaining_hours + %s where id=%s',
+                       (hours, line.task_id.id))
         return ids
 
-
-
     def create(self, cr, uid, vals, context=None):
         if vals.get('task_id'):
             self._set_remaining_hours_create(cr, uid, vals, context)

=== added directory 'timesheet_task/test'
=== added file 'timesheet_task/test/task_timesheet_indicators.yml'
--- timesheet_task/test/task_timesheet_indicators.yml	1970-01-01 00:00:00 +0000
+++ timesheet_task/test/task_timesheet_indicators.yml	2013-10-08 11:06:42 +0000
@@ -0,0 +1,282 @@
+-
+  Create a user 'HR Tester'
+-
+  !record {model: res.users, id: res_users_hrtester0}:
+    company_id: base.main_company
+    name: HR Tester
+    login: hr
+    password: hr
+    groups_id:
+      - base.group_hr_manager
+-
+  Create a product with type service used to specify employees designation
+-
+  !record {model: product.product, id: product_product_hrtester0}:
+    categ_id: product.product_category_6
+    cost_method: standard
+    mes_type: fixed
+    name: HR Tester service
+    standard_price: 10.0
+    type: service
+    uom_id: product.product_uom_hour
+    uom_po_id: product.product_uom_hour
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+-
+  Create an analytic journal for employees timesheet
+-
+  !record {model: account.analytic.journal, id: account_analytic_journal_hrtimesheettest0}:
+    company_id: base.main_company
+    name: HR Timesheet test
+    type: general
+-
+  Create an employee 'HR Tester' for user 'HR Tester'
+-
+  !record {model: hr.employee, id: hr_employee_hrtester0}:
+    name: HR Tester
+    user_id: res_users_hrtester0
+    product_id: product_product_hrtester0
+    journal_id: account_analytic_journal_hrtimesheettest0
+-
+  Create a timesheet invoice factor of 100%
+-
+  !record {model: hr_timesheet_invoice.factor, id: timesheet_invoice_factor0}:
+    name: 100%
+    customer_name: 100%
+    factor: 0.0
+-
+  Create a project 'Timesheet task and indicator tests'
+-
+  !record {model: project.project, id: project_project_timesheettest0}:
+    company_id: base.main_company
+    name: Timesheet task and indicator tests
+    to_invoice: timesheet_invoice_factor0
+-
+  Create a task 'Test timesheet records'
+-
+  !record {model: project.task, id: project_task_testtimesheetrecords0}:
+    date_start: !eval time.strftime('%Y-05-%d %H:%M:%S')
+    name: Test timesheet records
+    planned_hours: 200.0
+    project_id: project_project_timesheettest0
+    user_id: res_users_hrtester0
+-
+  The planned time on project should then be 200
+-
+  !assert {model: project.project, id: project_project_timesheettest0, string: planned_time_on_project_01}:
+    - planned_hours == 200.0
+-
+  The time spent on project should then be 0
+-
+  !assert {model: project.project, id: project_project_timesheettest0, string: time_spent_on_project_01}:
+    - effective_hours == 0.0
+-
+  Make a timesheet line of 10.0 on the project without task
+-
+  !python {model: hr.analytic.timesheet}: |
+    import time
+    project_obj = self.pool.get('project.project')
+    project = project_obj.browse(cr, uid, ref('project_project_timesheettest0'))
+    ts_line= {
+      'name': '/',
+      'user_id': ref('res_users_hrtester0'),
+      'date': time.strftime('%Y-%m-%d'),
+      'account_id': project.analytic_account_id.id,
+      'unit_amount': 10.0,
+      'journal_id': ref('account_analytic_journal_hrtimesheettest0'),
+      'to_invoice': ref('timesheet_invoice_factor0'),
+    }
+    ts = self.create(cr, uid, ts_line)
+    assert ts, "Timesheet has not been recorded correctly"
+-
+  The time spent on project should still be 0 as no task has been set
+-
+  !assert {model: project.project, id: project_project_timesheettest0}:
+    - effective_hours == 0.0
+-
+  Make a timesheet line of 10.0 on the project with a task assigned
+-
+  !python {model: hr.analytic.timesheet}: |
+    import time
+    project_obj = self.pool.get('project.project')
+    project = project_obj.browse(cr, uid, ref('project_project_timesheettest0'))
+    ts_line= {
+      'name': '/',
+      'user_id': ref('res_users_hrtester0'),
+      'date': time.strftime('%Y-%m-%d'),
+      'account_id': project.analytic_account_id.id,
+      'unit_amount': 10.0,
+      'task_id': ref('project_task_testtimesheetrecords0'),
+      'to_invoice': ref('timesheet_invoice_factor0'),
+      'journal_id': ref('account_analytic_journal_hrtimesheettest0'),
+    }
+    ts = self.create(cr, uid, ts_line)
+    assert ts, "Timesheet has not been recorded correctly"
+-
+  The time spent on the task should be 10.0
+-
+  !assert {model: project.task, id: project_task_testtimesheetrecords0, string: time_spent_on_task_01}:
+    - effective_hours == 10.0
+-
+  The remaining time on the task should be 190.0
+-
+  !assert {model: project.task, id: project_task_testtimesheetrecords0, string: remaining_time_on_task_01}:
+    - remaining_hours == 190.0
+-
+  The time spent on project should be 10.0
+-
+  !assert {model: project.project, id: project_project_timesheettest0, string: time_spent_on_project_02}:
+    - effective_hours == 10.0
+-
+  Make a timesheet line of 10.0 on the project without task, then assign one
+-
+  !python {model: hr.analytic.timesheet}: |
+    import time
+    project_obj = self.pool.get('project.project')
+    project = project_obj.browse(cr, uid, ref('project_project_timesheettest0'))
+    ts_line= {
+      'name': '/',
+      'user_id': ref('res_users_hrtester0'),
+      'date': time.strftime('%Y-%m-%d'),
+      'account_id': project.analytic_account_id.id,
+      'unit_amount': 10.0,
+      'to_invoice': ref('timesheet_invoice_factor0'),
+      'journal_id': ref('account_analytic_journal_hrtimesheettest0'),
+    }
+    ts = self.create(cr, uid, ts_line)
+    assert ts, "Timesheet has not been recorded correctly"
+    vals = {
+        'task_id': ref('project_task_testtimesheetrecords0')
+    }
+    result = self.write(cr, uid, ts, vals)
+-
+  The time spent on the task should be 20.0
+-
+  !assert {model: project.task, id: project_task_testtimesheetrecords0, string: time_spent_on_task_02}:
+    - effective_hours == 20.0
+-
+  The remaining time on the task should be 180.0
+-
+  !assert {model: project.task, id: project_task_testtimesheetrecords0, string: remaining_time_on_task_02}:
+    - remaining_hours == 180.0
+-
+  The time spent on project should be 20.0
+-
+  !assert {model: project.project, id: project_project_timesheettest0, string: time_spent_on_project_03}:
+    - effective_hours == 20.0
+-
+  Make a timesheet line of 10.0 with task, then remove the task
+-
+  !python {model: hr.analytic.timesheet}: |
+    import time
+    project_obj = self.pool.get('project.project')
+    project = project_obj.browse(cr, uid, ref('project_project_timesheettest0'))
+    task_obj = self.pool.get('project.task')
+    ts_line= {
+      'name': '/',
+      'user_id': ref('res_users_hrtester0'),
+      'date': time.strftime('%Y-%m-%d'),
+      'account_id': project.analytic_account_id.id,
+      'unit_amount': 10.0,
+      'task_id': ref('project_task_testtimesheetrecords0'),
+      'to_invoice': ref('timesheet_invoice_factor0'),
+      'journal_id': ref('account_analytic_journal_hrtimesheettest0'),
+    }
+    ts = self.create(cr, uid, ts_line)
+    assert ts, "Timesheet has not been recorded correctly"
+    task = task_obj.browse(cr, uid, ref('project_task_testtimesheetrecords0'))
+    assert task.effective_hours == 30.0, "Effective hours on task is not correct"
+    assert task.remaining_hours == 170.0, "Remaining hours on task is not correct"
+    project.refresh()
+    assert project.effective_hours == 30.0, "Effective hours on project is not correct"
+    vals = {
+        'task_id': False
+    }
+    result = self.write(cr, uid, ts, vals)
+-
+  The time spent on the task should be 20.0
+-
+  !assert {model: project.task, id: project_task_testtimesheetrecords0, string: time_spent_on_task_03}:
+    - effective_hours == 20.0
+-
+  The remaining time on the task should be 180.0
+-
+  !assert {model: project.task, id: project_task_testtimesheetrecords0, string: remaining_time_on_task_03}:
+    - remaining_hours == 180.0
+-
+  The time spent on project should be 20.0
+-
+  !assert {model: project.project, id: project_project_timesheettest0, string: time_spent_on_project_04}:
+    - effective_hours == 20.0
+-
+  Make a timesheet line of 10.0 with task, then delete the line
+-
+  !python {model: hr.analytic.timesheet}: |
+    import time
+    project_obj = self.pool.get('project.project')
+    project = project_obj.browse(cr, uid, ref('project_project_timesheettest0'))
+    task_obj = self.pool.get('project.task')
+    ts_line= {
+      'name': '/',
+      'user_id': ref('res_users_hrtester0'),
+      'date': time.strftime('%Y-%m-%d'),
+      'account_id': project.analytic_account_id.id,
+      'unit_amount': 10.0,
+      'task_id': ref('project_task_testtimesheetrecords0'),
+      'to_invoice': ref('timesheet_invoice_factor0'),
+      'journal_id': ref('account_analytic_journal_hrtimesheettest0'),
+    }
+    ts = self.create(cr, uid, ts_line)
+    assert ts, "Timesheet has not been recorded correctly"
+    task = task_obj.browse(cr, uid, ref('project_task_testtimesheetrecords0'))
+    assert task.effective_hours == 30.0, "Effective hours on task is not correct"
+    assert task.remaining_hours == 170.0, "Remaining hours on task is not correct"
+    project.refresh()
+    assert project.effective_hours == 30.0, "Effective hours on project is not correct"
+    result = self.unlink(cr, uid, [ts])
+-
+  The time spent on the task should be 20.0
+-
+  !assert {model: project.task, id: project_task_testtimesheetrecords0, string: time_spent_on_task_04}:
+    - effective_hours == 20.0
+-
+  The remaining time on the task should be 180.0
+-
+  !assert {model: project.task, id: project_task_testtimesheetrecords0, string: remaining_time_on_task_04}:
+    - remaining_hours == 180.0
+-
+  The time spent on project should be 20.0
+-
+  !assert {model: project.project, id: project_project_timesheettest0, string: time_spent_on_project_05}:
+    - effective_hours == 20.0
+-
+  Change the remaining hours of the task to 200.0
+-
+  !python {model: project.task}: |
+    task = self.browse(cr, uid, ref('project_task_testtimesheetrecords0'))
+    vals = {
+        'remaining_hours': 200.0,
+    }
+    result = self.write(cr, uid, [task.id], vals)
+-
+  The time spent on the task should still be 20.0
+-
+  !assert {model: project.task, id: project_task_testtimesheetrecords0, string: time_spent_on_task_05}:
+    - effective_hours == 20.0
+-
+  The remaining time on the task should be 200.0
+-
+  !assert {model: project.task, id: project_task_testtimesheetrecords0, string: remaining_time_on_task_05}:
+    - remaining_hours == 200.0
+-
+  The delay in hours on the task should be 20.0
+-
+  !assert {model: project.task, id: project_task_testtimesheetrecords0, string: delay_on_task_01}:
+    - delay_hours == 20.0
+-
+  The total on the task should be 220.0
+-
+  !assert {model: project.task, id: project_task_testtimesheetrecords0, string: total_time_on_task_01}:
+    - total_hours == 220.0