Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added "vendeurs" and "taxes" #40

Merged
merged 68 commits into from
Oct 27, 2016
Merged

Conversation

Scriptodude
Copy link
Collaborator

@Scriptodude Scriptodude commented Jun 12, 2016

La patch pour #25 #6 (À revérifier)

Ajoute

  • Un lien pour retourner vers le site après l'ajout d'un livre
  • Un lien pour voir les ventes en cours d'un vendeur
  • une réparation du rapport
  • Quelques mineur bugs aussi présent dans la version foiresauxlivres.uqam.ca
  • L'option de gérer les taxes (dans conf.py.edit)
  • Le calcul des taxes
  • L'affichage de la TPS et la TVQ sur les factures
  • Quelques autres ajout mineurs

Je vais travailler sur les conflit une autre fois, pour l'instant un gros sommeil m'attend !

Scriptodude and others added 30 commits June 6, 2016 14:41
It seems the coverage calculates the whole virtualenv django python files, while it should only count the project files.
It seems the coverage calculates the whole virtualenv django python files, while it should only count the project files. (reverted from commit 9711984)
Updated .gitignore

Added omit to .travis.yml
@ventilooo
Copy link
Member

ping ?

@Scriptodude
Copy link
Collaborator Author

Ping
Je rework sur le projet dans mes temps libre (J'ignore si c'est encore utile / vaut la peine, mais c'est un excellent passe-temps !)

@coveralls
Copy link

coveralls commented Oct 20, 2016

Coverage Status

Coverage increased (+0.1%) to 52.966% when pulling 2e0a1bd on Scriptodude:master into 8b4219b on AESSUQAM:develop.

@Scriptodude
Copy link
Collaborator Author

Ping fucking ready !

@ventilooo ventilooo merged commit 81fd369 into AESSUQAM:develop Oct 27, 2016
@ventilooo
Copy link
Member

Perfect !

This was referenced Nov 2, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants