Inserting new field to person.

caep-unb · Jun 18, 2015 · ea9e9d1 · ea9e9d1
1 parent f980788
commit ea9e9d1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/gestorpsi/client/models.py b/gestorpsi/client/models.py
@@ -55,6 +55,11 @@
     (13, _('Others')),
 )
 
+COMPANY_SIZE = (
+    (1, _('Payer')),
+    (2, _('Exempted')),
+    (3, _('Temporarily exempted')),
+)
 
 class MaritalStatus(models.Model):
     description = models.CharField(max_length=20)

diff --git a/gestorpsi/person/models.py b/gestorpsi/person/models.py
@@ -68,6 +68,7 @@ class Person(models.Model):
     comments = models.TextField(blank=True)
     active = models.BooleanField(default=True)
     organization = models.ManyToManyField(Organization)
+    salary = models.DecimalField(max_digits=7, decimal_places=2, default=0.00)
 
     # the fields below were added in order to deal with foreign ones
     birthForeignCity = models.CharField(max_length=100, null=True)

diff --git a/gestorpsi/templates/tags/payment_condition.html b/gestorpsi/templates/tags/payment_condition.html
@@ -17,14 +17,13 @@
 {% load i18n %}
 
 <div>
-	<input type="hidden" name="payment_condition_id" value="{{ payment_condition.id }}" />
 
 	<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" value="{{ 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" value="{{ client.value_for_payment }}" mask="?9?9?9.99" />
 	</label>
 
 	<label>{% trans "Type" %}<br />