Contract management

Merge lp://qastaging/~camptocamp/contract-management/hours_block_vre into lp://qastaging/~contract-management-core-editors/contract-management/7.0

  1. hours_block_vre
  2. Merge into 7.0
Proposed by Matthieu Dietrich @ camptocamp
Status: Merged
Merged at revision: 12
Proposed branch: lp://qastaging/~camptocamp/contract-management/hours_block_vre
Merge into: lp://qastaging/~contract-management-core-editors/contract-management/7.0
Diff against target: 303 lines (+135/-13)
7 files modified
analytic_hours_block/__init__.py (+1/-0)
analytic_hours_block/__openerp__.py (+4/-1)
analytic_hours_block/hours_block.py (+72/-12)
analytic_hours_block/hours_block_menu.xml (+1/-0)
analytic_hours_block/hours_block_view.xml (+5/-0)
analytic_hours_block/project.py (+33/-0)
analytic_hours_block/project_view.xml (+19/-0)
To merge this branch: bzr merge lp://qastaging/~camptocamp/contract-management/hours_block_vre
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp code review, no test Approve
Yannick Vaucher @ Camptocamp code review, no test Approve
Review via email: mp+205212@code.qastaging.launchpad.net

Description of the change

- a new field for the department, which is filterable/searchable,
- a new button in the form view in order to display the hours block related to a project.

To post a comment you must log in.
lp://qastaging/~camptocamp/contract-management/hours_block_vre updated
9. By Lorenzo Battistini

[FIX] Can't install analytic_hours_block

10. By Daniel Reis

New project_sla module

Revision history for this message
Matthieu Dietrich @ camptocamp (mdietrich-c2c) wrote :

To expand a bit: this MP is to add 2 things related to hours block:
- a new field for the department, which is filterable/searchable,
- a new button in the project form view, in order to get the hours block related to a project.

Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

If department is changed in invoice the related field won't be updated.

Please set the proper store triggers.

Cheers,

review: Needs Fixing
lp://qastaging/~camptocamp/contract-management/hours_block_vre updated
11. By Matthieu Dietrich @ camptocamp

[FIX] fixed conflict with latest version + modified store conditions for related fields

Revision history for this message
Matthieu Dietrich @ camptocamp (mdietrich-c2c) wrote :

I fixed the store fields (not only department_id; other related() as well) to be refreshed if the distant field is modified.

Regards,
Matthieu

Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

Well done Thanks

LGTM

review: Approve (code review, no test)
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

42 + 'account.hours.block': (lambda self, cr, uid, ids, c=None:
43 + ids, ['invoice_id'], 10),

this is a very bad line split, please keep the 'ids' on the same line as the lambda

missing i18n update

review: Needs Fixing (code review, no test)
lp://qastaging/~camptocamp/contract-management/hours_block_vre updated
12. By Matthieu Dietrich @ camptocamp

[FIX] reformatting

Revision history for this message
Matthieu Dietrich @ camptocamp (mdietrich-c2c) wrote :

@afayolle: thanks, I re-formatted it now.

Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) :
review: Approve (code review, no test)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches