Merge lp://qastaging/~gs.clearcorp/openerp-ccorp-addons/7.0_project_openerp_methodology into lp://qastaging/openerp-ccorp-addons/7.0
Proposed by
Glen Sojo
Status: | Merged |
---|---|
Merged at revision: | 854 |
Proposed branch: | lp://qastaging/~gs.clearcorp/openerp-ccorp-addons/7.0_project_openerp_methodology |
Merge into: | lp://qastaging/openerp-ccorp-addons/7.0 |
Diff against target: |
5515 lines (+1567/-1531) 22 files modified
ccorp_project_oerp/__init__.py (+1/-1) ccorp_project_oerp/__openerp__.py (+5/-5) ccorp_project_oerp/ccorp_project_oerp.py (+28/-28) ccorp_project_oerp/data/ccorp_project_oerp_data.xml (+22/-22) ccorp_project_oerp/i18n/ccorp_project_oerp.pot (+252/-226) ccorp_project_oerp/i18n/es.po (+281/-255) ccorp_project_oerp/security/ir.model.access.csv (+9/-9) ccorp_project_oerp/view/ccorp_project_oerp_menu.xml (+1/-1) ccorp_project_oerp/view/ccorp_project_oerp_view.xml (+27/-27) ccorp_project_oerp/wizard/feature_import_wizard.py (+6/-6) ccorp_project_oerp/wizard/phase_create_wizard.py (+3/-3) ccorp_project_oerp/wizard/sprint_close_wizard.py (+4/-4) ccorp_project_oerp/wizard/task_create_wizard.py (+8/-8) ccorp_project_oerp/wizard/wizard_view.xml (+8/-8) ccorp_project_scrum/__init__.py (+1/-1) ccorp_project_scrum/__openerp__.py (+5/-5) ccorp_project_scrum/ccorp_project_scrum.py (+28/-28) ccorp_project_scrum/data/ccorp_project_scrum_data.xml (+4/-4) ccorp_project_scrum/i18n/ccorp_project_scrum.pot (+397/-404) ccorp_project_scrum/i18n/es.po (+441/-450) ccorp_project_scrum/security/ir.model.access.csv (+10/-10) ccorp_project_scrum/view/ccorp_project_scrum_view.xml (+26/-26) |
To merge this branch: | bzr merge lp://qastaging/~gs.clearcorp/openerp-ccorp-addons/7.0_project_openerp_methodology |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ClearCorp drivers | Pending | ||
Review via email:
|
Description of the change
[FIX] - project_scrum module renamed to ccorp_project_scrum including all objects in module
To post a comment you must log in.