Merge lp:~camptocamp/hr-timesheet/full-fill-timesheet-account-type-vre into lp:~hr-core-editors/hr-timesheet/7.0

[Vincent Renaville@camptocamp]

change type from normal to contract to match project linked analytic account instead of standard analytic account

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

Hi,

Thanks for the contribs, I see a conflict here, can you check please ?

Regards,

review: Needs Fixing (code review, no tests)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

You might want to resubmit with only rev 58

rev 49 to 57 are certainly not meant to be in this MP

review: Needs Resubmitting

[Vincent Renaville@camptocamp (vrenaville-c2c)]

Hello,

It was proposed on the 6.1 instead of 7.0, sorry for that.

Vincent

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Vincent,

Thanks for the MP.

I wonder if this domain can be removed to allow any type of analytical accounts to be selected, because some users can use a custom analytic tree (by departments, for example) that doesn't match project concept.

Regards.

review: Needs Information

[Vincent Renaville@camptocamp (vrenaville-c2c)]

Hello Pedro,

Thanks for your review,

I have missed this point of view, I can add the normal type of account in domain.
but I need this domain to prevent the user to select an account of type view

so the domain will be

('type', 'in', ['contract','normal'])

What do you think about that ?

Vincent

[Pedro Manuel Baeza (pedro.baeza)]

Why don't you make

('type', '<>', 'view')?

Regards.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

As Pedro suggested, ('type', '<>', 'view') would be more generic and seems to fits the requirements you described.

review: Needs Fixing (code review, no tests)

[lp:~camptocamp/hr-timesheet/full-fill-timesheet-account-type-vre]

59. By Vincent Renaville@camptocamp on 2014-01-10

[FIX] change type test to be more generic

[Vincent Renaville@camptocamp (vrenaville-c2c)]

Hello,

Sorry for the delay .... and thanks for the review !

I agree with Pedro, so I change the type test.

Vincent

[Pedro Manuel Baeza (pedro.baeza)]

Thanks!

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Thanks for the change!

review: Approve (code review, no tests)

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

!= instead of <> to be consistent with the following lines?

Otherwise LGTM.

review: Approve (code review)

=== modified file 'hr_timesheet_fulfill/wizard/timesheet_fulfill.py'
--- hr_timesheet_fulfill/wizard/timesheet_fulfill.py	2013-05-02 13:51:52 +0000
+++ hr_timesheet_fulfill/wizard/timesheet_fulfill.py	2014-01-10 15:19:31 +0000
@@ -43,7 +43,7 @@
         'nb_hours': fields.float('Hours per Day', digits=(2, 2), required=True),
         'analytic_account_id': fields.many2one('account.analytic.account',
                                'Analytic Account', required=True,
-                               domain="[('type', '=', 'normal'),"
+                               domain="[('type', '<>', 'view'),"
                                       "('state', '!=', 'pending'),"
                                       "('state', '!=', 'close')]"),
         'task_id':fields.many2one('project.task', 'Task', required=False)