[Openerp-community] [Merge] lp:~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula into lp:openerp-mgmtsystem

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[Openerp-community] [Merge] lp:~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula into lp:openerp-mgmtsystem

Maxime Chambreuil (http://www.savoirfairelinux.com)
Maxime Chambreuil (http://www.savoirfairelinux.com) has proposed merging lp:~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula into lp:openerp-mgmtsystem.

Requested reviews:
  OpenERP Management System Core Editors (openerp-mgmtsystem-core-editors)

For more details, see:
https://code.launchpad.net/~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula/+merge/166901
--
https://code.launchpad.net/~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula/+merge/166901
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula.

=== modified file 'mgmtsystem_hazard/__openerp__.py'
--- mgmtsystem_hazard/__openerp__.py 2013-03-01 10:41:55 +0000
+++ mgmtsystem_hazard/__openerp__.py 2013-05-31 21:30:13 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 {
     "name" : "Management System - Hazard",
-    "version" : "1.0",
+    "version" : "1.1",
     "author" : "Savoir-faire Linux",
     "website" : "http://www.savoirfairelinux.com",
     "license" : "AGPL-3",

=== added directory 'mgmtsystem_hazard/i18n'
=== added file 'mgmtsystem_hazard/i18n/fr.po'
--- mgmtsystem_hazard/i18n/fr.po 1970-01-01 00:00:00 +0000
+++ mgmtsystem_hazard/i18n/fr.po 2013-05-31 21:30:13 +0000
@@ -0,0 +1,350 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * mgmtsystem_hazard
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-31 21:07+0000\n"
+"PO-Revision-Date: 2013-05-31 21:07+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard.test,name:0
+msgid "Test"
+msgstr "Test"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,severity_id:0
+#: field:mgmtsystem.hazard.residual_risk,severity_id:0
+#: view:mgmtsystem.hazard.severity:0
+#: field:mgmtsystem.hazard.severity,name:0
+msgid "Severity"
+msgstr "Sévérité"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_usage
+msgid "Usage of hazard"
+msgstr "Usage du danger"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_probability_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_probability
+#: view:mgmtsystem.hazard.probability:0
+msgid "Probabilities"
+msgstr "Probabilités"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_test_list
+#: view:mgmtsystem.hazard:0
+#: field:mgmtsystem.hazard,test_ids:0
+#: view:mgmtsystem.hazard.test:0
+msgid "Implementation Tests"
+msgstr "Tests d'implémentation"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,responsible_user_id:0
+#: field:mgmtsystem.hazard.control_measure,responsible_user_id:0
+#: field:mgmtsystem.hazard.test,responsible_user_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_hazard_list
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_mgmtsystem_configuration_hazards
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_hazard
+#: view:mgmtsystem.hazard.hazard:0
+msgid "Hazards"
+msgstr "Dangers"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard.control_measure,comments:0
+msgid "Comments"
+msgstr "Commentaires"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard:0
+msgid "Group By..."
+msgstr "Regrouper par..."
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,department_id:0
+msgid "Department"
+msgstr "Département"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_severity_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_severity
+#: view:mgmtsystem.hazard.severity:0
+msgid "Severities"
+msgstr "Sévérités"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard
+msgid "Hazards of the health and safety management system"
+msgstr "Dangers du système de santé et de sécurité"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_control_measure_list
+#: view:mgmtsystem.hazard:0
+#: field:mgmtsystem.hazard,control_measure_ids:0
+#: view:mgmtsystem.hazard.control_measure:0
+msgid "Control Measures"
+msgstr "Mesures de contrôle"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,justification:0
+#: field:mgmtsystem.hazard.residual_risk,justification:0
+msgid "Justification"
+msgstr "Justification"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard.hazard,description:0
+#: field:mgmtsystem.hazard.origin,description:0
+#: field:mgmtsystem.hazard.probability,description:0
+#: field:mgmtsystem.hazard.risk.computation,description:0
+#: field:mgmtsystem.hazard.risk.type,description:0
+#: field:mgmtsystem.hazard.severity,description:0
+#: field:mgmtsystem.hazard.type,description:0
+#: field:mgmtsystem.hazard.usage,description:0
+msgid "Description"
+msgstr "Description"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_risk_type
+msgid "Risk type of the hazard"
+msgstr "Type de risque du danger"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard:0
+#: field:mgmtsystem.hazard,type_id:0
+#: view:mgmtsystem.hazard.type:0
+#: field:mgmtsystem.hazard.type,name:0
+msgid "Type"
+msgstr "Type"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_hazard
+#: view:mgmtsystem.hazard:0
+#: field:mgmtsystem.hazard,hazard_id:0
+#: field:mgmtsystem.hazard.control_measure,hazard_id:0
+#: view:mgmtsystem.hazard.hazard:0
+#: field:mgmtsystem.hazard.hazard,name:0
+#: field:mgmtsystem.hazard.residual_risk,hazard_id:0
+#: field:mgmtsystem.hazard.test,hazard_id:0
+msgid "Hazard"
+msgstr "Danger"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_residual_risk_list
+#: view:mgmtsystem.hazard.residual_risk:0
+msgid "Residual Risks"
+msgstr "Risques résiduels"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard.control_measure:0
+#: field:mgmtsystem.hazard.control_measure,name:0
+msgid "Control Measure"
+msgstr "Mesure de contrôle"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_control_measure
+msgid "Control Measure of hazard"
+msgstr "Mesure de contrôle du danger"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_probability
+msgid "Probability of hazard"
+msgstr "Probabilité du danger"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard:0
+#: field:mgmtsystem.hazard,residual_risk_ids:0
+msgid "Residual Risk Evaluations"
+msgstr "Évaluations du risque résiduel"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,analysis_date:0
+msgid "Date"
+msgstr "Date"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard.probability,value:0
+#: field:mgmtsystem.hazard.severity,value:0
+#: field:mgmtsystem.hazard.usage,value:0
+msgid "Value"
+msgstr "Valeur"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard:0
+msgid "Accepted"
+msgstr "Accepté"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,usage_id:0
+#: field:mgmtsystem.hazard.residual_risk,usage_id:0
+#: view:mgmtsystem.hazard.usage:0
+#: field:mgmtsystem.hazard.usage,name:0
+msgid "Occupation / Usage"
+msgstr "Occupation / Usage"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_type_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_type
+#: view:mgmtsystem.hazard.type:0
+msgid "Types"
+msgstr "Types"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,risk_type_id:0
+#: view:mgmtsystem.hazard.risk.type:0
+#: field:mgmtsystem.hazard.risk.type,name:0
+msgid "Risk Type"
+msgstr "Type de risque"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,name:0
+#: field:mgmtsystem.hazard.residual_risk,name:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_origin_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_origin
+#: view:mgmtsystem.hazard.origin:0
+msgid "Origins"
+msgstr "Origines"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard.risk.computation:0
+#: field:res.company,risk_computation_id:0
+msgid "Risk Computation"
+msgstr "Calcul du risque"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard.residual_risk:0
+msgid "Residual Risk"
+msgstr "Risque résiduel"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_res_company
+msgid "Companies"
+msgstr "Sociétés"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_usage_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_usage
+#: view:mgmtsystem.hazard.usage:0
+msgid "Occupations / Usages"
+msgstr "Occupations / Usages"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_test
+msgid "Implementation Tests of hazard"
+msgstr "Tests d'implémentation du danger"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_type
+msgid "Type of hazard"
+msgstr "Type de danger"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_severity
+msgid "Severity of hazard"
+msgstr "Sévérité du danger"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_residual_risk
+msgid "Residual Risks of hazard"
+msgstr "Risques résiduels du danger"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard:0
+msgid "Analysis"
+msgstr "Analyse"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_risk_type_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_risk_type
+#: view:mgmtsystem.hazard.risk.type:0
+msgid "Risk Types"
+msgstr "Types de risque"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_risk_computation
+#: field:mgmtsystem.hazard.risk.computation,name:0
+msgid "Computation Risk"
+msgstr "Calcul du risque"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,risk:0
+#: field:mgmtsystem.hazard.residual_risk,risk:0
+msgid "Risk"
+msgstr "Risque"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,origin_id:0
+#: view:mgmtsystem.hazard.origin:0
+#: field:mgmtsystem.hazard.origin,name:0
+msgid "Origin"
+msgstr "Origine"
+
+#. module: mgmtsystem_hazard
+#: view:res.company:0
+msgid "Management System"
+msgstr "Système de gestion"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard.test,executed:0
+msgid "Executed"
+msgstr "Exécuté"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard:0
+msgid "Risk Evaluation"
+msgstr "Évaluation du risque"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,probability_id:0
+#: view:mgmtsystem.hazard.probability:0
+#: field:mgmtsystem.hazard.probability,name:0
+#: field:mgmtsystem.hazard.residual_risk,probability_id:0
+msgid "Probability"
+msgstr "Probabilité"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard.test:0
+msgid "Implementation Test"
+msgstr "Test d'implémentation"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_origin
+msgid "Origin of hazard"
+msgstr "Origine du danger"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard.test,review_date:0
+msgid "Review Date"
+msgstr "Date de revue"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_risk_computation_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_risk_computation
+#: view:mgmtsystem.hazard.risk.computation:0
+msgid "Risk Computations"
+msgstr "Calculs du risque"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,acceptability:0
+#: field:mgmtsystem.hazard.residual_risk,acceptability:0
+msgid "Acceptability"
+msgstr "Acceptabilité"
+

=== added file 'mgmtsystem_hazard/i18n/mgmtsystem_hazard.pot'
--- mgmtsystem_hazard/i18n/mgmtsystem_hazard.pot 1970-01-01 00:00:00 +0000
+++ mgmtsystem_hazard/i18n/mgmtsystem_hazard.pot 2013-05-31 21:30:13 +0000
@@ -0,0 +1,350 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * mgmtsystem_hazard
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-31 21:08+0000\n"
+"PO-Revision-Date: 2013-05-31 21:08+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard.test,name:0
+msgid "Test"
+msgstr "Test"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,severity_id:0
+#: field:mgmtsystem.hazard.residual_risk,severity_id:0
+#: view:mgmtsystem.hazard.severity:0
+#: field:mgmtsystem.hazard.severity,name:0
+msgid "Severity"
+msgstr "Severity"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_usage
+msgid "Usage of hazard"
+msgstr "Usage of hazard"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_probability_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_probability
+#: view:mgmtsystem.hazard.probability:0
+msgid "Probabilities"
+msgstr "Probabilities"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_test_list
+#: view:mgmtsystem.hazard:0
+#: field:mgmtsystem.hazard,test_ids:0
+#: view:mgmtsystem.hazard.test:0
+msgid "Implementation Tests"
+msgstr "Implementation Tests"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,responsible_user_id:0
+#: field:mgmtsystem.hazard.control_measure,responsible_user_id:0
+#: field:mgmtsystem.hazard.test,responsible_user_id:0
+msgid "Responsible"
+msgstr "Responsible"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_hazard_list
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_mgmtsystem_configuration_hazards
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_hazard
+#: view:mgmtsystem.hazard.hazard:0
+msgid "Hazards"
+msgstr "Hazards"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard.control_measure,comments:0
+msgid "Comments"
+msgstr "Comments"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard:0
+msgid "Group By..."
+msgstr "Group By..."
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,department_id:0
+msgid "Department"
+msgstr "Department"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_severity_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_severity
+#: view:mgmtsystem.hazard.severity:0
+msgid "Severities"
+msgstr "Severities"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard
+msgid "Hazards of the health and safety management system"
+msgstr "Hazards of the health and safety management system"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_control_measure_list
+#: view:mgmtsystem.hazard:0
+#: field:mgmtsystem.hazard,control_measure_ids:0
+#: view:mgmtsystem.hazard.control_measure:0
+msgid "Control Measures"
+msgstr "Control Measures"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,justification:0
+#: field:mgmtsystem.hazard.residual_risk,justification:0
+msgid "Justification"
+msgstr "Justification"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard.hazard,description:0
+#: field:mgmtsystem.hazard.origin,description:0
+#: field:mgmtsystem.hazard.probability,description:0
+#: field:mgmtsystem.hazard.risk.computation,description:0
+#: field:mgmtsystem.hazard.risk.type,description:0
+#: field:mgmtsystem.hazard.severity,description:0
+#: field:mgmtsystem.hazard.type,description:0
+#: field:mgmtsystem.hazard.usage,description:0
+msgid "Description"
+msgstr "Description"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_risk_type
+msgid "Risk type of the hazard"
+msgstr "Risk type of the hazard"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard:0
+#: field:mgmtsystem.hazard,type_id:0
+#: view:mgmtsystem.hazard.type:0
+#: field:mgmtsystem.hazard.type,name:0
+msgid "Type"
+msgstr "Type"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_hazard
+#: view:mgmtsystem.hazard:0
+#: field:mgmtsystem.hazard,hazard_id:0
+#: field:mgmtsystem.hazard.control_measure,hazard_id:0
+#: view:mgmtsystem.hazard.hazard:0
+#: field:mgmtsystem.hazard.hazard,name:0
+#: field:mgmtsystem.hazard.residual_risk,hazard_id:0
+#: field:mgmtsystem.hazard.test,hazard_id:0
+msgid "Hazard"
+msgstr "Hazard"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_residual_risk_list
+#: view:mgmtsystem.hazard.residual_risk:0
+msgid "Residual Risks"
+msgstr "Residual Risks"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard.control_measure:0
+#: field:mgmtsystem.hazard.control_measure,name:0
+msgid "Control Measure"
+msgstr "Control Measure"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_control_measure
+msgid "Control Measure of hazard"
+msgstr "Control Measure of hazard"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_probability
+msgid "Probability of hazard"
+msgstr "Probability of hazard"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard:0
+#: field:mgmtsystem.hazard,residual_risk_ids:0
+msgid "Residual Risk Evaluations"
+msgstr "Residual Risk Evaluations"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,analysis_date:0
+msgid "Date"
+msgstr "Date"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard.probability,value:0
+#: field:mgmtsystem.hazard.severity,value:0
+#: field:mgmtsystem.hazard.usage,value:0
+msgid "Value"
+msgstr "Value"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard:0
+msgid "Accepted"
+msgstr "Accepted"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,usage_id:0
+#: field:mgmtsystem.hazard.residual_risk,usage_id:0
+#: view:mgmtsystem.hazard.usage:0
+#: field:mgmtsystem.hazard.usage,name:0
+msgid "Occupation / Usage"
+msgstr "Occupation / Usage"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_type_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_type
+#: view:mgmtsystem.hazard.type:0
+msgid "Types"
+msgstr "Types"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,risk_type_id:0
+#: view:mgmtsystem.hazard.risk.type:0
+#: field:mgmtsystem.hazard.risk.type,name:0
+msgid "Risk Type"
+msgstr "Risk Type"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,name:0
+#: field:mgmtsystem.hazard.residual_risk,name:0
+msgid "Name"
+msgstr "Name"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_origin_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_origin
+#: view:mgmtsystem.hazard.origin:0
+msgid "Origins"
+msgstr "Origins"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard.risk.computation:0
+#: field:res.company,risk_computation_id:0
+msgid "Risk Computation"
+msgstr "Risk Computation"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard.residual_risk:0
+msgid "Residual Risk"
+msgstr "Residual Risk"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_res_company
+msgid "Companies"
+msgstr "Companies"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_usage_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_usage
+#: view:mgmtsystem.hazard.usage:0
+msgid "Occupations / Usages"
+msgstr "Occupations / Usages"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_test
+msgid "Implementation Tests of hazard"
+msgstr "Implementation Tests of hazard"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_type
+msgid "Type of hazard"
+msgstr "Type of hazard"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_severity
+msgid "Severity of hazard"
+msgstr "Severity of hazard"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_residual_risk
+msgid "Residual Risks of hazard"
+msgstr "Residual Risks of hazard"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard:0
+msgid "Analysis"
+msgstr "Analysis"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_risk_type_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_risk_type
+#: view:mgmtsystem.hazard.risk.type:0
+msgid "Risk Types"
+msgstr "Risk Types"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_risk_computation
+#: field:mgmtsystem.hazard.risk.computation,name:0
+msgid "Computation Risk"
+msgstr "Computation Risk"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,risk:0
+#: field:mgmtsystem.hazard.residual_risk,risk:0
+msgid "Risk"
+msgstr "Risk"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,origin_id:0
+#: view:mgmtsystem.hazard.origin:0
+#: field:mgmtsystem.hazard.origin,name:0
+msgid "Origin"
+msgstr "Origin"
+
+#. module: mgmtsystem_hazard
+#: view:res.company:0
+msgid "Management System"
+msgstr "Management System"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard.test,executed:0
+msgid "Executed"
+msgstr "Executed"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard:0
+msgid "Risk Evaluation"
+msgstr "Risk Evaluation"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,probability_id:0
+#: view:mgmtsystem.hazard.probability:0
+#: field:mgmtsystem.hazard.probability,name:0
+#: field:mgmtsystem.hazard.residual_risk,probability_id:0
+msgid "Probability"
+msgstr "Probability"
+
+#. module: mgmtsystem_hazard
+#: view:mgmtsystem.hazard.test:0
+msgid "Implementation Test"
+msgstr "Implementation Test"
+
+#. module: mgmtsystem_hazard
+#: model:ir.model,name:mgmtsystem_hazard.model_mgmtsystem_hazard_origin
+msgid "Origin of hazard"
+msgstr "Origin of hazard"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard.test,review_date:0
+msgid "Review Date"
+msgstr "Review Date"
+
+#. module: mgmtsystem_hazard
+#: model:ir.actions.act_window,name:mgmtsystem_hazard.open_mgmtsystem_hazard_risk_computation_list
+#: model:ir.ui.menu,name:mgmtsystem_hazard.menu_open_hazard_risk_computation
+#: view:mgmtsystem.hazard.risk.computation:0
+msgid "Risk Computations"
+msgstr "Risk Computations"
+
+#. module: mgmtsystem_hazard
+#: field:mgmtsystem.hazard,acceptability:0
+#: field:mgmtsystem.hazard.residual_risk,acceptability:0
+msgid "Acceptability"
+msgstr "Acceptability"
+

=== modified file 'mgmtsystem_hazard/mgmtsystem_hazard.py'
--- mgmtsystem_hazard/mgmtsystem_hazard.py 2012-12-17 17:18:12 +0000
+++ mgmtsystem_hazard/mgmtsystem_hazard.py 2013-05-31 21:30:13 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from openerp.osv import fields, orm
 import time
 
 def _parse_risk_formula(formula, a, b, c):
@@ -27,7 +27,7 @@
     f = formula.replace('A', str(a)).replace('B', str(b)).replace('C', str(c))
     return eval(f)
 
-class mgmtsystem_hazard_type(osv.osv):
+class mgmtsystem_hazard_type(orm.Model):
 
     _name = "mgmtsystem.hazard.type"
     _description = "Type of hazard"
@@ -36,9 +36,8 @@
         'description': fields.text('Description'),
     }
 
-mgmtsystem_hazard_type()
 
-class mgmtsystem_hazard_risk_computation(osv.osv):
+class mgmtsystem_hazard_risk_computation(orm.Model):
 
     _name = "mgmtsystem.hazard.risk.computation"
     _description = "Computation Risk"
@@ -47,17 +46,22 @@
         'description': fields.text('Description'),
     }
 
-mgmtsystem_hazard_risk_computation()
 
-class res_company(osv.osv):
+class res_company(orm.Model):
     _inherit = "res.company"
     _columns = {
-        'risk_computation_id': fields.many2one('mgmtsystem.hazard.risk.computation', 'Risk Computation'),
-    }
-
-res_company()
-
-class mgmtsystem_hazard_risk_type(osv.osv):
+        'risk_computation_id': fields.many2one('mgmtsystem.hazard.risk.computation', 'Risk Computation', required=True),
+    }
+
+    def _get_formula(self, cr, uid, context=None):
+        ids = self.pool.get('mgmtsystem.hazard.risk.computation').search(cr,uid,[('name','=','A * B * C')], context=context)
+        return ids and ids[0] or False
+
+    _defaults = {
+        'risk_computation_id': _get_formula
+    }
+
+class mgmtsystem_hazard_risk_type(orm.Model):
 
     _name = "mgmtsystem.hazard.risk.type"
     _description = "Risk type of the hazard"
