diff --git a/netforce_clinic/layouts/clinic_nurse_form.xml b/netforce_clinic/layouts/clinic_nurse_form.xml
index 89ce74b..5792bc7 100644
--- a/netforce_clinic/layouts/clinic_nurse_form.xml
+++ b/netforce_clinic/layouts/clinic_nurse_form.xml
@@ -2,21 +2,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/netforce_clinic/models/clinic_nurse.py b/netforce_clinic/models/clinic_nurse.py
index 40950b7..97ac8ef 100644
--- a/netforce_clinic/models/clinic_nurse.py
+++ b/netforce_clinic/models/clinic_nurse.py
@@ -11,13 +11,19 @@ class Nurse(Model):
_name_field="name"
_multi_company=True
_fields={
- "number": fields.Char("Number",required=True,search=True),
- "name": fields.Char("Name",required=True,search=True),
+ "number": fields.Char("Nurse No.",required=True,search=True),
+ "name": fields.Char("First name",required=True,search=True),
+ #"last_name" : fields.char("Last name"),
+ "lname" : fields.Char("Last name"),
"date": fields.Date("Create Date",required=True,search=True),
- "birthday": fields.Date("BirthDay",required=True,search=True),
- "telephone": fields.Char("Telephone",required=True,search=True),
- "department": fields.Char("Department",required=True,search=True),
- "mobile": fields.Char("Mobile",required=True,search=True),
+ "card_id" : fields.Char("Identity ID"),
+ "card_expire" : fields.Date("Expire Date"),
+ "birthday": fields.Date("Date of Birth",required=False,search=True),
+ "telephone": fields.Char("Telephone",required=False,search=True),
+ "department": fields.Selection([("temporary","Temporary"),("permanent","Permanent")],"Department"),
+ "mobile": fields.Char("Mobile",required=False,search=True),
+ "number2" : fields.Char("Certificate No."),
+ "licen_issued" : fields.Date("Issued on"),
"state": fields.Selection([("draft","Draft"),("active","Active"),("deactive","Deactive")],"Status",required=True),
"addresses": fields.One2Many("address","related_id","Addresses"),
"comments": fields.One2Many("message","related_id","Comments"),
diff --git a/netforce_clinic/models/clinic_patient.py b/netforce_clinic/models/clinic_patient.py
index 04a0e96..036eefa 100644
--- a/netforce_clinic/models/clinic_patient.py
+++ b/netforce_clinic/models/clinic_patient.py
@@ -28,7 +28,7 @@ class Patient(Model):
"first_name": fields.Char("First Name",required=True,search=True),
"last_name": fields.Char("Last Name",required=False,search=True),
"date": fields.Date("Create Date",required=False,search=True),
- "birthday": fields.Date("BirthDay",required=False,search=True),
+ "birthday": fields.Date("Date of birth",required=False,search=True),
"telephone": fields.Char("Telephone",required=False,search=True),
"mobile": fields.Char("Mobile",required=False,search=True),
"job": fields.Char("Job"),