diff options
| -rw-r--r-- | ishtar/furnitures/forms.py | 7 | ||||
| -rw-r--r-- | ishtar/furnitures/models.py | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py index ac303a473..800e85e8c 100644 --- a/ishtar/furnitures/forms.py +++ b/ishtar/furnitures/forms.py @@ -564,9 +564,10 @@ class FileFormPreventive(forms.Form): 'saisine_type':models.SaisineType} general_contractor = forms.IntegerField(label=_(u"General contractor"), widget=widgets.JQueryAutoComplete( - reverse_lazy('autocomplete-organization'), - associated_model=models.Organization), - validators=[models.valid_id(models.Organization)]) + reverse_lazy('autocomplete-person', + args=[models.PersonType.objects.get(txt_idx='general_contractor').pk]), + associated_model=models.Person), + validators=[models.valid_id(models.Person)]) total_developed_surface = forms.IntegerField( label=_("Total developed surface"), validators=[validators.MinValueValidator(0), diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index ef5ad8cb2..5613e6942 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -229,7 +229,7 @@ class File(BaseHistorizedItem, OwnPerms): file_type = models.ForeignKey(FileType, verbose_name=_(u"File type")) in_charge = models.ForeignKey(Person, related_name='+', verbose_name=_(u"Person in charge")) - general_contractor = models.ForeignKey(Organization, related_name='+', + general_contractor = models.ForeignKey(Person, related_name='+', verbose_name=_(u"General contractor"), blank=True, null=True) is_active = models.BooleanField(_(u"Is active?")) towns = models.ManyToManyField("Town") |