@@ -66,9 +70,7 @@
         'description': fields.text('Description'),
     }
 
-mgmtsystem_hazard_risk_type()
-
-class mgmtsystem_hazard_origin(osv.osv):
+class mgmtsystem_hazard_origin(orm.Model):
 
     _name = "mgmtsystem.hazard.origin"
     _description = "Origin of hazard"
@@ -77,9 +79,7 @@
         'description': fields.text('Description')
     }
 
-mgmtsystem_hazard_origin()
-
-class mgmtsystem_hazard_hazard(osv.osv):
+class mgmtsystem_hazard_hazard(orm.Model):
 
     _name = "mgmtsystem.hazard.hazard"
     _description = "Hazard"
@@ -87,10 +87,8 @@
         'name': fields.char('Hazard', size=50, required=True),
         'description': fields.text('Description'),
     }
-
-mgmtsystem_hazard_hazard()
 
-class mgmtsystem_hazard_probability(osv.osv):
+class mgmtsystem_hazard_probability(orm.Model):
 
     _name = "mgmtsystem.hazard.probability"
     _description = "Probability of hazard"
@@ -100,9 +98,7 @@
         'description': fields.text('Description')
     }
 
-mgmtsystem_hazard_probability()
-
-class mgmtsystem_hazard_severity(osv.osv):
+class mgmtsystem_hazard_severity(orm.Model):
 
     _name = "mgmtsystem.hazard.severity"
     _description = "Severity of hazard"
