diff --git a/gestorpsi/client/models.py b/gestorpsi/client/models.py
index a185481b..430b5e92 100755
--- a/gestorpsi/client/models.py
+++ b/gestorpsi/client/models.py
@@ -55,7 +55,7 @@
     (13, _('Others')),
 )
 
-COMPANY_SIZE = (
+PAYMENT_CONDITION = (
     (1, _('Payer')),
     (2, _('Exempted')),
     (3, _('Temporarily exempted')),
@@ -87,6 +87,13 @@ class Family(models.Model):
     def __unicode__(self):
         return u"%s" % self.get_relation_level_display()
 
+
+class PaymentCondition(models.Model):
+    payment_condition = models.CharField(choices=PAYMENT_CONDITION,
+                                         max_length=25)
+    value_for_payment = models.DecimalField(max_digits=7, decimal_places=2, default=0.00)
+
+
 ''' class not in use! moved to parents relations to class Family.
 removing soon  '''
 
@@ -267,6 +274,7 @@ class Client(models.Model):
     active = models.BooleanField(default=True)
     comments = models.TextField(blank=True)
     objects = ClientManager()
+    payment_condition = models.ForeignKey('PaymentCondition')
 
     def __unicode__(self):
         return (u"%s" % (self.person.name.title(), )) \
diff --git a/gestorpsi/client/views.py b/gestorpsi/client/views.py
index a0f4eba7..6860ce05 100755
--- a/gestorpsi/client/views.py
+++ b/gestorpsi/client/views.py
@@ -34,7 +34,7 @@
 from gestorpsi.service.models import Service, ServiceGroup, GroupMembers
 from gestorpsi.careprofessional.models import CareProfessional
 from gestorpsi.careprofessional.views import Profession
-from gestorpsi.client.models import Client, Relation
+from gestorpsi.client.models import Client, Relation, PAYMENT_CONDITION, PaymentCondition
 from gestorpsi.client.forms import FamilyForm
 from gestorpsi.document.models import TypeDocument, Issuer
 from gestorpsi.internet.models import EmailType, IMNetwork
@@ -194,6 +194,7 @@ def add(request):
                                         'ReferralChoices': ReferralChoice.objects.all(),
                                         'Relations': Relation.objects.all(),
                                         'cnae': Cnae.objects.all(),
+                                        'payment_conditions': PAYMENT_CONDITION,
                                          },
                                         context_instance=RequestContext(request))
 
@@ -389,6 +390,7 @@ def form(request, object_id=''):
                                 'clss': request.GET.get('clss'),
                                 'company_form': company_form,
                                 'cnae': cnae,
+                                'payment_conditions': PAYMENT_CONDITION,
                                },
                               context_instance=RequestContext(request)
                               )
@@ -778,10 +780,18 @@ def save(request, object_id=None, is_company = False):
         org.last_id_record = org.last_id_record + 1
         org.save()
 
+        payment_condition = PaymentCondition()
+        payment_condition.payment_condition = request.POST["payment_condition"]
+        payment_condition.value_for_payment = request.POST["value_for_payment"]
+        payment_condition.save()
+        object.payment_condition = payment_condition
+        
         # Admission date
         object.idRecord = org.last_id_record + 1
         object.admission_date = datetime.now()
         object.person = person_save(request, person)
+        object.person.salary = request.POST["salary"]
+        object.person.save()
         object.save()
 
     if is_company:
@@ -799,6 +809,7 @@ def save(request, object_id=None, is_company = False):
 
     a.referral_choice_id = AdmissionChoice.objects.all().order_by('weight')[0].id
     object.admissionreferral_set.add(a)
+
     object.save()
 
     messages.success(request, _('Client saved successfully'))
diff --git a/gestorpsi/person/models.py b/gestorpsi/person/models.py
index 070eae46..e57f271d 100755
--- a/gestorpsi/person/models.py
+++ b/gestorpsi/person/models.py
@@ -41,6 +41,7 @@
     (3, _('Big')),
 )
 
+
 class MaritalStatus(models.Model):
     description = models.CharField(max_length=20)
     def __unicode__(self):
@@ -48,6 +49,7 @@ def __unicode__(self):
     class Meta:
         ordering = ['description']
 
+
 class Person(models.Model):
     id = UuidField(primary_key=True)
     user = models.ForeignKey(User, editable=False, default=threadlocals.get_current_user) # the register owner
diff --git a/gestorpsi/templates/tags/payment_condition.html b/gestorpsi/templates/tags/payment_condition.html
index 451d49c3..19995c1b 100644
--- a/gestorpsi/templates/tags/payment_condition.html
+++ b/gestorpsi/templates/tags/payment_condition.html
@@ -19,19 +19,18 @@
 <div>
 	
 	<label>{% trans "Salary" %}<br />
-	<input type="text" maxlength="8" class="medium" name="salary" value="{{ person.salary }}" mask="?9?9999.99" />
+	<input type="text" maxlength="8" class="medium" name="salary" id="salary" value="{{ object.person.salary }}" mask="?9?9999.99" />
 	</label>
 
 	<label>{% trans "Value for payment" %}<br />
-	<input type="text" maxlength="6"  class="medium" name="value_for_payment" value="{{ client.value_for_payment }}" mask="?9?9?9.99" />
+	<input type="text" maxlength="6"  class="medium" name="value_for_payment" id="value_payment" value="{{ object.payment_condition.value_for_payment }}" mask="?9?9?9.99" />
 	</label>
 			
 	<label>{% trans "Type" %}<br />
 	<select name="payment_condition" class="medium">
-	<option value="1">Payer</option>
-	<option value="2">Exempted</option>
-	<option value="3">Temporarily exempted</option>
+	{% for payment_condition in payment_conditions %}
+		<option value="{{payment_condition.0}}">{{payment_condition.1}}</option>
+	{%endfor%}
 	</select>
 	</label>
-
-</div>
\ No newline at end of file
+</div>