Merge remote-tracking branch 'bhim/development' into development
Merge remote-tracking branch 'bhim/development' into development
fixing conflict during merging
Merge branch 'development' of https://github.com/IMA-WorldHealth/bhima into development
Merge remote-tracking branch 'bhim/development' into development
fixing loss.js, allowing to introduice price by the user
fixing taxe calculation
Merge pull request #240 from DedrickEnc/fixes

Fixing taxe calculation and stock loss