Benoit C. Sirois [Wed, 1 May 2013 20:58:56 +0000 (16:58 -0400)]
Fix for odette
Benoit C. Sirois [Tue, 16 Apr 2013 20:40:31 +0000 (16:40 -0400)]
Merge branch 'hotfix/print_bug'
Benoit C. Sirois [Tue, 16 Apr 2013 20:40:22 +0000 (16:40 -0400)]
Fix
Benoit C. Sirois [Tue, 16 Apr 2013 19:14:00 +0000 (15:14 -0400)]
Merge branch 'hotfix/employe_anterieur_fix'
Benoit C. Sirois [Tue, 16 Apr 2013 19:13:54 +0000 (15:13 -0400)]
fix
Benoit C. Sirois [Tue, 16 Apr 2013 19:09:44 +0000 (15:09 -0400)]
Merge branch 'hotfix/employe_anterieur_fix_form_val_fix'
Benoit C. Sirois [Tue, 16 Apr 2013 19:09:28 +0000 (15:09 -0400)]
Fix
Benoit C. Sirois [Mon, 15 Apr 2013 20:09:46 +0000 (16:09 -0400)]
Merge branch 'hotfix/another_fix_for_comparison'
Benoit C. Sirois [Mon, 15 Apr 2013 20:09:28 +0000 (16:09 -0400)]
Fix
Benoit C. Sirois [Mon, 15 Apr 2013 18:17:25 +0000 (14:17 -0400)]
Merge branch 'hotfix/deleting_comparison'
Benoit C. Sirois [Mon, 15 Apr 2013 18:17:14 +0000 (14:17 -0400)]
Hot fix to delete comparisons
Benoit C. Sirois [Thu, 11 Apr 2013 18:45:26 +0000 (14:45 -0400)]
Merge branch 'hotfix/filter_bug'
Benoit C. Sirois [Thu, 11 Apr 2013 18:45:20 +0000 (14:45 -0400)]
filter fix
Benoit C. Sirois [Thu, 11 Apr 2013 18:21:50 +0000 (14:21 -0400)]
Merge branch 'hotfix/salaire_base_bug'
Benoit C. Sirois [Thu, 11 Apr 2013 18:21:44 +0000 (14:21 -0400)]
Fix for salaire de base bug
Benoit C. Sirois [Wed, 10 Apr 2013 20:06:06 +0000 (16:06 -0400)]
Merge branch 'hotfix/devise_fix'
Benoit C. Sirois [Wed, 10 Apr 2013 20:05:57 +0000 (16:05 -0400)]
Fixed
Benoit C. Sirois [Wed, 10 Apr 2013 19:19:38 +0000 (15:19 -0400)]
Merge branch 'hotfix/comparaison_clear_id'
Benoit C. Sirois [Wed, 10 Apr 2013 19:19:34 +0000 (15:19 -0400)]
Fix for cmp items
Benoit C. Sirois [Wed, 10 Apr 2013 19:18:52 +0000 (15:18 -0400)]
Fix for cmp items
Benoit C. Sirois [Wed, 10 Apr 2013 17:55:49 +0000 (13:55 -0400)]
Merge branch 'hotfix/dae_error_500'
Benoit C. Sirois [Wed, 10 Apr 2013 17:55:34 +0000 (13:55 -0400)]
fix for 500 error
Benoit C. Sirois [Thu, 28 Mar 2013 17:06:24 +0000 (13:06 -0400)]
Merge branch 'hotfix/bug_abf'
Benoit C. Sirois [Thu, 28 Mar 2013 17:03:22 +0000 (13:03 -0400)]
Fix de bug
Benoit C. Sirois [Wed, 27 Mar 2013 19:26:52 +0000 (15:26 -0400)]
Merge branch 'hotfix/bug_etat_transition'
Benoit C. Sirois [Wed, 27 Mar 2013 19:26:31 +0000 (15:26 -0400)]
Hotfix done
Benoit C. Sirois [Mon, 18 Mar 2013 17:18:58 +0000 (13:18 -0400)]
Merge branch 'release/1.7.1'
Benoit C. Sirois [Mon, 18 Mar 2013 15:25:50 +0000 (11:25 -0400)]
Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
Benoit C. Sirois [Mon, 18 Mar 2013 15:25:19 +0000 (11:25 -0400)]
Added compte coda stuff
Davin Baragiotta [Fri, 15 Mar 2013 21:20:08 +0000 (17:20 -0400)]
coquille
Benoit C. Sirois [Thu, 14 Mar 2013 14:20:59 +0000 (10:20 -0400)]
Merge branch 'release/1.7' into dev
Benoit C. Sirois [Thu, 14 Mar 2013 14:20:47 +0000 (10:20 -0400)]
Merge branch 'release/1.7'
Benoit C. Sirois [Tue, 12 Mar 2013 17:34:09 +0000 (13:34 -0400)]
Fix for print.css, tkt 5637
Benoit C. Sirois [Tue, 12 Mar 2013 14:14:48 +0000 (10:14 -0400)]
Ticket 5638
Benoit C. Sirois [Tue, 12 Mar 2013 13:41:01 +0000 (09:41 -0400)]
Utilise date.today() pour comparaison pour chercher dossier principal
Benoit C. Sirois [Fri, 8 Mar 2013 20:39:44 +0000 (15:39 -0500)]
Fix for dossier principal
Benoit C. Sirois [Fri, 8 Mar 2013 19:22:43 +0000 (14:22 -0500)]
#5696
Benoit C. Sirois [Fri, 8 Mar 2013 19:14:48 +0000 (14:14 -0500)]
Fixes classement issue
Benoit C. Sirois [Wed, 6 Mar 2013 17:20:08 +0000 (12:20 -0500)]
bug prenom
Benoit C. Sirois [Wed, 6 Mar 2013 17:10:50 +0000 (12:10 -0500)]
Termine, ca fonctionne
Benoit C. Sirois [Wed, 6 Mar 2013 17:07:48 +0000 (12:07 -0500)]
Fix4
Benoit C. Sirois [Wed, 6 Mar 2013 17:06:48 +0000 (12:06 -0500)]
Fix3
Benoit C. Sirois [Wed, 6 Mar 2013 17:05:08 +0000 (12:05 -0500)]
Fix2
Benoit C. Sirois [Wed, 6 Mar 2013 17:03:02 +0000 (12:03 -0500)]
Changement pour fix le select de recipeints
Benoit C. Sirois [Wed, 6 Mar 2013 16:31:59 +0000 (11:31 -0500)]
Test changes
Benoit C. Sirois [Wed, 6 Mar 2013 16:15:08 +0000 (11:15 -0500)]
Added proper email templates
Benoit C. Sirois [Tue, 5 Mar 2013 22:22:41 +0000 (17:22 -0500)]
Fixed year -1
Benoit C. Sirois [Tue, 5 Mar 2013 21:39:12 +0000 (16:39 -0500)]
Two tickets
Benoit C. Sirois [Tue, 5 Mar 2013 21:28:05 +0000 (16:28 -0500)]
5696
Benoit C. Sirois [Tue, 5 Mar 2013 21:10:05 +0000 (16:10 -0500)]
Added archivable in list of classement
Benoit C. Sirois [Tue, 5 Mar 2013 21:02:15 +0000 (16:02 -0500)]
#5712
Benoit C. Sirois [Tue, 5 Mar 2013 20:33:11 +0000 (15:33 -0500)]
Fixed nomenclature
Benoit C. Sirois [Tue, 5 Mar 2013 20:30:23 +0000 (15:30 -0500)]
Fixed typo
Benoit C. Sirois [Tue, 5 Mar 2013 20:27:27 +0000 (15:27 -0500)]
Fixed bug
Benoit C. Sirois [Tue, 5 Mar 2013 20:13:01 +0000 (15:13 -0500)]
Finished with new calcs for remunerations
Benoit C. Sirois [Mon, 4 Mar 2013 16:42:32 +0000 (11:42 -0500)]
Part 1 du bug fix, instable
Benoit C. Sirois [Fri, 1 Mar 2013 20:42:27 +0000 (15:42 -0500)]
small fix
Benoit C. Sirois [Fri, 1 Mar 2013 19:33:10 +0000 (14:33 -0500)]
Ajouté un manager et modele proxy pour obtenir une liste filtrée des Implantations
Benoit C. Sirois [Fri, 1 Mar 2013 17:01:59 +0000 (12:01 -0500)]
Fix 5453
Benoit C. Sirois [Fri, 1 Mar 2013 16:09:47 +0000 (11:09 -0500)]
5454
Benoit C. Sirois [Thu, 28 Feb 2013 16:58:35 +0000 (11:58 -0500)]
Fixed natures choices
Benoit C. Sirois [Thu, 28 Feb 2013 16:49:28 +0000 (11:49 -0500)]
Fixed intitule de bouton
Benoit C. Sirois [Thu, 28 Feb 2013 16:46:29 +0000 (11:46 -0500)]
5637
Benoit C. Sirois [Wed, 27 Feb 2013 22:15:02 +0000 (17:15 -0500)]
Fixed issue with date_fin causing 500 error
Benoit C. Sirois [Wed, 27 Feb 2013 21:57:41 +0000 (16:57 -0500)]
Fixed bug that caused only 1 remuneration to be saved
Benoit C. Sirois [Wed, 27 Feb 2013 21:39:21 +0000 (16:39 -0500)]
removed pdb
Benoit C. Sirois [Wed, 27 Feb 2013 21:25:03 +0000 (16:25 -0500)]
Fixes for permission, and runtime bug when adding comparison
Benoit C. Sirois [Mon, 25 Feb 2013 15:19:18 +0000 (10:19 -0500)]
Merge branch 'release/1.6.5' into dev
Benoit C. Sirois [Mon, 25 Feb 2013 15:19:10 +0000 (10:19 -0500)]
Merge branch 'release/1.6.5'
Benoit C. Sirois [Mon, 25 Feb 2013 15:18:55 +0000 (10:18 -0500)]
Fix for selection using proper SELECT
Benoit C. Sirois [Fri, 22 Feb 2013 21:53:23 +0000 (16:53 -0500)]
Done with historique
Benoit C. Sirois [Fri, 22 Feb 2013 19:51:38 +0000 (14:51 -0500)]
Done with feature
Benoit C. Sirois [Thu, 21 Feb 2013 19:27:44 +0000 (14:27 -0500)]
Ticket 5454
Benoit C. Sirois [Wed, 20 Feb 2013 21:56:12 +0000 (16:56 -0500)]
Done
Benoit C. Sirois [Wed, 20 Feb 2013 20:44:40 +0000 (15:44 -0500)]
Removed unused view
Benoit C. Sirois [Wed, 20 Feb 2013 20:43:10 +0000 (15:43 -0500)]
Merge branch 'feature/donnees_salariales' into dev
Benoit C. Sirois [Wed, 20 Feb 2013 20:40:46 +0000 (15:40 -0500)]
Removed commented out code
Benoit C. Sirois [Wed, 20 Feb 2013 20:38:51 +0000 (15:38 -0500)]
feature complete.. now need a bit of testing
Benoit C. Sirois [Tue, 19 Feb 2013 20:04:31 +0000 (15:04 -0500)]
Added remunform to consulter view
Benoit C. Sirois [Tue, 19 Feb 2013 19:49:55 +0000 (14:49 -0500)]
Done forms
Benoit C. Sirois [Tue, 19 Feb 2013 15:27:04 +0000 (10:27 -0500)]
On the way there...
Benoit C. Sirois [Fri, 15 Feb 2013 16:14:34 +0000 (11:14 -0500)]
Changement de titre de "natures" de types de rémunérations, permettre de définir l'ordre d'affichage du formulaire de type de rémunération, bugfix
Benoit C. Sirois [Thu, 14 Feb 2013 16:27:16 +0000 (11:27 -0500)]
Small js refactoring
Benoit C. Sirois [Wed, 13 Feb 2013 22:56:50 +0000 (17:56 -0500)]
Fixed indentation
Benoit C. Sirois [Wed, 13 Feb 2013 22:55:40 +0000 (17:55 -0500)]
Debut de refactoring
Benoit C. Sirois [Wed, 13 Feb 2013 15:40:00 +0000 (10:40 -0500)]
Multiples zones par user implémenté
Benoit C. Sirois [Tue, 12 Feb 2013 19:46:54 +0000 (14:46 -0500)]
#5449
Benoit C. Sirois [Tue, 12 Feb 2013 16:04:16 +0000 (11:04 -0500)]
#5450
Benoit C. Sirois [Mon, 11 Feb 2013 22:23:38 +0000 (17:23 -0500)]
#5440
Benoit C. Sirois [Mon, 11 Feb 2013 22:08:45 +0000 (17:08 -0500)]
#5448
Benoit C. Sirois [Mon, 11 Feb 2013 15:43:56 +0000 (10:43 -0500)]
Quelques bugfix qui étaient dans branche test
Benoit C. Sirois [Mon, 11 Feb 2013 15:17:33 +0000 (10:17 -0500)]
Merge branch 'master' into dev
Benoit C. Sirois [Mon, 11 Feb 2013 15:15:40 +0000 (10:15 -0500)]
Merge branch 'test' into dev
Benoit C. Sirois [Mon, 11 Feb 2013 15:14:15 +0000 (10:14 -0500)]
Merged feature in dev
Eric Mc Sween [Wed, 9 Jan 2013 18:25:25 +0000 (13:25 -0500)]
[#5108] Utiliser le taux de change d'une année précédente lorsqu'il manque le taux de change de l'année.
Eric Mc Sween [Wed, 9 Jan 2013 18:25:25 +0000 (13:25 -0500)]
[#5108] Utiliser le taux de change d'une année précédente lorsqu'il manque le taux de change de l'année.
Eric Mc Sween [Wed, 9 Jan 2013 17:07:01 +0000 (12:07 -0500)]
Merge branch 'master' into test
Conflicts:
project/dae/views.py
Eric Mc Sween [Wed, 9 Jan 2013 17:01:52 +0000 (12:01 -0500)]
[#5104] Si on n'a pas le taux de change de l'année, prendre le taux le plus récent
Eric Mc Sween [Tue, 18 Dec 2012 16:09:29 +0000 (11:09 -0500)]
[#5050] Permettre la restauration d'objets supprimés
Eric Mc Sween [Wed, 12 Dec 2012 17:34:42 +0000 (12:34 -0500)]
[#3812] Corrigé l'affichage de la liste des devises
Bizarre: le select_related() généré par l'admin faisait que le queryset était
vidé.