@@ -112,9 +108,7 @@
         'description': fields.text('Description')
     }
 
-mgmtsystem_hazard_severity()
-
-class mgmtsystem_hazard_usage(osv.osv):
+class mgmtsystem_hazard_usage(orm.Model):
 
     _name = "mgmtsystem.hazard.usage"
     _description = "Usage of hazard"
@@ -124,9 +118,7 @@
         'description': fields.text('Description')
     }
 
-mgmtsystem_hazard_usage()
-
-class mgmtsystem_hazard_control_measure(osv.osv):
+class mgmtsystem_hazard_control_measure(orm.Model):
 
     _name = "mgmtsystem.hazard.control_measure"
     _description = "Control Measure of hazard"
@@ -137,9 +129,7 @@
  'hazard_id': fields.many2one('mgmtsystem.hazard', 'Hazard', ondelete='cascade', select=True),
     }
 
-mgmtsystem_hazard_control_measure()
-
-class mgmtsystem_hazard_test(osv.osv):
+class mgmtsystem_hazard_test(orm.Model):
 
     _name = "mgmtsystem.hazard.test"
     _description = "Implementation Tests of hazard"
@@ -151,9 +141,7 @@
  'hazard_id': fields.many2one('mgmtsystem.hazard', 'Hazard', ondelete='cascade', select=True),
     }
 
