Merge lp://staging/~dreis-pt/department-mgmt/project-v7b into lp://staging/~department-core-editors/department-mgmt/7.0
Proposed by
Daniel Reis
Status: | Merged |
---|---|
Merged at revision: | 11 |
Proposed branch: | lp://staging/~dreis-pt/department-mgmt/project-v7b |
Merge into: | lp://staging/~department-core-editors/department-mgmt/7.0 |
Prerequisite: | lp://staging/~dreis-pt/department-mgmt/analytic-v7 |
Diff against target: |
375 lines (+156/-170) 8 files modified
hr_timesheet_department/LICENSE (+18/-0) hr_timesheet_department/__init__.py (+1/-0) hr_timesheet_department/__openerp__.py (+16/-0) hr_timesheet_department/hr_timesheet_view.xml (+46/-0) project_department/LICENSE (+18/-0) project_department/__init__.py (+1/-32) project_department/__openerp__.py (+10/-51) project_department/project_view.xml (+46/-87) |
To merge this branch: | bzr merge lp://staging/~dreis-pt/department-mgmt/project-v7b |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Guewen Baconnier @ Camptocamp | Pending | ||
Review via email: mp+151562@code.staging.launchpad.net |
This proposal supersedes a proposal from 2013-02-28.
Description of the change
[Resubmitting with fixes and proper prerequisite branch info]:
Migrating "project_
Timesheet features were split into a separate module.
Both these modules will auto-install if "analytic_
To post a comment you must log in.
Nitpicking:
l.299,314, 326,338, 350,429, 441,453, 702,714, 729 >...</field> is now useless in v7, they can be removed.
The <field name="type"
Otherwise, it seems good to me, so I approve.