Merge lp://staging/~dreis-pt/department-mgmt/project-v7b into lp://staging/~department-core-editors/department-mgmt/7.0

Proposed by Daniel Reis
Status: Superseded
Proposed branch: lp://staging/~dreis-pt/department-mgmt/project-v7b
Merge into: lp://staging/~department-core-editors/department-mgmt/7.0
Diff against target: 742 lines (+264/-386)
13 files modified
analytic_department/LICENSE (+18/-0)
analytic_department/__init__.py (+0/-31)
analytic_department/__openerp__.py (+10/-50)
analytic_department/analytic.py (+7/-49)
analytic_department/analytic_view.xml (+73/-86)
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
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp Needs Fixing
Review via email: mp+151006@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2013-03-04.

Description of the change

Migrating "project_department" to v7.
Timesheet features were split into a separate module.
Both these modules will auto-install if "analytic_department" is also installed.

To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Nitpicking:

l.299,314,326,338,350,429,441,453,702,714,729
The <field name="type">...</field> is now useless in v7, they can be removed.

Otherwise, it seems good to me, so I approve.

review: Approve (code review, no test)
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

hmm, not noticed that before, can you remove the +x flag on some .py files ?

=== modified file 'analytic_department/__init__.py' (properties changed: -x to +x)
=== modified file 'analytic_department/__openerp__.py' (properties changed: -x to +x)
=== modified file 'analytic_department/analytic.py' (properties changed: -x to +x)

review: Needs Fixing

Unmerged revisions

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