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

[Laetitia Gangloff (Acsone)]

This branch propose the following improvement:

- in timesheet_task module add a constraint to check if task belongs to project -> in current it is possible to have a task which doesn't belong to the selected project, and this case seems not coherent. This improvement inforce consistency between project and task in timesheet.

- in hr_timesheet_task module update account domain with ('state','=','open') instead of ('state','<>','close') -> in current it is possible to have timesheet on task in 'cancelled' state. This improvement force to have project 'in progress' (correspond to 'open') state to work on it.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (code review, no test)

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

Is it good for merging?

[Stefan Rijnhart (Opener) (stefan-opener)]

l.36: unused variable project_obj. Otherwise good!

review: Needs Fixing

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

46. By Laetitia Gangloff (Acsone) on 2013-05-13

timesheet_task: remove unused variable project_obj

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

I removed the unused variable project_obj

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks for the change!

review: Approve

=== modified file 'hr_timesheet_task/hr_analytic_timesheet_view.xml'
--- hr_timesheet_task/hr_analytic_timesheet_view.xml	2013-03-28 17:30:55 +0000
+++ hr_timesheet_task/hr_analytic_timesheet_view.xml	2013-05-13 07:36:22 +0000
@@ -23,7 +23,7 @@
             <field name="arch" type="xml">
                 <tree editable="top" string="Timesheet Lines">
                     <field name="date" on_change="on_change_date(date)"/>
-                    <field domain="[('type','=','normal')]" name="account_id"/>
+                    <field domain="[('type','=','normal'), ('state','=','open')]" name="account_id"/>
                     <field name="task_id" context="{'account_id' : account_id}"
                         domain="[('state','=','open'), ('project_id.analytic_account_id','=',account_id)]"/>
                     <field name="name"/>

=== modified file 'hr_timesheet_task/static/src/js/timesheet.js'
--- hr_timesheet_task/static/src/js/timesheet.js	2013-03-26 17:03:10 +0000
+++ hr_timesheet_task/static/src/js/timesheet.js	2013-05-13 07:36:22 +0000
@@ -145,7 +145,7 @@
                     type: "many2one",
                     domain: [
                         ['type','in',['normal', 'contract']],
-                        ['state', '<>', 'close'],
+                        ['state', '=', 'open'],
                         ['use_timesheets','=',1],
                     ],
                     context: {

=== modified file 'timesheet_task/project_task.py'
--- timesheet_task/project_task.py	2013-04-03 11:29:21 +0000
+++ timesheet_task/project_task.py	2013-05-13 07:36:22 +0000
@@ -125,6 +125,16 @@
 
     _columns = {'task_id': fields.many2one('project.task', 'Task')}
 
+    def _check_task_project(self, cr, uid, ids):
+        for line in self.browse(cr, uid, ids):
+            if line.task_id and line.account_id:
+                if line.task_id.project_id.analytic_account_id.id != line.account_id.id:
+                    return False
+        return True
+
+    _constraints = [
+        (_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:

=== modified file 'timesheet_task/project_task_view.xml'
--- timesheet_task/project_task_view.xml	2013-04-03 10:33:30 +0000
+++ timesheet_task/project_task_view.xml	2013-05-13 07:36:22 +0000
@@ -73,7 +73,7 @@
                                         editable="top">
                                         <field name="user_id"
                                             on_change="on_change_user_id(user_id)"
-                                            required="1" invisible="1" />
+                                            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)"