Merge pull request #23 from oadan79/master

Afegits manteniments inventari
Merge pull request #24 from oadan79/master

sync
sync
Corregits noms de les columnes de inventory_object i corregides relacions. Falta revisar relacio n n
Merge branch 'master' of https://github.com/acacha/ebre-escool