~sandy-carter/openerp-mgmtsystem/IGNOREME_cause_conflict

  • Committer: Sandy Carter
  • Date: 2014-04-18 19:14:10 UTC
  • Revision ID: sandy.carter@savoirfairelinux.com-20140418191410-73zlm9otblvalwuc
Force a merge conflict
Filename Latest Rev Last Changed Committer Comment Size
..
mgmtsystem 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
mgmtsystem_action 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
mgmtsystem_audit 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
mgmtsystem_claim 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
mgmtsystem_environment 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
mgmtsystem_hazard 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
mgmtsystem_health_safety 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
mgmtsystem_kpi 4.1.1 11 years ago Maxime Chambreuil [ADD] mgmtsystem_kpi Diff
mgmtsystem_manuals 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
mgmtsystem_nonconformity 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
mgmtsystem_nonconformity_analytic 11.1.16 11 years ago Daniel Reis ADD: option to relate a NC to a Contract / Analyti Diff
mgmtsystem_nonconformity_claim 11.1.30 11 years ago Daniel Reis CHG Renamed 'feedback' to 'claim', see explanation Diff
mgmtsystem_nonconformity_deptm 11.1.14 11 years ago erp_user xoe user CHG: NC Department now added by an optional module Diff
mgmtsystem_nonconformity_project 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
mgmtsystem_quality 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
mgmtsystem_review 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
mgmtsystem_survey 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
wiki_environment_manual 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
wiki_environmental_aspect 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
wiki_health_safety_manual 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
wiki_procedure 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
wiki_work_instructions 1 12 years ago Maxime Chambreuil [ADD] Initial commit. Import from extra-addons. Diff
.bzrignore 2 12 years ago Maxime Chambreuil [IMP] cleanup 5 bytes Diff Download File