Merge branch 'dev' of https://github.com/IMA-WorldHealth/Kapok into dev
Commit to branch, inventory notes
changing kpk and primary cash
incomes
Primary cash database object
Merge branch 'primary_cash_purchase' into dev
fixing conflict
Merge branch 'dev' of https://github.com/IMA-WorldHealth/Kapok into dev
added depot module; cleaned up base.sql
Merge branch 'depot' into dev
Merge branch 'dev' of https://github.com/IMA-WorldHealth/Kapok into dev
fixing transfert
convention fixing
Cleaned up base.sql, added employee link
Write cash line - commit to update schema
Cleaned up base.sql, added employee record
Merge branch 'dev' of https://github.com/IMA-WorldHealth/Kapok into dev

Conflicts:
	scripts/sql/base.sql
ID conflict, avoiding messy reset with remote
Merge branch 'primary_cash_purchase' into dev

Conflicts:
	scripts/sql/base.sql
Cleaned up purchase order, english translation, disabled menu