diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-04-19 18:33:16 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-04-19 18:33:16 +0200 |
| commit | eb471a13710be88ca249f30a68bd056aa8c5a292 (patch) | |
| tree | f2596427b81ad0df9e3a0b1b97201372b9fcc9cc /ishtar_common/forms_common.py | |
| parent | 983662e505adca020492e0672968a19c0abb6ec2 (diff) | |
| parent | fc1c422e6c5e0c57ddb6209b609b2335f9cb4dde (diff) | |
| download | Ishtar-eb471a13710be88ca249f30a68bd056aa8c5a292.tar.bz2 Ishtar-eb471a13710be88ca249f30a68bd056aa8c5a292.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/forms_common.py')
| -rw-r--r-- | ishtar_common/forms_common.py | 41 |
1 files changed, 31 insertions, 10 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index ae72d173f..1d8dc2092 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -260,18 +260,19 @@ class SimplePersonForm(NewItemForm): validators=[name_validator]) raw_name = forms.CharField(label=_(u"Raw name"), max_length=300, required=False) - address = forms.CharField(label=_(u"Address"), widget=forms.Textarea, - required=False) - address_complement = forms.CharField(label=_(u"Address complement"), - widget=forms.Textarea, required=False) - postal_code = forms.CharField(label=_(u"Postal code"), max_length=10, - required=False) - town = forms.CharField(label=_(u"Town"), max_length=30, required=False) - country = forms.CharField(label=_(u"Country"), max_length=30, - required=False) email = forms.EmailField(label=_(u"Email"), required=False) + phone_desc = forms.CharField(label=_(u"Phone description"), max_length=300, + required=False) phone = forms.CharField(label=_(u"Phone"), max_length=18, required=False) - mobile_phone = forms.CharField(label=_(u"Town"), max_length=18, + phone_desc2 = forms.CharField(label=_(u"Phone description 2"), + max_length=300, required=False) + phone2 = forms.CharField(label=_(u"Phone 2"), max_length=18, + required=False) + phone_desc3 = forms.CharField(label=_(u"Phone description 3"), + max_length=300, required=False) + phone3 = forms.CharField(label=_(u"Phone 3"), max_length=18, + required=False) + mobile_phone = forms.CharField(label=_(u"Mobile phone"), max_length=18, required=False) attached_to = forms.IntegerField( label=_("Current organization"), @@ -279,6 +280,26 @@ class SimplePersonForm(NewItemForm): reverse_lazy('autocomplete-organization'), associated_model=models.Organization, new=True), validators=[models.valid_id(models.Organization)], required=False) + address = forms.CharField(label=_(u"Address"), widget=forms.Textarea, + required=False) + address_complement = forms.CharField( + label=_(u"Address complement"), widget=forms.Textarea, required=False) + postal_code = forms.CharField(label=_(u"Postal code"), max_length=10, + required=False) + town = forms.CharField(label=_(u"Town"), max_length=30, required=False) + country = forms.CharField(label=_(u"Country"), max_length=30, + required=False) + alt_address = forms.CharField(label=_(u"Other address: address"), + widget=forms.Textarea, required=False) + alt_address_complement = forms.CharField( + label=_(u"Other address: address complement"), + widget=forms.Textarea, required=False) + alt_postal_code = forms.CharField(label=_(u"Other address: postal code"), + max_length=10, required=False) + alt_town = forms.CharField(label=_(u"Other address: town"), max_length=30, + required=False) + alt_country = forms.CharField(label=_(u"Other address: country"), + max_length=30, required=False) def __init__(self, *args, **kwargs): super(SimplePersonForm, self).__init__(*args, **kwargs) |