Merge branch 'master' into dev

diff --git a/project/dae/models.py b/project/dae/models.py
index 382d2d9..ac68781 100644 (file)
--- a/project/dae/models.py
+++ b/project/dae/models.py
@@ -530,9 +530,9 @@ class Dossier(DossierWorkflow, models.Model):
 
     def get_salaire_euros(self):
         try:
-            tx = rh.TauxChange.objects.filter(implantation=self.poste.implantation, devise=self.devise)[0].taux
+            tx = self.devise.tauxchange_set.order_by('-annee').filter(implantation=self.poste.implantation)[0].taux
         except:
-            tx = 1
+            tx = 0
         return (float)(tx) * (float)(self.salaire)
 
     def get_remunerations_brutes(self):
@@ -673,7 +673,7 @@ class Remuneration(models.Model):
         return round(self.montant / 12, 2)
 
     def taux_devise(self):
-        return self.devise.tauxchange_set.order_by('-annee').all()[0].taux
+        return self.devise.tauxchange_set.order_by('-annee').filter(implantation=self.dossier.poste.implantation)[0].taux
 
     def montant_euro(self):
         return round(float(self.montant) * float(self.taux_devise()), 2)

diff --git a/project/templates/autocompleteselect.html b/project/templates/autocompleteselect.html
index c9d9ab6..d91ba4f 100644 (file)
--- a/project/templates/autocompleteselect.html
+++ b/project/templates/autocompleteselect.html
@@ -9,6 +9,7 @@
 <script type="text/javascript">
 jQuery(document).ready(function($){{% block script %}
         $("#{{html_id}}_text").autocomplete('{{lookup_url}}', {
+                max: 100,
                 width: 320,
                 formatItem: function(row) { return row[2]; },
                 formatResult: function(row) { return row[1]; },