-mgmtsystem_hazard_test()
-
-class mgmtsystem_hazard_residual_risk(osv.osv):
+class mgmtsystem_hazard_residual_risk(orm.Model):
 
     _name = "mgmtsystem.hazard.residual_risk"
     _description = "Residual Risks of hazard"
@@ -179,15 +167,13 @@
         'probability_id': fields.many2one('mgmtsystem.hazard.probability','Probability', required=True),
         'severity_id': fields.many2one('mgmtsystem.hazard.severity','Severity', required=True),
         'usage_id': fields.many2one('mgmtsystem.hazard.usage','Occupation / Usage'),
- 'risk': fields.function(_compute_risk,string='Risk',type='integer'),
+    'risk': fields.function(_compute_risk,string='Risk',type='integer'),
         'acceptability': fields.boolean('Acceptability'),
         'justification': fields.text('Justification'),
- 'hazard_id': fields.many2one('mgmtsystem.hazard', 'Hazard', ondelete='cascade', select=True),
+    'hazard_id': fields.many2one('mgmtsystem.hazard', 'Hazard', ondelete='cascade', select=True),
     }
 
-mgmtsystem_hazard_residual_risk()
-
-class mgmtsystem_hazard(osv.osv):
+class mgmtsystem_hazard(orm.Model):
 
     _name = "mgmtsystem.hazard"
     _description = "Hazards of the health and safety management system"
