Viewing all changes in revision 0.5.50.
- Committer: Virgil Dupras
- Date: 2013-01-31 14:21:30 UTC
- mfrom: (10.2.3 migrate-7.0)
- mto: This revision was merged to the branch mainline in revision 16.
- Revision ID: virgil.dupras@savoirfairelinux.com-20130131142130-grxopntdhgea04u5
[MRG] Merged nc-extend with migrate-7.0
I resolved basic conficts, but there are still problems with modules that we have to fix.
I resolved basic conficts, but there are still problems with modules that we have to fix.
- files added:
- document_page_quality_manual
- document_page_quality_manual/i18n
- document_page_quality_manual/images
- document_page_quality_manual/static
- document_page_quality_manual/static/src
- document_page_quality_manual/static/src/img
- files removed:
- files renamed:
- .bzrignore => .bzrignore
- wiki_environment_manual/ => document_page_environment_manual/
- wiki_environment_manual/wiki_environment_manual.xml => document_page_environment_manual/document_page_environment_manual.xml
- wiki_environmental_aspect/ => document_page_environmental_aspect/
- wiki_environmental_aspect/wiki_environmental_aspect.xml => document_page_environmental_aspect/document_page_environmental_aspect.xml
- wiki_health_safety_manual/ => document_page_health_safety_manual/
- wiki_health_safety_manual/wiki_health_safety_manual.xml => document_page_health_safety_manual/document_page_health_safety_manual.xml
- wiki_procedure/ => document_page_procedure/
- wiki_procedure/wiki_procedure.xml => document_page_procedure/document_page_procedure.xml
- wiki_work_instructions/ => document_page_work_instructions/
- wiki_work_instructions/wiki_work_instructions.xml => document_page_work_instructions/document_page_work_instructions.xml
- mgmtsystem/ => mgmtsystem/
- mgmtsystem_action/ => mgmtsystem_action/
- mgmtsystem_audit/ => mgmtsystem_audit/
- mgmtsystem_claim/ => mgmtsystem_claim/
- mgmtsystem_environment/ => mgmtsystem_environment/
- mgmtsystem_hazard/ => mgmtsystem_hazard/
- mgmtsystem_health_safety/ => mgmtsystem_health_safety/
- mgmtsystem_kpi/ => mgmtsystem_kpi/
- mgmtsystem_manuals/ => mgmtsystem_manuals/
- mgmtsystem_nonconformity/ => mgmtsystem_nonconformity/
- mgmtsystem_nonconformity_analytic/ => mgmtsystem_nonconformity_analytic/
- mgmtsystem_nonconformity_claim/ => mgmtsystem_nonconformity_claim/
- mgmtsystem_nonconformity_deptm/ => mgmtsystem_nonconformity_deptm/
- mgmtsystem_nonconformity_project/ => mgmtsystem_nonconformity_project/
- mgmtsystem_quality/ => mgmtsystem_quality/
- mgmtsystem_review/ => mgmtsystem_review/
- mgmtsystem_survey/ => mgmtsystem_survey/
- files modified:
- document_page_environment_manual/__openerp__.py
expand all
collapse all
added
removed
document_page_quality_manual/images/wiki_pages_quality_manual.jpeg
document_page_quality_manual/static/src/img/icon.png
