Merge lp://staging/~savoirfairelinux-openerp/openerp-hr/6.1-fix-hr-skill-demo-data into lp://staging/openerp-hr/6.1
Proposed by
El Hadji Dem (http://www.savoirfairelinux.com)
| Status: | Merged |
|---|---|
| Merged at revision: | 314 |
| Proposed branch: | lp://staging/~savoirfairelinux-openerp/openerp-hr/6.1-fix-hr-skill-demo-data |
| Merge into: | lp://staging/openerp-hr/6.1 |
| Diff against target: |
3434 lines (+291/-2837) 38 files modified
hr_experience_analytic/__init__.py (+22/-0) hr_experience_analytic/__openerp__.py (+44/-0) hr_experience_analytic/hr_experience_analytic.py (+30/-0) hr_experience_analytic/hr_experience_analytic_view.xml (+17/-0) hr_skill/__init__.py (+7/-9) hr_skill/__openerp__.py (+16/-17) hr_skill/hr_skill.evaluation.category.csv (+0/-2) hr_skill/hr_skill.evaluation.csv (+0/-2) hr_skill/hr_skill.experience.category.csv (+0/-5) hr_skill/hr_skill.experience.csv (+0/-1) hr_skill/hr_skill.position.csv (+0/-3) hr_skill/hr_skill.profile.csv (+0/-5) hr_skill/hr_skill.py (+26/-241) hr_skill/hr_skill.skill.csv (+0/-12) hr_skill/hr_skill.weight.category.csv (+0/-3) hr_skill/hr_skill.weight.csv (+0/-8) hr_skill/hr_skill_demo.xml (+0/-19) hr_skill/hr_skill_report.xml (+0/-15) hr_skill/hr_skill_view.xml (+67/-305) hr_skill/hrskill.py (+0/-92) hr_skill/hrskill_view.xml (+0/-220) hr_skill/i18n/hr_skill.pot (+60/-556) hr_skill/lang_wiz_view.xml (+0/-31) hr_skill/old-hr_skill.skill.csv (+0/-12) hr_skill/old-hr_skill_view.xml (+0/-148) hr_skill/report/__init__.py (+0/-25) hr_skill/report/datereport.rml (+0/-142) hr_skill/report/employeereport.py (+0/-57) hr_skill/report/evaluation.rml (+0/-192) hr_skill/report/langreport.py (+0/-112) hr_skill/report/langreport.rml (+0/-175) hr_skill/report/skillreport.py (+0/-61) hr_skill/report/skillreport.rml (+0/-161) hr_skill/security/ir.model.access.csv (+2/-18) hr_skill/wizard/__init__.py (+0/-25) hr_skill/wizard/datewise.py (+0/-54) hr_skill/wizard/lang_wiz.py (+0/-60) hr_skill/wizard/skill.py (+0/-49) |
| To merge this branch: | bzr merge lp://staging/~savoirfairelinux-openerp/openerp-hr/6.1-fix-hr-skill-demo-data |
| Related bugs: | |
| Related blueprints: |
Resume Management
(Low)
Skill Management cleanup
(Low)
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Joël Grand-Guillaume @ camptocamp | code review, no tests | Approve | |
| Maxime Chambreuil (http://www.savoirfairelinux.com) | code review and test | Approve | |
| Pedro Manuel Baeza | Pending | ||
|
Review via email:
|
|||
Description of the change
[FIX] PEP8 issue
[IMP] Cleanup hr_skill
[IMP] Demo data installable.
[ADD] hr_experience_
To post a comment you must log in.
Revision history for this message
| Pedro Manuel Baeza (pedro.baeza) wrote | # |
Revision history for this message
| Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) wrote | # |
Revision history for this message
| Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) | # |
review:
Approve
(code review and test)
Revision history for this message
| Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) wrote | # |
review:
Approve
(code review, no tests)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hi, El Hadji, thank you very much for these two useful modules, but can you please add each of them on separate MPs to make easier the reviewing process?
Let me know if you need help on something.
Regards.