# Conflicts:
#	note_kfet/urls.py
#	templates/base.html

Something is wrong in the fixtures

See merge request !69

Front club

See merge request !68

Tresorerie

See merge request !61

# Conflicts:
#   apps/note/fixtures/initial.json
#   templates/base.html

Meilleurs vues pour la gestion des boutons

See merge request !54

Product's amounts can be negative, in case of discounts (treasurers are free to generate what invoice they want)

taking connection permission mask into account.

Use a proxy for special transactions in treasury app for modularity (not a clean way, but without any other solution...)