Merge lp://qastaging/~camptocamp/contract-management/list_only_general_analytic_line into lp://qastaging/~contract-management-core-editors/contract-management/7.0
Proposed by
Vincent Renaville@camptocamp
| Status: | Merged |
|---|---|
| Merged at revision: | 7 |
| Proposed branch: | lp://qastaging/~camptocamp/contract-management/list_only_general_analytic_line |
| Merge into: | lp://qastaging/~contract-management-core-editors/contract-management/7.0 |
| Diff against target: |
52 lines (+19/-13) 1 file modified
analytic_hours_block/report/hours_block.py (+19/-13) |
| To merge this branch: | bzr merge lp://qastaging/~camptocamp/contract-management/list_only_general_analytic_line |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Maxime Chambreuil (http://www.savoirfairelinux.com) | Approve | ||
| Guewen Baconnier @ Camptocamp | code review, no test | Approve | |
| Alexandre Fayolle - camptocamp | code review + improvements, no test | Approve | |
|
Review via email:
|
|||
Description of the change
I have add a restriction to only display analytic line with a journal of type "general", to be consistent with the fields function and to prevent report listing of analytic lines not related to a timesheet.
To post a comment you must log in.
Revision history for this message
| Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote | # |
review:
Approve
(code review + improvements, no test)
Revision history for this message
| Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote | # |
review:
Approve
(code review, no test)
Revision history for this message
| Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
refactoring committed and pushed to branch so that it LGTM :-)