10.0 mig mgmtsystem hazard #228
Conversation
mgmtsystem_hazard/README.rst
Outdated
| To configure this module, you need to: | ||
|
|
||
| * go to Settings > Companies > Companies and select your company | ||
| * in the configuration tab, select the risk computation formulae |
There was a problem hiding this comment.
I cannot find the risk computation formulae
There was a problem hiding this comment.
I didn't notice, but that's because the field has been moved to module hazard_risk since V8 actually. I'll remove that from here.
| """Hazards of the health and safety management system""""" | ||
|
|
||
| _name = "mgmtsystem.hazard" | ||
| _description = __doc__ |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
mgmtsystem_hazard/__manifest__.py
Outdated
| 'views/mgmtsystem_hazard_usage.xml', | ||
| 'views/mgmtsystem_hazard_control_measure.xml', | ||
| 'views/mgmtsystem_hazard_test.xml', | ||
| 'data/mgmtsystem_hazard_hazard.xml', |
There was a problem hiding this comment.
IMHO, all the data are demo data.
| 'demo/mgmtsystem_hazard_probability.xml', | ||
| 'demo/mgmtsystem_hazard_severity.xml', | ||
| 'demo/mgmtsystem_hazard_type.xml', | ||
| 'demo/mgmtsystem_hazard_usage.xml', |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
|
@ngrandjean Can you squash the translation commits please? |
|
@max3903 translation commits are squashed (at least I think I did it right but tell me if not) and code changed according to comments. |
|
@ngrandjean The commits are duplicated. You need to rebase and drop half of them:
and when the rebase is done, you need to force-push your branch to Github (assuming origin is your fork): |
ngrandjean
force-pushed
the
10.0-mig-mgmtsystem_hazard
branch
from
05b4f04
to
399343e
Compare
|
@max3903 Ok, thanks a lot for your help. the '-f' was what I missed the first time. |
|
@etobella I fixed the issues you mentionned, would you mind checking and telling me if there's still something wrong ? Thanks a lot ! |
|
Can you please squash all initial commits from "Nadege Grandjean", as they don't add significant information? |
|
@pedrobaeza Sorry but I don't really understand what you mean. Where do you want me to do that ? |
|
I ask to merge together the initial commits, as they are from the same author and don't add any significant information being split. You can use https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests guide a reference. |
|
@pedrobaeza Ok, so you're talking about commits 13ecb70 to 0583072 made between 3/02/17 and 9/03/17 ? |
|
Well, I was thinking in all the commits from Nadege Grandjean:
|
ngrandjean
force-pushed
the
10.0-mig-mgmtsystem_hazard
branch
from
399343e
to
a89a178
Compare
|
@pedrobaeza Ok thanks, it's done (correctly I hope) |
| @@ -1,6 +1,5 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <openerp> | |||
| <data noupdate="1"> | |||
| <odoo noupdate=""> | |||
[MIG] mgmtsystem_hazard: Migration to 10.0 [MIG] mgmtsystem_hazard: Migration to 10.0
ngrandjean
force-pushed
the
10.0-mig-mgmtsystem_hazard
branch
from
1ba9acc
to
3787301
Compare
MIG mgmtsystem_hazard to V10.0
#159