Merge lp:~anna-g/micronaet/anna2014 into lp:micronaet

[Anna Micronaet]

Unmerged revisions

1281. By Anna Micronaet on 2014-10-24

Ultime modifiche

=== modified file 'dentist/dentist.py'
--- dentist/dentist.py	2014-10-22 07:43:48 +0000
+++ dentist/dentist.py	2014-10-24 07:13:46 +0000
@@ -684,6 +684,72 @@
     _inherit = "res.partner"
     
     _columns = {
+<<<<<<< TREE
+=======
+        # override:
+        'name': fields.char('Name', size=128, required=False, select=True),
+
+        # added fields:
+        'date_creation' : fields.date('Partner since',help="Date of creations partner record"),
+        'alias' : fields.char('Alias', size=64),
+        'last_name' : fields.char('Last name', size=64),
+        'first_name' : fields.char('First name', size=64),
+        'fiscal_id_code' : fields.char('Fiscal code', size=16),
+        'profession' : fields.char('Professione', size=64),
+
+        #'is_person' : fields.boolean('Person', help="Check if the partner is a person."),
+        #'is_patient' : fields.boolean('Patient', help="Check if the partner is a patient"),
+        #'is_doctor' : fields.boolean('Doctor', help="Check if the partner is a doctor"),
+        #'is_assistant' : fields.boolean('Assistant', help="Check if the partner is an assistant"),
+        #'is_institution' : fields.boolean ('Institution', help="Check if the partner is a Medical Center"),
+
+        #'lastname' : fields.char('Last Name', size=128, help="Last Name"),
+
+        # Patient data:
+        'photo' : fields.binary ('Picture'),
+        'dob' : fields.date ('Date of Birth'),
+        'lob' : fields.char('Place of birth', size=80),
+        'pob' : fields.char('Province of birth', size=4),
+        #'age' : fields.function(_patient_age, method=True, type='char', size=32, string='Patient Age',help="It shows the age of the patient in years(y), months(m) and days(d).\nIf the patient has died, the age shown is the age at time of death, the age corresponding to the date on the death certificate. It will show also \"deceased\" on the field"),
+        'deceased' : fields.boolean ('Deceased',help="Mark if the patient has died"),
+
+        'sex' : fields.selection([
+            ('m','Male'),
+            ('f','Female'),
+            ], 'Sex', select=True),
+        'marital_status' : fields.selection([
+            ('s','Single'),
+            ('m','Married'),
+            ('w','Widowed'),
+            ('d','Divorced'),
+            ('x','Separated'),
+            ], 'Marital Status'),
+        'blood_type' : fields.selection([
+            ('A','A'),
+            ('B','B'),
+            ('AB','AB'),
+            ('O','O'),
+            ], 'Blood Type'),
+        'rh' : fields.selection([
+            ('+','+'),
+            ('-','-'),
+            ], 'Rh'),
+
+        #'user_id':fields.related('name','user_id',type='many2one',relation='res.partner',string='Doctor',help="Physician that logs in the local Medical system (HIS), on the health center. It doesn't necesarily has do be the same as the Primary Care doctor"),
+        #'ethnic_group' : fields.many2one ('medical.ethnicity','Ethnic group'),
+        #'vaccinations': fields.one2many ('medical.vaccination','name',"Vaccinations"),
+        #'medications' : fields.one2many('medical.patient.medication','name','Medications'),
+        #'prescriptions': fields.one2many ('medical.prescription.order','name',"Prescriptions"),
+        #'diseases' : fields.one2many ('medical.patient.disease', 'name', 'Diseases'),
+        
+        #'critical_info' : fields.text ('Important disease, allergy or procedures information',help="Write any important information on the patient's disease, surgeries, allergies, ..."),
+        #'evaluation_ids' : fields.one2many ('medical.patient.evaluation','name','Evaluation'),
+        #'admissions_ids' : fields.one2many ('medical.patient.admission','name','Admission / Discharge'),
+        
+        'general_info' : fields.text ('General Information', help="General information about the patient"),
+        'send_from' : fields.char('Send from', size=64),
+        #'cod' : fields.many2one ('medical.pathology', 'Cause of Death'),
+>>>>>>> MERGE-SOURCE
         'annotations_ids':fields.one2many('dentist.annotation', 'partner_id', 
             'Annotations', required=False),
         'operation_ids':fields.one2many('dentist.operation', 'partner_id',