@@ -196,9 +182,7 @@
         result = {}
         user = self.pool.get('res.users').browse(cr, uid, uid)
         for obj in self.browse(cr, uid, ids):
-            # TODO: Use res.company.risk_computation_id to determine the risk computation
             if obj.probability_id and obj.severity_id and obj.usage_id:
-                #result[obj.id] = obj.probability_id.value * obj.severity_id.value * obj.usage_id.value
                 mycompany = self.pool.get('res.company').browse(cr, uid, user.company_id.id, context)
                 result[obj.id] = _parse_risk_formula(mycompany.risk_computation_id.name,
                                                      obj.probability_id.value,
@@ -211,24 +195,22 @@
 
     _columns = {
         'name': fields.char('Name', size=50, required=True),
- 'type_id': fields.many2one('mgmtsystem.hazard.type', 'Type', required=True),
+    'type_id': fields.many2one('mgmtsystem.hazard.type', 'Type', required=True),
         'hazard_id': fields.many2one('mgmtsystem.hazard.hazard','Hazard', required=True),
- 'risk_type_id': fields.many2one('mgmtsystem.hazard.risk.type', 'Risk Type', required=True),
- 'origin_id': fields.many2one('mgmtsystem.hazard.origin', 'Origin', required=True),
- 'department_id': fields.many2one('hr.department', 'Department', required=True),
+    'risk_type_id': fields.many2one('mgmtsystem.hazard.risk.type', 'Risk Type', required=True),
+    'origin_id': fields.many2one('mgmtsystem.hazard.origin', 'Origin', required=True),
+    'department_id': fields.many2one('hr.department', 'Department', required=True),
         'responsible_user_id': fields.many2one('res.users','Responsible', required=True),
         'analysis_date': fields.date('Date', required=True),
         'probability_id': fields.many2one('mgmtsystem.hazard.probability','Probability'),
         'severity_id': fields.many2one('mgmtsystem.hazard.severity','Severity'),
         'usage_id': fields.many2one('mgmtsystem.hazard.usage','Occupation / Usage'),
- 'risk': fields.function(_compute_risk,string='Risk',type='integer'),
+    'risk': fields.function(_compute_risk,string='Risk',type='integer'),
         'acceptability': fields.boolean('Acceptability'),
         'justification': fields.text('Justification'),
- 'control_measure_ids': fields.one2many('mgmtsystem.hazard.control_measure','hazard_id','Control Measures'),
- 'test_ids': fields.one2many('mgmtsystem.hazard.test','hazard_id','Implementation Tests'),
- 'residual_risk_ids': fields.one2many('mgmtsystem.hazard.residual_risk','hazard_id','Residual Risk Evaluations'),
+    'control_measure_ids': fields.one2many('mgmtsystem.hazard.control_measure','hazard_id','Control Measures'),
+    'test_ids': fields.one2many('mgmtsystem.hazard.test','hazard_id','Implementation Tests'),
+    'residual_risk_ids': fields.one2many('mgmtsystem.hazard.residual_risk','hazard_id','Residual Risk Evaluations'),
     }
 
-mgmtsystem_hazard()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'mgmtsystem_hazard/mgmtsystem_hazard.xml'
--- mgmtsystem_hazard/mgmtsystem_hazard.xml 2013-03-04 11:31:40 +0000
+++ mgmtsystem_hazard/mgmtsystem_hazard.xml 2013-05-31 21:30:13 +0000
@@ -342,8 +342,9 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//page[@string='Configuration']" position="inside">
-                    <separator string="Management System"/>
-                    <field name="risk_computation_id"/>
+                    <group name="mgmtsystem_group" string="Management System">
+                        <field name="risk_computation_id"/>
+                    </group>
                 </xpath>
             </field>
         </record>


_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [Openerp-community] [Merge] lp:~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula into lp:openerp-mgmtsystem

Guewen Baconnier @ Camptocamp
Review: Approve code review, no test

LGTM
--
https://code.launchpad.net/~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula/+merge/166901
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula.

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [Openerp-community] [Merge] lp:~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula into lp:openerp-mgmtsystem

Joao Alfredo Gama Batista
In reply to this post by Maxime Chambreuil (http://www.savoirfairelinux.com)
Review: Approve lgtm. no tests


--
https://code.launchpad.net/~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula/+merge/166901
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula.

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [Openerp-community] [Merge] lp:~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula into lp:openerp-mgmtsystem

Daniel Reis (SECURITAS SA)-3
In reply to this post by Maxime Chambreuil (http://www.savoirfairelinux.com)
Review: Approve lgtm

LGTM
--
https://code.launchpad.net/~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula/+merge/166901
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula.

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[Openerp-community] [Merge] lp:~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula into lp:openerp-mgmtsystem

noreply
In reply to this post by Maxime Chambreuil (http://www.savoirfairelinux.com)
The proposal to merge lp:~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula into lp:openerp-mgmtsystem has been updated.

    Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula/+merge/166901
--
https://code.launchpad.net/~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula/+merge/166901
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula.

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[Openerp-community] this really matters

debaetsr
In reply to this post by Maxime Chambreuil (http://www.savoirfairelinux.com)
Hey,

I've  got some news  for  you, please read it, this  really  matters a lot! Please read  here <http://hope.photoclassics.net/e4mcdeqo>

Yours faithfully, ruben



--
https://code.launchpad.net/~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula/+merge/166901
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openerp-mgmtsystem/7.0-set-default-risk-formula.

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Loading...