Merge lp:~noskcaj/ubuntu/utopic/gnuhealth/2.6 into lp:ubuntu/utopic-proposed/gnuhealth

[Jackson Doak]

New upstream release. Fixes FTBFS

[Daniel Holbach (dholbach)]

Thanks. uploaded.

review: Approve

Unmerged revisions

9. By Jackson Doak on 2014-07-17

* New upstream release.
* Use tryton 3.2.x

=== modified file 'Changelog'
--- Changelog	2014-02-19 20:15:51 +0000
+++ Changelog	2014-07-17 21:57:19 +0000
@@ -1,6 +1,1257 @@
+changeset:   1430:253d95fa46a8
+tag:         tip
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 18:57:02 2014 +0100
+summary:     GNU Health installer : Remove python-ldap installation via pip from all operating systems
+
+changeset:   1429:e12335c5e908
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 18:31:46 2014 +0100
+summary:     Changelog : Update
+
+changeset:   1428:f64475f41c48
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 18:30:19 2014 +0100
+summary:     Changelog : Update
+
+changeset:   1427:358d08893ace
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 18:27:36 2014 +0100
+summary:     health_archives : Fix version
+
+changeset:   1426:8cc7cec2fde0
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 18:18:20 2014 +0100
+summary:     Changelog : Update to latest version
+
+
+changeset:   1425:44ae2ec79478
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 18:13:10 2014 +0100
+summary:     all : update version
+
+changeset:   1424:b8873f6ebf9e
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 16:49:04 2014 +0100
+summary:     health : prioritize constraints in health professional and specialties
+
+changeset:   1423:dba135d3b154
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 16:10:32 2014 +0100
+summary:     health : Include default institution in health professional
+
+changeset:   1422:04269fd8865a
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 15:38:12 2014 +0100
+summary:     health: fix invalid attribute in XML view
+
+changeset:   1421:44718bfde9d7
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 15:26:13 2014 +0100
+summary:     health: include id as temporary code in migration to the new health institution model
+
+changeset:   1420:248262b50c8f
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 13:30:22 2014 +0100
+summary:     health : Make required and unique the institution code
+
+changeset:   1419:17ff6c459309
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 13:18:45 2014 +0100
+summary:     health_genetics : Include sibblings in the family history / genetic information
+
+changeset:   1418:101218cf0ada
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 13:00:37 2014 +0100
+summary:     health_genetics : Improve view for genetic family history
+
+changeset:   1417:a1794ad7875d
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 12:47:35 2014 +0100
+summary:     health_genetics : Include notes, comments on genetic risks
+
+changeset:   1416:551834c4b9b8
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 12:32:29 2014 +0100
+summary:     health_genetics : Official Symbol of the Disease Gene is now required. Improved tree view
+
+changeset:   1415:f6946a2abeb5
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 12:15:02 2014 +0100
+summary:     health_lifestyle : Add code to the recreational drugs database . Update datafile
+
+changeset:   1414:34686ddf25d6
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 10:52:35 2014 +0100
+summary:     health : add unique constraint for health professional license ID
+
+changeset:   1413:7301382d6eea
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 10:22:16 2014 +0100
+summary:     health : fix required the drug route form
+
+changeset:   1412:627504d0174c
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 10:21:03 2014 +0100
+summary:     health : make unique and required the drug route form. Update tooltips
+
+changeset:   1411:4f8337954617
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 10:16:33 2014 +0100
+summary:     health : make unique and required the drug form and medication frequency codes
+
+changeset:   1410:e1f32f38e4fc
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 10:01:03 2014 +0100
+summary:     health : make unique and required the occupation code
+
+changeset:   1409:08b9aba7688b
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 09:51:25 2014 +0100
+summary:     health : make unique and required the ethnic group code
+
+changeset:   1408:5ecb6f042de1
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 09:33:55 2014 +0100
+summary:     health : update ethnic groups codes in datafiles
+
+changeset:   1407:b9482087d279
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 09:26:09 2014 +0100
+summary:     health : make required and unique the specialty code
+
+changeset:   1406:36271776d4e7
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jul 06 08:51:19 2014 +0100
+summary:     health: Update medical specialties and their codes
+
+changeset:   1405:cdc2aba9a1c1
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jul 05 20:57:50 2014 +0100
+summary:     health : make the institution field required on the ward model
+
+changeset:   1404:912ee97bdfe2
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jul 05 20:45:21 2014 +0100
+summary:     health : Add default institution in buildings, units, wards, beds and OR
+
+changeset:   1403:663e32bd589b
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jul 05 20:35:15 2014 +0100
+summary:     health: add unique constraint on bed per institution
+
+changeset:   1402:9b9e337b226c
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jul 05 20:27:03 2014 +0100
+summary:     health : Make institution field on bed model required
+
+changeset:   1401:d2bafefd705d
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jul 05 20:07:21 2014 +0100
+summary:     health: add unique constraints on ward per institution
+
+changeset:   1400:f29b9089d96f
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jul 05 19:58:18 2014 +0100
+summary:     health: make the OR and Unit required
+
+changeset:   1399:6957763ca714
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jul 05 19:49:49 2014 +0100
+summary:     health: add unique constraints on name , code in institutions for Institutions buildings and units
+
+changeset:   1398:ec23d135cd64
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jul 05 19:10:10 2014 +0100
+summary:     health: Add unique constraint to disease categories
+
+changeset:   1397:e23a8a9835e7
+user:        Chris Zimmerman <[e-mail]>
+date:        Sat Jul 05 10:07:58 2014 -0700
+summary:     FHIR: a small start on flask
+
+changeset:   1396:92adeeb6bc66
+user:        Chris Zimmerman <[e-mail]>
+date:        Sat Jul 05 09:58:17 2014 -0700
+summary:     FHIR: renamed main to __init__; fixed some imports
+
+changeset:   1395:88b55952a191
+user:        Chris Zimmerman <[e-mail]>
+date:        Sat Jul 05 09:53:23 2014 -0700
+summary:     FHIR: import as xml code as module; fixed some imports
+
+changeset:   1394:2b05b52e9b41
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jul 05 17:13:57 2014 +0100
+summary:     health : unique constraint for pathology groups
+
+changeset:   1393:c38aced12dca
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jul 05 15:39:36 2014 +0100
+summary:     health_crypt : remove unused directories in setup.py
+
+changeset:   1392:1944ace336e5
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jul 05 15:22:51 2014 +0100
+summary:     health_archives : remove unused directories in setup.py
+
+changeset:   1391:0558acf75e87
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Sat Jul 05 07:29:48 2014 -0300
+summary:     installer : Same fixes on selection of python packages to Debian distro.
+
+changeset:   1390:70b581d83d00
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Sat Jul 05 07:17:56 2014 -0300
+summary:     installer : Refactoring to use only functions from main() controller skeleton.
+
+changeset:   1389:25989c1caeb2
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Sat Jul 05 03:57:52 2014 -0300
+summary:     installer : Update versions of packages python dependencies
+
+changeset:   1388:4e244bf2de70
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Fri Jul 04 19:41:34 2014 -0300
+summary:     health : Fix prescription printing error when no DoB was assigned to the patient.
+
+changeset:   1387:3026b117dbe9
+user:        Sebastian Marro <[e-mail]>
+date:        Fri Jul 04 16:03:29 2014 -0300
+summary:     health_stock : Fix vaccine default expiration_date
+
+changeset:   1386:318a10142c73
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Wed Jul 02 14:40:01 2014 -0300
+summary:     all : Add Chinese as an official language
+
+changeset:   1385:266c47b447fb
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Wed Jul 02 14:22:25 2014 -0300
+summary:     all : Add Portuguese (Brazil) as an official language
+
+changeset:   1384:3b2fc9d60b02
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Wed Jul 02 14:13:58 2014 -0300
+summary:     all : Add Greek as an official language
+
+changeset:   1383:05b117dbf85e
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Wed Jul 02 14:07:36 2014 -0300
+summary:     all : Update official languages from transifex
+
+changeset:   1382:3ddd9655b8b6
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Wed Jul 02 12:35:37 2014 -0300
+summary:     health : Fix typo
+
+changeset:   1381:fe8911f100dc
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 30 16:35:16 2014 +0100
+summary:     GNU HEALTH installer : fix typo
+
+changeset:   1380:f379b8c1b7a4
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 30 16:22:53 2014 +0100
+summary:     GNU HEALTH installer : select python packages to install locally depending on the operating system
+
+changeset:   1379:774741fdf946
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 30 16:02:17 2014 +0100
+summary:     GNU HEALTH installer : check operating system and distros
+
+changeset:   1378:5bf96abd5cf1
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 30 12:19:22 2014 +0100
+summary:     BASH profile : Include GNUHEALTH_VERSION environment variable
+
+changeset:   1377:c74761cc45bd
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 30 12:08:50 2014 +0100
+summary:     BASH profile : source .gnuhealthrc from .bashrc
+
+changeset:   1376:1fb4de85d4ad
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 30 11:41:17 2014 +0100
+summary:     BASH profile : add PYTHONPATH
+
+changeset:   1375:ec38b1962812
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 30 11:20:43 2014 +0100
+summary:     BASH profile : Check for the latest trytond installed to use in the aliases
+
+changeset:   1374:7e07410aa616
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jun 28 15:44:01 2014 +0100
+summary:     health: update description on gnuealth.institution.operationalsector
+
+changeset:   1373:c5d349c99029
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Fri Jun 27 17:59:44 2014 -0300
+summary:     Update setup.py to Tryton version 3.2
+
+changeset:   1372:f2134e26d6f3
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Fri Jun 27 17:51:17 2014 -0300
+summary:     Remove support of Python2.6​
+
+changeset:   1371:1f9f9f704660
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 27 21:22:17 2014 +0100
+summary:     health : Make read only the health professional on patient medication and add institution
+
+changeset:   1370:d86a7e0f8f7f
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 27 21:00:27 2014 +0100
+summary:     health : Add relate action to patient vaccination history
+
+changeset:   1369:3aa1d0dec4af
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Fri Jun 27 16:51:56 2014 -0300
+summary:     Remove unused reference to previous workflow engine​​
+
+changeset:   1368:a4994472e498
+user:        Sebastian Marro <[e-mail]>
+date:        Fri Jun 27 16:12:13 2014 -0300
+summary:     health_surgery : Replace identification_code with puid in surgery report
+
+changeset:   1367:c882c4beed21
+user:        Sebastian Marro <[e-mail]>
+date:        Fri Jun 27 16:11:31 2014 -0300
+summary:     health_history : Replace identification_code with puid in evaluation report
+
+changeset:   1366:949edba5d4b5
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 27 20:09:09 2014 +0100
+summary:     health: Add vaccination institution and health professional info
+
+changeset:   1365:d88620ed8275
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 27 19:22:02 2014 +0100
+summary:     health_gyneco : Add the health professional and institution info to the tree view on menstrual history
+
+changeset:   1364:23740f4e55b7
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 27 19:02:19 2014 +0100
+summary:     health_gyneco : Add health institution and professional to prenatal and puerperium evaluation
+
+changeset:   1363:247bea10b16f
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 27 18:32:44 2014 +0100
+summary:     health_surgery : Remove page from the main patient view, and use a relate action
+
+changeset:   1362:b825d3d76776
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Thu Jun 26 01:48:34 2014 -0300
+summary:     health : Use fields.depends decorator
+
+changeset:   1361:98519ef8a85c
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Thu Jun 26 01:07:12 2014 -0300
+summary:     health_calendar : Use fields.depends decorator
+
+changeset:   1360:4861399472d6
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Thu Jun 26 00:55:34 2014 -0300
+summary:     health_stock : Use fields.depends decorator
+
+changeset:   1359:3de7fd0ea1af
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Thu Jun 26 00:20:49 2014 -0300
+summary:     health_icu : Use fields.depends decorator
+
+changeset:   1358:17526c6c545e
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Wed Jun 25 23:40:36 2014 -0300
+summary:     health_inpatient : Use fields.depends decorator
+
+changeset:   1357:63c90870fcb9
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Wed Jun 25 23:16:09 2014 -0300
+summary:     health_surgery : Use fields.depends decorator
+
+changeset:   1356:084bd74d0d85
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Wed Jun 25 22:35:28 2014 -0300
+summary:     health_pediatrics : Use fields.depends decorator
+
+changeset:   1355:ae65b7006ba5
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Wed Jun 25 22:33:58 2014 -0300
+summary:     health_socioeconomics : Use fields.depends decorator
+
+changeset:   1354:b0ee88d68279
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Wed Jun 25 22:30:35 2014 -0300
+summary:     health_lifestyle : Use fields.depends decorator
+
+changeset:   1353:d3efa7c04ceb
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Wed Jun 25 22:26:40 2014 -0300
+summary:     health_lab : Use fields.depends decorator
+
+changeset:   1352:bd0ec9515e88
+user:        Bruno M. Villasanti <[e-mail]>
+date:        Wed Jun 25 22:20:41 2014 -0300
+summary:     health_gyneco : Use fields.depends decorator
+
+changeset:   1351:915d82461da4
+user:        Luis Falcon <[e-mail]>
+date:        Wed Jun 25 11:53:01 2014 +0100
+summary:     health_gyneco : Use alternative reverse method to input weeks of gestational age and end of pregnancy when referred by the patient
+
+changeset:   1350:f2c7905caf8b
+user:        Luis Falcon <[e-mail]>
+date:        Wed Jun 25 10:00:28 2014 +0100
+summary:     health_gyneco : Automatic computation of patient gravida, preterms, abortions and stillbirths
+
+changeset:   1349:aef9cb96e5fe
+user:        Luis Falcon <[e-mail]>
+date:        Tue Jun 24 22:18:26 2014 +0100
+summary:     health_gyneco: Automatic calculation of patient gravida
+
+changeset:   1348:3b7cc14d65ad
+user:        Luis Falcon <[e-mail]>
+date:        Tue Jun 24 21:02:21 2014 +0100
+summary:     health_gyneco : remove debugging info
+
+changeset:   1347:722bfcbd51bc
+user:        Luis Falcon <[e-mail]>
+date:        Tue Jun 24 21:01:10 2014 +0100
+summary:     health_gyneco : Add institution and health prof. to the new patient obstetric record. Fix current pregnancy validation method
+
+changeset:   1346:797283dc1cdd
+user:        Luis Falcon <[e-mail]>
+date:        Tue Jun 24 13:58:07 2014 +0100
+summary:     health_gyneco : Fix validation method for current pregnancy
+
+changeset:   1345:f19fe6f276e7
+user:        Luis Falcon <[e-mail]>
+date:        Tue Jun 24 13:21:04 2014 +0100
+summary:     health_gyneco : Fix required field date from previous to current in PAP, Mammography and Colposcopy
+
+changeset:   1344:1aa6ccd2cbe6
+user:        Luis Falcon <[e-mail]>
+date:        Tue Jun 24 13:02:49 2014 +0100
+summary:     health_gyneco : Show the mammography, PAP and colposcopy if there is a history
+
+changeset:   1343:88cdc73e8a1e
+user:        Luis Falcon <[e-mail]>
+date:        Tue Jun 24 12:46:51 2014 +0100
+summary:     health_gyneco: Group PAP and Colposcopy in the Screening page
+
+changeset:   1342:b706d1fb9915
+user:        Luis Falcon <[e-mail]>
+date:        Tue Jun 24 12:03:27 2014 +0100
+summary:     health_gyneco : Move the OB history to main tab on GYN
+
+changeset:   1341:9721cd346845
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 23 22:56:06 2014 +0100
+summary:     health_gyneco : Update view for patient obstetric history and use Python SQL
+
+changeset:   1340:c2cedb40216e
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 23 20:51:32 2014 +0100
+summary:     health : remove debugging information
+
+changeset:   1339:a8d36273b5eb
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 23 20:12:17 2014 +0100
+summary:     health_gyneco : Use a relate action for patient obstetric information
+
+changeset:   1338:aa41b3d24f9d
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 23 17:56:51 2014 +0100
+summary:     health_gyneco : remove required state from BBA and home birth fields
+
+changeset:   1337:a0e802dfaea2
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 23 17:47:31 2014 +0100
+summary:     health_gyneco : Add BBA and Home-birth to the obstetric history
+
+changeset:   1336:a4bdfd58964a
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 23 16:36:37 2014 +0100
+summary:     health_gyneco : Add Institution and health professional to the perinatal model
+
+changeset:   1335:ba703a6e7d60
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 22 09:48:30 2014 +0100
+summary:     health: improve and reorder view with the Institution and signing health professional
+
+changeset:   1334:488c8e64ef81
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jun 21 23:25:54 2014 +0100
+summary:     health_gyneco : Add health professional and institution to patient menstrual period review
+
+changeset:   1333:3471d9a1b8c7
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jun 21 23:18:35 2014 +0100
+summary:     health_gyneco : Improve form view in mammography, colposcopy and and PAP
+
+changeset:   1332:522428a38db2
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jun 21 22:34:44 2014 +0100
+summary:     health_gyneco : Add health professional and institution to the colposcopy model
+
+changeset:   1331:fbf8f3fe2273
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 20 20:01:46 2014 +0100
+summary:     health_gyneco : Add health professional and institution to patient PAP smear history
+
+changeset:   1330:2365711c4dfd
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 20 19:49:25 2014 +0100
+summary:     health_gyneco : Add health professional and institution to patient  mammography history
+
+changeset:   1329:401f46295e71
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 20 15:02:31 2014 +0100
+summary:     health_pediatrics : Document fields to be removed in 2.8
+
+changeset:   1328:0135213637b6
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 20 14:56:09 2014 +0100
+summary:     health_pediatrics : Remove page on neonatal death from view
+
+changeset:   1327:49d4263460c6
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 20 13:39:52 2014 +0100
+summary:     health_pediatrics : Limit to one the neonatal information on the patient
+
+changeset:   1326:a5d1eb51790f
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 20 12:20:59 2014 +0100
+summary:     health_pediatrics : Update party birth date with the newly created newborn record
+
+changeset:   1325:b5ec0d9cd832
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 20 01:38:19 2014 +0100
+summary:     health_pediatrics : Update person (party) date of birth upon writing newborn info
+
+changeset:   1324:808ba9a59891
+user:        Luis Falcon <[e-mail]>
+date:        Thu Jun 19 18:53:41 2014 +0100
+summary:     GNU Health installer : rename custom modules dir variable
+
+changeset:   1323:c033b953fc1b
+user:        Luis Falcon <[e-mail]>
+date:        Thu Jun 19 17:03:28 2014 +0100
+summary:     GNU Health RC file : unalias ls to be FreeBSD compatible
+
+changeset:   1322:9336dec90213
+user:        Luis Falcon <[e-mail]>
+date:        Thu Jun 19 16:53:40 2014 +0100
+summary:     GNU Health installer : Add custom modules directory
+
+changeset:   1321:5563c4f48091
+user:        Sebastian Marro <[e-mail]>
+date:        Thu Jun 12 11:36:26 2014 -0500
+summary:     health_qrcodes : Replace ssn with puid in patient_card report
+
+changeset:   1320:f1bbb358c49d
+user:        Chris Zimmerman <[e-mail]>
+date:        Wed Jun 11 21:48:44 2014 -0700
+summary:     FHIR: initial server xml handling code
+
+changeset:   1319:8d1cae531bac
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 09 13:25:01 2014 -0500
+summary:     health : reorder Classes to fit the new institution model
+
+changeset:   1318:14826e86d240
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 09 08:31:07 2014 -0500
+summary:     health installer : add upgrade param to the pip installation
+
+changeset:   1317:5cea2cdc69fb
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 09 00:33:10 2014 -0500
+summary:     health_archives : update identification_code to PUID
+
+changeset:   1316:fd2ee4a30c39
+user:        Luis Falcon <[e-mail]>
+date:        Mon Jun 09 00:04:46 2014 -0500
+summary:     health_qrcodes : Update Identification to PUID
+
+changeset:   1315:995bce4ceefa
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 23:55:56 2014 -0500
+summary:     health : Update patient reports to new PUID
+
+changeset:   1314:a96f15370761
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 23:30:50 2014 -0500
+summary:     health_qrcodes : update ssn to puid
+
+changeset:   1313:b1e5393e76d2
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 23:15:08 2014 -0500
+summary:     health : move up the health institution classes
+
+changeset:   1312:23e60ca5b631
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 19:59:21 2014 -0500
+summary:     health : Add institution to the hospitalization registration and surgery models
+
+changeset:   1311:086205bc5e6d
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 19:40:00 2014 -0500
+summary:     health : Add institution to the evaluation model and tree
+
+changeset:   1310:3b6bff8b8f89
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 19:12:41 2014 -0500
+summary:     health : Add method to retrieve the GNU Health instance institution
+
+changeset:   1309:d4b1c1070649
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 17:21:56 2014 -0500
+summary:     health : Add infusion and infusion rates to the view
+
+changeset:   1308:dc0dfdaa3817
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 15:20:29 2014 -0500
+summary:     health_inpatient : Rename ssn by puid on tree view
+
+changeset:   1307:73ee54eb7095
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 13:26:55 2014 -0500
+summary:     health : update medical specialties
+
+changeset:   1306:9c0926705c80
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 12:45:59 2014 -0500
+summary:     health : enforce domains in wards, operating rooms and units
+
+changeset:   1305:a91aa481e97a
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 12:27:51 2014 -0500
+summary:     health : link OR to the new institution model
+
+changeset:   1304:4892ac742a84
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 11:48:05 2014 -0500
+summary:     health : link wards to the new institution model
+
+changeset:   1303:64a532c57d72
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 11:08:57 2014 -0500
+summary:     health : link the health center units to the new institution model
+
+changeset:   1302:4173e338ba63
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 10:58:06 2014 -0500
+summary:     health : PEP8
+
+changeset:   1301:8cff0f1717ef
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 10:26:54 2014 -0500
+summary:     health : link the buildings to the new health institution model
+
+changeset:   1300:0700f99e82f5
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 09:26:12 2014 -0500
+summary:     health : include operating room on institution tree view
+
+changeset:   1299:b07a55310086
+user:        Luis Falcon <[e-mail]>
+date:        Sun Jun 08 09:16:36 2014 -0500
+summary:     health : upgrade to 2.6 . Populate the health institution model from the party
+
+changeset:   1298:dfefcfa64d4c
+user:        Luis Falcon <[e-mail]>
+date:        Sat Jun 07 17:06:33 2014 -0500
+summary:     health : add Instution code and Operating Room facilities
+
+changeset:   1297:f72301a0d24b
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 06 16:30:44 2014 -0500
+summary:     health : change the patient form PUID field
+
+changeset:   1296:611a377ed9c2
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 06 13:25:38 2014 -0500
+summary:     health: Rename SSN to Person Unique ID (PUID)
+
+changeset:   1295:e740105f99d5
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 06 12:19:21 2014 -0500
+summary:     health : move the patient local institution identification code to the party alternative id as medical record, to use the unique person identification
+
+changeset:   1294:3b6c066f99f8
+user:        Luis Falcon <[e-mail]>
+date:        Fri Jun 06 10:43:50 2014 -0500
+summary:     health, inpatient : remove the extra, local patient identifier to favor the unique person ID
+
+changeset:   1293:089f3b4f18e0
+user:        Luis Falcon <[e-mail]>
+date:        Thu Jun 05 17:41:47 2014 -0500
+summary:     Calendar : Link the health center to the institution model
+
+changeset:   1292:8970b8d546be
+user:        Luis Falcon <[e-mail]>
+date:        Thu Jun 05 17:26:32 2014 -0500
+summary:     health: link vaccinations to institution
+
+changeset:   1291:d97a4f1dedc2
+user:        Luis Falcon <[e-mail]>
+date:        Thu Jun 05 17:17:06 2014 -0500
+summary:     health: link health professional to institution
+
+changeset:   1290:ec19dfb62736
+user:        Luis Falcon <[e-mail]>
+date:        Thu Jun 05 17:12:27 2014 -0500
+summary:     health: improve health institution form view
+
+changeset:   1289:892506be5ff7
+user:        Luis Falcon <[e-mail]>
+date:        Thu Jun 05 16:18:33 2014 -0500
+summary:     Archives : remove archives submenu and use the main menu
+
+changeset:   1288:e67991d95864
+user:        Luis Falcon <[e-mail]>
+date:        Thu Jun 05 16:08:09 2014 -0500
+summary:     Inpatient : remove hospitalization submenu and use the main menu
+
+changeset:   1287:238759a0d1ab
+user:        Luis Falcon <[e-mail]>
+date:        Thu Jun 05 15:49:30 2014 -0500
+summary:     Surgery : remove submenu
+
+changeset:   1286:02ee969e962a
+user:        Luis Falcon <[e-mail]>
+date:        Thu Jun 05 15:39:34 2014 -0500
+summary:     health : remove submenu on prescriptions
+
+changeset:   1285:d0789f6aef54
+user:        Luis Falcon <[e-mail]>
+date:        Thu Jun 05 15:22:03 2014 -0500
+summary:     health : Remove submenu prescriptions, use the main menu
+
+changeset:   1284:7fb6bd9c8733
+user:        Luis Falcon <[e-mail]>
+date:        Thu Jun 05 12:36:31 2014 -0500
+summary:     health : include alternative IDs in the party search
+
+changeset:   1283:21297a6c3bfb
+user:        Luis Falcon <[e-mail]>
+date:        Thu Jun 05 10:21:28 2014 -0500
+summary:     health_crypto : fix separator id on prescription view
+
+changeset:   1282:ec926a88f391
+user:        Luis Falcon <[e-mail]>
+date:        Thu Jun 05 10:18:19 2014 -0500
+summary:     health_crypto : check for the GNUPG python library upon start
+
+changeset:   1281:a83ef1bc42ff
+user:        Luis Falcon <[e-mail]>
+date:        Wed Jun 04 00:35:37 2014 +0100
+summary:     health: Update appointment model from party to health institution
+
+changeset:   1280:880b4cb25b8b
+user:        Luis Falcon <[e-mail]>
+date:        Tue Jun 03 14:22:36 2014 +0100
+summary:     health : Add shorcut to the bed from the institution, and institution attribute to the bed model
+
+changeset:   1279:f87bc2a5805c
+user:        Luis Falcon <[e-mail]>
+date:        Tue Jun 03 14:07:36 2014 +0100
+summary:     health : Shortcut to the Institution Wards from the center
+
+changeset:   1278:079561e5034a
+user:        Luis Falcon <[e-mail]>
+date:        Tue Jun 03 14:05:30 2014 +0100
+summary:     health : Shortcut to the Institution Units from the center
+
+changeset:   1277:60a354259152
+user:        Luis Falcon <[e-mail]>
+date:        Tue Jun 03 13:54:04 2014 +0100
+summary:     health : Remove old domains from health institutions
+
+changeset:   1276:ef42df1ea725
+user:        Luis Falcon <[e-mail]>
+date:        Tue Jun 03 13:49:35 2014 +0100
+summary:     health : Now link Wards, Operating Rooms, Units and Buildings to the institution model
+
+changeset:   1275:29f10ed88941
+user:        Luis Falcon <[e-mail]>
+date:        Tue Jun 03 13:44:20 2014 +0100
+summary:     health : Shortcut from Institution to health center buildings
+
+changeset:   1274:97a507dfa709
+user:        Luis Falcon <[e-mail]>
+date:        Tue Jun 03 13:32:25 2014 +0100
+summary:     health : fix infusion field in medication model
+
+changeset:   1273:acec599933f7
+user:        Luis Falcon <[e-mail]>
+date:        Sat May 31 11:21:06 2014 +0100
+summary:     health : add fields related to infusion in medication
+
+changeset:   1272:2cf43335554b
+user:        Luis Falcon <[e-mail]>
+date:        Tue May 27 11:32:31 2014 +0100
+summary:     crytpo plugin : Initial documentation process
+
+changeset:   1271:d2ab7ef9836a
+user:        Luis Falcon <[e-mail]>
+date:        Mon May 26 19:41:16 2014 +0100
+summary:     crypto plugin : Verify document for a valid digital signature
+
+changeset:   1270:ab338004d260
+user:        Luis Falcon <[e-mail]>
+date:        Mon May 26 17:17:03 2014 +0100
+summary:     crypto plugin : PEP8
+
+changeset:   1269:3d879fb67268
+user:        Luis Falcon <[e-mail]>
+date:        Fri May 23 16:19:33 2014 +0100
+summary:     crypto plugin : Fix exception handling in signature generation
+
+changeset:   1268:62c6e71db513
+user:        Luis Falcon <[e-mail]>
+date:        Fri May 23 15:32:47 2014 +0100
+summary:     crypto plugin : Clearsign document validation
+
+changeset:   1267:548c62d00c50
+user:        Luis Falcon <[e-mail]>
+date:        Fri May 23 12:15:30 2014 +0100
+summary:     crypto plugin : Prioritize single record selection check
+
+changeset:   1266:712c260c22df
+user:        Luis Falcon <[e-mail]>
+date:        Fri May 23 12:13:39 2014 +0100
+summary:     crypto plugin : Check for document signature
+
+changeset:   1265:82a7cfe6ea5e
+user:        Luis Falcon <[e-mail]>
+date:        Fri May 23 10:47:42 2014 +0100
+summary:     crypto plugin : Check current model document to handle digital signatures
+
+changeset:   1264:db78468f2c49
+user:        Luis Falcon <[e-mail]>
+date:        Thu May 22 13:34:53 2014 +0100
+summary:     crypto plugin, health_crypto : Include and save the generated digital signature on the document
+
+changeset:   1263:fe3398811873
+user:        Luis Falcon <[e-mail]>
+date:        Wed May 21 11:23:31 2014 +0100
+summary:     crypto_plugin : Initial plugin commit for Tryton / GNU Health client
+
+changeset:   1262:faab8964318f
+user:        Luis Falcon <[e-mail]>
+date:        Wed May 21 00:54:31 2014 +0100
+summary:     health_crypto : Fix prescription line and add notes to the serial doc
+
+changeset:   1261:23f37874ecb9
+user:        Luis Falcon <[e-mail]>
+date:        Mon May 19 11:11:06 2014 +0100
+summary:     health_crypto : Verification and side-by-side comparison on Prescription Order
+
+changeset:   1260:be7cbff28959
+user:        Luis Falcon <[e-mail]>
+date:        Wed May 14 13:24:17 2014 +0100
+summary:     health_crypto : Initial function for document digest verification
+
+changeset:   1259:27f134a91d7f
+user:        Luis Falcon <[e-mail]>
+date:        Thu May 08 17:29:45 2014 +0100
+summary:     health_crypto : improve prescription generation view layout
+
+changeset:   1258:b10e9665891c
+user:        Luis Falcon <[e-mail]>
+date:        Thu May 08 16:57:21 2014 +0100
+summary:     health_crypto : change button to generate prescription
+
+changeset:   1257:4c5b6def7661
+user:        Luis Falcon <[e-mail]>
+date:        Wed May 07 21:10:40 2014 +0100
+summary:     health_crypto : generate document serialization and  digest for prescription document in read-only field
+
+changeset:   1256:9c9033c9804d
+user:        Luis Falcon <[e-mail]>
+date:        Mon May 05 20:47:59 2014 +0100
+summary:     health_crypto : JSON data seralization
+
+changeset:   1255:57e66630d3c3
+user:        Luis Falcon <[e-mail]>
+date:        Sat May 03 13:58:33 2014 +0100
+summary:     health_crypto : Create main HealthCrypto class and add serialization and hash functions
+
+changeset:   1254:79b574313e35
+user:        Luis Falcon <[e-mail]>
+date:        Fri May 02 16:48:22 2014 +0100
+summary:     health_crypto: Init module structure
+
+changeset:   1253:ab08e290f8fb
+user:        Luis Falcon <[e-mail]>
+date:        Sat Apr 19 12:26:06 2014 +0200
+summary:     health : Add Operational Sectors to Health institutions
+
+changeset:   1252:76cc8dd79985
+user:        Luis Falcon <[e-mail]>
+date:        Sat Apr 19 11:46:23 2014 +0200
+summary:     health : Unify menus Health Centers -> Institutions
+
+changeset:   1251:a3bf2ea71ce1
+parent:      1249:a2a9d32b8dac
+user:        Luis Falcon <[e-mail]>
+date:        Sat Apr 19 11:36:03 2014 +0200
+summary:     health: apply fix 1187 to development version
+
+changeset:   1250:c4a83c58a22b
+branch:      stable
+parent:      1187:b161a0485e7a
+user:        Luis Falcon <[e-mail]>
+date:        Sat Apr 19 11:09:16 2014 +0200
+summary:     health : Fix medicament category domain False -> None
+
+changeset:   1249:a2a9d32b8dac
+user:        Luis Falcon <[e-mail]>
+date:        Sat Apr 19 11:06:08 2014 +0200
+summary:     FHIR backend: update version and Development Status
+
+changeset:   1248:f8ebc4b4901f
+user:        Luis Falcon <[e-mail]>
+date:        Thu Apr 17 23:32:45 2014 +0200
+summary:     FHIR backend : add version file and update credits
+
+changeset:   1247:7858144c6d31
+user:        Luis Falcon <[e-mail]>
+date:        Wed Apr 16 11:49:34 2014 +0200
+summary:     FHIR backend : Add version file
+
+changeset:   1246:ea895f38133a
+user:        Luis Falcon <[e-mail]>
+date:        Sat Apr 12 11:01:46 2014 +0200
+summary:     FHIR backend : Chris Zimmerman . update README to show params is dictionary
+
+changeset:   1245:4b5a0a615d6e
+user:        Luis Falcon <[e-mail]>
+date:        Sat Apr 12 10:59:50 2014 +0200
+summary:     FHIR backend : Chris Zimmerman . params is dictionary now --> use requests params argument
+
+changeset:   1244:637e9ddb860c
+user:        Luis Falcon <[e-mail]>
+date:        Sat Apr 12 10:58:48 2014 +0200
+summary:     FHIR backend : Chris Zimmerman . Add basic validation to XML and JSON body arguments
+
+changeset:   1243:f34b82303d6f
+user:        Luis Falcon <[e-mail]>
+date:        Sun Apr 06 16:26:42 2014 +0100
+summary:     health: Add constraint for uniqness in Health Institutions
+
+changeset:   1242:4c6b44a875cf
+user:        Luis Falcon <[e-mail]>
+date:        Fri Apr 04 22:36:08 2014 +0100
+summary:     FHIR commit : Update README file and commit patches from Chris Zimmerman
+
+changeset:   1241:3af14b724861
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 30 22:42:04 2014 -0300
+summary:     health : add trauma center attribute to the Health Institution model
+
+changeset:   1240:42dc857e76fa
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 30 21:38:40 2014 -0300
+summary:     health : add institution type to Health Insitution tree view
+
+changeset:   1239:27b72e69478c
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 30 21:34:03 2014 -0300
+summary:     health : Add heliport to health institution
+
+changeset:   1238:a137ac0223ab
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 30 01:15:52 2014 -0300
+summary:     FHIR backend : Add CREDITS file to MANIFEST.in
+
+changeset:   1237:87df3811df4c
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 30 01:12:36 2014 -0300
+summary:     FHIR backend : Fix typo in description
+
+changeset:   1236:b4a843ea427a
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 30 01:11:16 2014 -0300
+summary:     FHIR backend : Update version to 0.0.3
+
+changeset:   1235:205e382df5f0
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 30 01:05:19 2014 -0300
+summary:     FHIR backend : Update README file with same demo data as in GNU Health for Ana Betz
+
+changeset:   1234:4a061be56aeb
+user:        Luis Falcon <[e-mail]>
+date:        Sat Mar 29 22:50:03 2014 -0300
+summary:     FHIR backend : assign default value to body argument
+
+changeset:   1233:03b306c54214
+user:        Luis Falcon <[e-mail]>
+date:        Sat Mar 29 20:03:37 2014 -0300
+summary:     FHIR backend : Chris Zimmerman adds validate, vread and history resources
+
+changeset:   1232:5bd3e2814cad
+user:        Luis Falcon <[e-mail]>
+date:        Sat Mar 29 19:51:51 2014 -0300
+summary:     FHIR backend : add headers in create method for XML or JSON formats
+
+changeset:   1231:7e6753be6da3
+user:        Luis Falcon <[e-mail]>
+date:        Sat Mar 29 17:23:09 2014 -0300
+summary:     FHIR backend : fix url by fhir_request on create method
+
+changeset:   1230:5d0a5d904c93
+user:        Luis Falcon <[e-mail]>
+date:        Sat Mar 29 16:47:43 2014 -0300
+summary:     FHIR backend : Add CREDITS file
+
+changeset:   1229:02f8069ac4b7
+user:        Luis Falcon <[e-mail]>
+date:        Sat Mar 29 10:22:05 2014 -0300
+summary:     FHIR backend : Added create / update / delete conformance and transaction interactions. Thank you Chris at riseup !
+
+changeset:   1228:9e45e68c8afa
+user:        Luis Falcon <[e-mail]>
+date:        Fri Mar 28 20:58:56 2014 -0300
+summary:     health : add Health Institution specialties - name, specialty - in a separate Class
+
+changeset:   1227:00e6ee14303c
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 23 22:43:36 2014 -0300
+summary:     health : Include rules for main specialty and make read only the institution field once this is saved
+
+changeset:   1226:f7656fd1eaaf
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 23 21:16:08 2014 -0300
+summary:     health : General hospital and Specialized institutions
+
+changeset:   1225:0ff9e9d1caaa
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 23 21:13:21 2014 -0300
+summary:     health : Add teaching attribute to health institutions
+
+changeset:   1224:f7243bd018b9
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 23 20:10:44 2014 -0300
+summary:     health: make tree editable on Institution Specialties. Improve view
+
+changeset:   1223:e7cb6e900556
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 23 11:35:09 2014 -0300
+summary:     health : Make readonly the specialties associated to the view on the health facility
+
+changeset:   1222:4ee299e0bd9f
+user:        Luis Falcon <[e-mail]>
+date:        Sat Mar 22 18:41:38 2014 -0300
+summary:     health : Place Health instituions in main menu
+
+changeset:   1221:a605bb914caa
+user:        Luis Falcon <[e-mail]>
+date:        Sat Mar 22 17:26:00 2014 -0300
+summary:     health : Add Health departments / specialties by institution
+
+changeset:   1220:415366ae4c9a
+user:        Luis Falcon <[e-mail]>
+date:        Fri Mar 21 22:20:54 2014 -0300
+summary:     health : add health institution type and picture to the model
+
+changeset:   1219:548f77688d0f
+user:        Luis Falcon <[e-mail]>
+date:        Fri Mar 21 21:11:43 2014 -0300
+summary:     health : health institution model to permit specs / details of the health center
+
+changeset:   1218:b8cd08f9594f
+user:        Luis Falcon <[e-mail]>
+date:        Thu Mar 20 17:29:35 2014 -0300
+summary:     healt_archives: Initial module upload. Functionality for paper health record archives management
+
+changeset:   1217:c79d9ca9c338
+user:        Luis Falcon <[e-mail]>
+date:        Mon Mar 17 18:51:43 2014 -0300
+summary:     health : Make default activation date for the party creation
+
+changeset:   1216:90033c4d52f1
+user:        Luis Falcon <[e-mail]>
+date:        Mon Mar 17 18:14:28 2014 -0300
+summary:     health : Add submenu People in the party section
+
+changeset:   1215:a99dde792b37
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 16 18:17:03 2014 -0300
+summary:     health : add SSN to the general search in the party model
+
+changeset:   1214:d60b8db4102b
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 16 17:50:56 2014 -0300
+summary:     health: Optimize tree view for party
+
+changeset:   1213:3a602a4d58d9
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 16 17:36:29 2014 -0300
+summary:     health : use the SSN as the main code to search in the party. Code is still available in the filter
+
+changeset:   1212:acbdd7740b3e
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 16 17:15:29 2014 -0300
+summary:     health : resize picture group in the party form
+
+changeset:   1211:74efdd552265
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 16 16:12:50 2014 -0300
+summary:     health : Place internal user associated to the health professional at the party form footer
+
+changeset:   1210:2e2f8960359c
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 16 16:05:05 2014 -0300
+summary:     health : place the alternative identification codes inside the demographics group
+
+changeset:   1209:c88dd05f5ab4
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 16 15:49:20 2014 -0300
+summary:     health : use the SSN field in the place of the party code when the party is a person
+
+changeset:   1208:fbf27880bc83
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 16 12:27:24 2014 -0300
+summary:     health : improve party view
+
+changeset:   1207:008b7f790bec
+user:        Luis Falcon <[e-mail]>
+date:        Wed Mar 12 12:50:00 2014 +0000
+summary:     FHIR backend : Include basic REST read interaction functionality
+
+changeset:   1206:acf7ff26b045
+user:        Luis Falcon <[e-mail]>
+date:        Wed Mar 12 12:11:45 2014 +0000
+summary:     FHIR backend : PEP8
+
+changeset:   1205:4e006c6ab4e7
+user:        Luis Falcon <[e-mail]>
+date:        Wed Mar 12 10:40:14 2014 +0000
+summary:     pediatrics : Newborn improvement in form and tree
+
+changeset:   1204:ba0e5c65aaa1
+user:        Luis Falcon <[e-mail]>
+date:        Wed Mar 12 10:14:11 2014 +0000
+summary:     pediatrics : improve field descriptions
+
+changeset:   1203:83c339a1fd72
+user:        Luis Falcon <[e-mail]>
+date:        Mon Mar 10 20:41:05 2014 +0000
+summary:     pediatrics : Improve newborn view
+
+changeset:   1202:072ed3c73ffc
+user:        Luis Falcon <[e-mail]>
+date:        Mon Mar 10 19:46:26 2014 +0000
+summary:     pediatrics : Newborn view. Show only newborn sex - gender at birth - current sex is a patient property
+
+changeset:   1201:11a3990bc71c
+user:        Luis Falcon <[e-mail]>
+date:        Mon Mar 10 19:24:08 2014 +0000
+summary:     pediatrics : Fix tooltip on the newborn length
+
+changeset:   1200:d09aaf0b27ae
+user:        Luis Falcon <[e-mail]>
+date:        Mon Mar 10 19:22:30 2014 +0000
+summary:     pediatrics : improve main view layout
+
+changeset:   1199:6b3f6a58eff2
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 09 18:15:03 2014 +0000
+summary:     FHIR modules . Correct setup.py
+
+changeset:   1198:085847c057fd
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 09 00:58:05 2014 +0000
+summary:     FHIR backend : remove extra pot file
+
+changeset:   1197:5abcd1c80947
+user:        Luis Falcon <[e-mail]>
+date:        Sun Mar 09 00:57:07 2014 +0000
+summary:     fhir : initial POC of HL7 FHIR reference implementation for python and GNU Health backend
+
+changeset:   1196:cf6d9fcb100d
+user:        Luis Falcon <[e-mail]>
+date:        Sat Mar 08 13:48:59 2014 +0000
+summary:     FHIR : Initial structure for FHIR and the FHIR patient resource
+
+changeset:   1195:6149f66e2c90
+user:        Luis Falcon <[e-mail]>
+date:        Fri Mar 07 12:41:47 2014 +0000
+summary:     pediatrics : update menuitem sequence on newborn
+
+changeset:   1194:13a66db9d905
+user:        Luis Falcon <[e-mail]>
+date:        Fri Mar 07 12:00:46 2014 +0000
+summary:     pediatrics : rename shortcut from Newborn to Neonatal Info
+
+changeset:   1193:626212d43da6
+user:        Luis Falcon <[e-mail]>
+date:        Wed Mar 05 17:19:32 2014 +0000
+summary:     installer : fix space in script for custom / local modules
+
+changeset:   1192:2ed937ac77d5
+user:        Luis Falcon <[e-mail]>
+date:        Wed Mar 05 17:16:39 2014 +0000
+summary:     installer : add directory for custom modules
+
+changeset:   1191:c3e478ccf4a9
+user:        Luis Falcon <[e-mail]>
+date:        Fri Feb 14 10:21:29 2014 +0000
+summary:     health_inpatient : fix health professional display on the patient discharge
+
+changeset:   1190:d0ff73a85e3c
+user:        Luis Falcon <[e-mail]>
+date:        Wed Feb 19 11:55:06 2014 +0000
+summary:     Fix bug #41639: Traceback when opening the Disease Categories
+
+changeset:   1189:67811a8fca1c
+user:        Luis Falcon <[e-mail]>
+date:        Wed Mar 05 16:59:20 2014 +0000
+summary:     health : apply patch 1187:b161a0485e7a into dev
+
+changeset:   1188:1e2d49d5bfd7
+parent:      1178:83f26d207cb0
+user:        Luis Falcon <[e-mail]>
+date:        Wed Mar 05 16:38:48 2014 +0000
+summary:     health: update development version number to 2.5
+
+changeset:   1187:b161a0485e7a
+branch:      stable
+user:        Luis Falcon <[e-mail]>
+date:        Mon Feb 24 13:52:29 2014 +0000
+summary:     health : include the patient code in the search criteria
+
+changeset:   1186:f198d935ae95
+branch:      stable
+user:        Luis Falcon <[e-mail]>
+date:        Wed Feb 19 11:55:06 2014 +0000
+summary:     Fix bug #41639: Traceback when opening the Disease Categories
+
+changeset:   1185:05b61a6043da
+branch:      stable
+user:        Luis Falcon <[e-mail]>
+date:        Wed Feb 19 10:06:57 2014 +0000
+summary:     Added tag 2.4.1 for changeset 762258ba657e
+
+changeset:   1184:762258ba657e
+branch:      stable
+tag:         2.4.1
+user:        Luis Falcon <[e-mail]>
+date:        Sun Feb 16 07:59:43 2014 +0000
+summary:     Update Changelog file
+
+changeset:   1183:095c3709dc8a
+branch:      stable
+user:        Luis Falcon <[e-mail]>
+date:        Sun Feb 16 07:59:07 2014 +0000
+summary:     Removed tag 2.4.1
+
 changeset:   1182:6b452268a2a5
 branch:      stable
-tag:         tip
 user:        Luis Falcon <[e-mail]>
 date:        Fri Feb 14 10:21:29 2014 +0000
 summary:     health_inpatient : fix health professional display on the patient discharge
@@ -13,7 +1264,6 @@
 
 changeset:   1180:bcaa9fe707d2
 branch:      stable
-tag:         2.4.1
 user:        Luis Falcon <[e-mail]>
 date:        Mon Feb 10 04:01:07 2014 +0000
 summary:     create 2.4.1 version
@@ -62,8 +1312,8 @@
 date:        Sun Jan 26 22:54:38 2014 +0000
 summary:     health, health_history : Update report and fix bug on date
 
-
 changeset:   1171:c53a5d589516
+tag:         tip
 user:        Luis Falcon <[e-mail]>
 date:        Sun Jan 26 21:28:04 2014 +0000
 summary:     installer : update header

=== added directory 'backend'
=== added directory 'backend/plugins'
=== added directory 'backend/plugins/crypto'
=== added file 'backend/plugins/crypto/__init__.py'
--- backend/plugins/crypto/__init__.py	1970-01-01 00:00:00 +0000
+++ backend/plugins/crypto/__init__.py	2014-07-17 21:57:19 +0000
@@ -0,0 +1,179 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    GNU Health: The Free Health and Hospital Information System
+#    Copyright (C) 2008-2014 Luis Falcon <[e-mail]>
+#    Copyright (C) 2011-2014 GNU Solidario <[e-mail]>
+#
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import tryton.rpc as rpc
+from tryton.common import RPCExecute, warning, message
+from tryton.gui.window.form import Form
+import gettext
+
+try: 
+    import gnupg
+except:
+    warning(
+        ('Document Encryption / Signing disabled'
+         '\nPlease install the gnupg library '),
+        ('No GNU Privacy Guard library found !'),
+    )
+    
+    
+_ = gettext.gettext
+
+def sign_document(data):
+    """ Retrieve the hash value of the serialized document and
+        generates a clearsign signature using the user's private key
+        on the client side via GNU Privacy Guard - GPG -"""
+
+    gpg = gnupg.GPG()
+
+    document_model = data['model']
+
+    """ Don't allow signing more than one document at a time
+        To avoid signing unwanted / unread documents
+    """
+
+    if (len(data['ids']) > 1):
+        warning(
+            _('For security reasons, Please sign one document at a time'),
+            _('Multiple records selected !'),
+        )
+        return
+
+    """ Verify that the document handles digital signatures """
+
+    try:
+        record_vals = rpc.execute(
+            'model', document_model, 'read',
+            data['ids'],
+            ['document_digest', 'digital_signature'], rpc.CONTEXT)
+
+    except:
+        warning(
+            _('Please enable the model for digital signature'),
+            _('No Digest or Digital Signature fields found !'),
+        )
+        return
+
+    digest = record_vals[0]['document_digest']
+
+    """ Check that the document hasn't been signed already """
+
+    if record_vals[0]['digital_signature']:
+        warning(
+            _('Document already signed'),
+            _('This record has been already signed'),
+        )
+        return
+
+    try:
+        gpg_signature = gpg.sign(digest, clearsign=True)
+
+    except:
+        warning(
+            _('Error when signing the document'),
+            _('Please check your encryption settings'),
+        )
+
+    """
+    Set the clearsigned digest
+    """
+    try:
+        RPCExecute(
+            'model', document_model, 'set_signature',
+            data, str(gpg_signature))
+
+    except:
+        warning(
+            _('Error when saving the digital signature'),
+            _('The signature was generated but NOT saved !'),
+        )
+
+    else:
+        message(_('Document digitally signed'))
+
+        # TODO
+        # Reload the record view after storing the digital signature
+        # sig_reload or other method to check.
+        # a = Form(document_model, data['ids'])
+        # a.sig_reload()
+        # a.message_info(_('Document digitally signed'), color='blue')
+
+
+def verify_document(data):
+    """ Verify the digital signature of the document """
+
+    gpg = gnupg.GPG()
+
+    document_model = data['model']
+
+    """ Verify that the document handles digital signatures """
+
+    try:
+        record_vals = rpc.execute(
+            'model', document_model, 'read',
+            data['ids'],
+            ['document_digest', 'digital_signature'], rpc.CONTEXT)
+
+    except:
+        warning(
+            _('Please enable the model for digital signature'),
+            _('No Digest or Digital Signature fields found !'),
+        )
+        return
+
+
+    """ Verify signature """
+    digital_signature = record_vals[0]['digital_signature']
+
+    """ Check that the document has been signed """
+    if not digital_signature:
+        warning(
+            _('Unsigned document'),
+            _('This document has not been signed yet'),
+            )
+        return
+    
+    try:
+        verify_signature = gpg.verify(digital_signature)
+
+    except:
+        warning(
+            _('Error when verifying Digital Signature'),
+            _('Please check your GNU Privacy Guard Settings'),
+        )
+
+    else:
+        """ Show message of warning boxes depending on the verification """
+        if (verify_signature.valid):
+            message(_("Valid Signature !\n\n" + verify_signature.stderr))
+        else:
+            warning(
+                _(str(verify_signature.stderr)),
+                _(str("Error !")),
+            )
+
+
+def get_plugins(model):
+    return [
+        (_('Digitally Sign Document'), sign_document),
+        (_('Verify Digital Signature'), verify_document),
+    ]

=== added directory 'backend/plugins/crypto/doc'
=== added file 'backend/plugins/crypto/doc/index.rst'
--- backend/plugins/crypto/doc/index.rst	1970-01-01 00:00:00 +0000
+++ backend/plugins/crypto/doc/index.rst	2014-07-17 21:57:19 +0000
@@ -0,0 +1,33 @@
+Tryton Crytpo Plugin
+####################
+
+This plugin has been developed as part of GNU Health [1], but you should 
+be able to use it with any model in Tryton[2]
+
+Functionality :
+The Tryton crypto plugin interacts with GNU Privacy Guard [3] to digitally
+sign and encrypt documents.
+
+OS Requirements:
+
+Model attributes :
+The plugin requires - as a minimum - the following attributes on the model
+in order to be able to sign the document. 
+
+    "document_digest" of type fields.Char
+    "digital_signature" of type fields.Text 
+
+
+In real life, you will need others to make it meaningful. Please take a look
+at the Prescription model on the health_crypto module for an example and
+other fields used.
+
+
+
+Usage:
+
+References:
+
+1.- GNU Health : http://health.gnu.org
+2.- Tryton : http://www.tryton.org
+3.- GNU Privacy Guard : http://www.gnupg.org

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-01 22:45:36 +0000
+++ debian/changelog	2014-07-17 21:57:19 +0000
@@ -1,3 +1,10 @@
+gnuhealth (2.6.0-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release.
+  * Use tryton 3.2.x
+
+ -- Jackson Doak <[e-mail]>  Fri, 18 Jul 2014 07:37:19 +1000
+
 gnuhealth (2.4.1-2) unstable; urgency=low
 
   * Use su instead of sudo to run commands as gnuhealth user (Closes: #739657)

=== modified file 'debian/control'
--- debian/control	2014-01-27 08:27:26 +0000
+++ debian/control	2014-07-17 21:57:19 +0000
@@ -1,5 +1,6 @@
 Source: gnuhealth
-Maintainer: Debian Med Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Med Packaging Team <[e-mail]>
 Uploaders: Andreas Tille <[e-mail]>,
            Emilien Klein <[e-mail]>
 Section: science
@@ -8,8 +9,8 @@
                autotools-dev,
                python | python-all | python-dev | python-all-dev,
                python (<< 3.0) | python-all (<< 3.0) | python-dev (<< 3.0) | python-all-dev (<< 3.0),
-               tryton-server (>= 3.0~),
-               tryton-server (<< 3.1~)
+               tryton-server (>= 3.2~),
+               tryton-server (<< 3.3~)
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/gnuhealth/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/gnuhealth/trunk/
@@ -33,28 +34,28 @@
          python-psycopg2,
          python-webdav,
          postgresql,
-         tryton-server (>= 3.0~),
-         tryton-server (<< 3.1~),
-         tryton-modules-account (>= 3.0~),
-         tryton-modules-account (<< 3.1~),
-         tryton-modules-account-invoice (>= 3.0~),
-         tryton-modules-account-invoice (<< 3.1~),
-         tryton-modules-account-product (>= 3.0~),
-         tryton-modules-account-product (<< 3.1~),
-         tryton-modules-calendar (>= 3.0~),
-         tryton-modules-calendar (<< 3.1~),
-         tryton-modules-product (>= 3.0~),
-         tryton-modules-product (<< 3.1~),
-         tryton-modules-country (>= 3.0~),
-         tryton-modules-country (<< 3.1~),
-         tryton-modules-currency (>= 3.0~),
-         tryton-modules-currency (<< 3.1~),
-         tryton-modules-party (>= 3.0~),
-         tryton-modules-party (<< 3.1~),
-         tryton-modules-company (>= 3.0~),
-         tryton-modules-company (<< 3.1~),
+         tryton-server (>= 3.2~),
+         tryton-server (<< 3.3~),
+         tryton-modules-account (>= 3.2~),
+         tryton-modules-account (<< 3.3~),
+         tryton-modules-account-invoice (>= 3.2~),
+         tryton-modules-account-invoice (<< 3.3~),
+         tryton-modules-account-product (>= 3.2~),
+         tryton-modules-account-product (<< 3.3~),
+         tryton-modules-calendar (>= 3.2~),
+         tryton-modules-calendar (<< 3.3~),
+         tryton-modules-product (>= 3.2~),
+         tryton-modules-product (<< 3.3~),
+         tryton-modules-country (>= 3.2~),
+         tryton-modules-country (<< 3.3~),
+         tryton-modules-currency (>= 3.2~),
+         tryton-modules-currency (<< 3.3~),
+         tryton-modules-party (>= 3.2~),
+         tryton-modules-party (<< 3.3~),
+         tryton-modules-company (>= 3.2~),
+         tryton-modules-company (<< 3.3~),
          tryton-modules-stock-lot,
-         tryton-modules-stock-lot (<< 3.1~)
+         tryton-modules-stock-lot (<< 3.3~)
 Recommends: postgresql-client
 Description: Electronic Medical Record and Hospital Information System - Server
  GNU Health is a multi-user, highly scalable, centralized Electronic
@@ -91,8 +92,8 @@
 Architecture: all
 Depends: ${python:Depends},
          ${misc:Depends},
-         tryton-client (>= 3.0~),
-         tryton-client (<< 3.1~)
+         tryton-client (>= 3.2~),
+         tryton-client (<< 3.3~)
 Description: Electronic Medical Record and Hospital Information System - Client
  GNU Health is a multi-user, highly scalable, centralized Electronic
  Medical Record (EMR) and Hospital Information System (HIS) for Tryton,

=== modified file 'gnuhealth_install.sh'
--- gnuhealth_install.sh	2014-01-27 08:27:26 +0000
+++ gnuhealth_install.sh	2014-07-17 21:57:19 +0000
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # GNU Health installer
-# Version for 2.4 series
+# Version for 2.6 series
 
 ##############################################################################
 #
@@ -24,9 +24,9 @@
 #
 ##############################################################################
 
-#
-# Main functions/variables declaration
-#
+#-----------------------------------------------------------------------------
+# Variables declaration
+#-----------------------------------------------------------------------------
 
 # Colors constants
 NONE="$(tput sgr0)"
@@ -35,7 +35,17 @@
 YELLOW="\n$(tput setaf 3)"
 BLUE="\n$(tput setaf 4)"
 
+# Params
 INSTDIR="$PWD"
+GNUHEALTH_INST_DIR="$PWD"
+GNUHEALTH_VERSION=$(cat version)
+TRYTON_VERSION="3.2"
+TRYTON_BASE_URL="http://downloads.tryton.org"
+
+
+#-----------------------------------------------------------------------------
+# Functions
+#-----------------------------------------------------------------------------
 
 message () {
     # $1 : Message
@@ -49,23 +59,23 @@
 
 check_requirements() {
     # WGET command
-    message "[INFO] CHECKING REQUIREMENTS" ${BLUE}
-    message "Looking for wget...." ${BLUE}
+    message "[INFO] Checking requirements" ${BLUE}
+    echo -n " -> Looking for wget... "
 
     if ! type wget 2>/dev/null ; then
         message "[ERROR] wget command not found. Please install it or check your PATH variable" ${RED}
         exit 1
     fi
 
-    # PYTHON version [2.6.x < 3.x]
-    message "Looking for the Python Interpreter command..." ${BLUE}
+    # PYTHON version [2.7.x < 3.x]
+    echo -n " -> Looking for the Python Interpreter command... "
 
     if ! type python 2>/dev/null ; then
         message "[ERROR] Python interpreter not found. Please install it or check your PATH variable." ${RED}
         exit 1
     fi
 
-    local PVERSION=`python -V 2>&1 | grep 2.[6-9].[0-9]`
+    local PVERSION=$(python -V 2>&1 | grep 2.[7-9].[0-9])
 
     if test "${PVERSION}" ; then
         message "[INFO] Found ${PVERSION}" ${BLUE}
@@ -75,14 +85,14 @@
         exit 1
     fi
 
-    # PIP COMMAND
-    message "-> Looking for PIP command..." ${BLUE}
+    # PIP command
+    echo " -> Looking for PIP command..."
 
     # Alternative pip names on Debian/ArchLinux/RedHat based distros:
     local PIP_NAMES="pip pip2 pip-python"
     PIP_NAME=""
     for NAME in ${PIP_NAMES}; do
-        if [[ `which ${NAME} 2>/dev/null` ]]; then
+        if [[ $(which ${NAME} 2>/dev/null) ]]; then
             PIP_NAME=${NAME}
             break
         fi
@@ -92,55 +102,39 @@
         message "[ERROR] PIP command not found. Please install it or check your PATH variable." ${RED}
         exit 1
     fi
+
+    # Check main operating system
+    case "$OSTYPE" in
+        freebsd*)
+            message "[INFO] Running on FreeBSD" ${GREEN}
+            OS="FREEBSD"
+            ;;
+        linux*)
+            message "[INFO] Running on GNU/LINUX" ${GREEN}
+            OS="GNULINUX"
+            # Check for GNU/Linux Distros
+            GNU_LINUX_DISTRO=$(lsb_release -i -s)
+            message "[INFO] GNU / Linux distro: $GNU_LINUX_DISTRO" ${GREEN}
+            ;;
+        *)
+            message "[INFO] Running on Other OS: $OSTYPE" ${YELLOW}
+            ;;
+    esac
+
     message "[INFO] OK." ${GREEN}
 }
 
 
-install_python_dependencies() {
-    local PIP_CMD=$(which $PIP_NAME)
-    local PIP_VERSION="$(${PIP_CMD} --version | awk '{print $2}')"
-
-    # TODO: Change for virtualenv support.
-    local PIP_ARGS="install --user"
-
-    # Python packages
-    local PIP_LXML="lxml==3.2.3"
-    local PIP_RELATORIO="relatorio==0.6.0"
-    local PIP_DATEUTIL="python-dateutil==2.1"
-    local PIP_PSYCOPG2="psycopg2==2.5.1"
-    local PIP_PYTZ="pytz==2013.7"
-    local PIP_LDAP="python-ldap==2.4.13"
-    local PIP_VOBJECT="vobject==0.6.6"
-    local PIP_PYWEBDAV="pywebdav==0.9.8"
-    local PIP_QRCODE="qrcode==4.0.4"
-    local PIP_SIX="six==1.4.1"
-    local PIP_PILLOW="PILLOW==2.3.0"
-    local PIP_CALDAV="caldav==0.1.12"
-    local PIP_POLIB="polib==1.0.3"
-    local PIP_SQL="python-sql==0.2"
-    
-    local PIP_PKGS="$PIP_PYTZ $PIP_LXML $PIP_RELATORIO $PIP_DATEUTIL $PIP_PSYCOPG2 $PIP_LDAP $PIP_VOBJECT $PIP_PYWEBDAV $PIP_QRCODE $PIP_SIX $PIP_PILLOW $PIP_CALDAV $PIP_POLIB $PIP_SQL"
-
-    message "[INFO] Installing python dependencies with pip-${PIP_VERSION} ..." ${YELLOW}
-
-    
-    for PKG in ${PIP_PKGS}; do
-        message " >> ${PKG}" ${BLUE}
-        ${PIP_CMD} ${PIP_ARGS} ${PKG} || exit 1
-        message " >> OK" ${GREEN}
-    done
-}
-
-
 install_directories() {
     #
     # Temporary/staging area.
     #
     message "[INFO] Creating temporary directory..." ${YELLOW}
 
+    # global variable
     TMP_DIR="/tmp/gnuhealth_installer"
 
-    if [ -e ${TMP_DIR} ] ; then
+    if [[ -e ${TMP_DIR} ]]; then
         message "[ERROR] Directory ${TMP_DIR} exists. You need to delete it." ${RED}
         exit 1
     else
@@ -153,32 +147,164 @@
     #
     message "[INFO] Creating destination directories..." ${YELLOW}
 
+    # global variables
     BASEDIR="$HOME/gnuhealth"
     TRYTON_BASEDIR="${BASEDIR}/tryton"
     TRYTOND_DIR="${TRYTON_BASEDIR}/server"
     MODULES_DIR="${TRYTOND_DIR}/modules"
     LOG_DIR="${BASEDIR}/logs"
     ATTACH_DIR="${HOME}/attach"
-    
-    if [ -e ${BASEDIR} ] ; then
+    CUSTOM_MODS_DIR="${MODULES_DIR}/custom"
+
+    # Create GNU Health directories
+    if [[ -e ${BASEDIR} ]]; then
         message "[ERROR] Directory ${BASEDIR} exists. You need to delete it." ${RED}
         exit 1
     else
-        mkdir -p ${MODULES_DIR} ${LOG_DIR} ${ATTACH_DIR} ||  exit 1
+        mkdir -p ${MODULES_DIR} ${LOG_DIR} ${ATTACH_DIR} ${CUSTOM_MODS_DIR} ||  exit 1
     fi
     message "[INFO] OK." ${GREEN}
 }
 
 
+install_python_dependencies() {
+    local PIP_CMD=$(which $PIP_NAME)
+    local PIP_VERSION="$(${PIP_CMD} --version | awk '{print $2}')"
+
+    local PIP_ARGS="install --upgrade --user"
+
+    # Python packages
+    local PIP_LXML="lxml==3.3.5"
+    local PIP_RELATORIO="relatorio==0.6.0"
+    local PIP_DATEUTIL="python-dateutil==2.2"
+    local PIP_PSYCOPG2="psycopg2==2.5.3"
+    local PIP_PYTZ="pytz==2014.4"
+    local PIP_LDAP="python-ldap==2.4.15"
+    local PIP_VOBJECT="vobject==0.6.6"
+    local PIP_PYWEBDAV="PyWebDAV==0.9.8"
+    local PIP_QRCODE="qrcode==5.0.1"
+    local PIP_SIX="six==1.7.3"
+    local PIP_PILLOW="Pillow==2.4.0"
+    local PIP_CALDAV="caldav==0.1.12"
+    local PIP_POLIB="polib==1.0.4"
+    local PIP_SQL="python-sql==0.3"
+
+    # Operating System specific package selection
+    # Skip PYTHON-LDAP installation since it tries to install / compile it system-wide
+    
+    message "[WARNING] Skipping local PYTHON-LDAP installation. Please refer to the Wikibook to install it" ${YELLOW}
+
+    local PIP_PKGS="$PIP_PYTZ $PIP_SIX $PIP_LXML $PIP_RELATORIO $PIP_DATEUTIL $PIP_PSYCOPG2 $PIP_VOBJECT $PIP_PYWEBDAV $PIP_QRCODE $PIP_PILLOW $PIP_CALDAV $PIP_POLIB $PIP_SQL"
+    
+    message "[INFO] Installing python dependencies with pip-${PIP_VERSION} ..." ${YELLOW}
+
+    for PKG in ${PIP_PKGS}; do
+        message " >> ${PKG}" ${BLUE}
+        ${PIP_CMD} ${PIP_ARGS} ${PKG} || exit 1
+        message " >> OK" ${GREEN}
+    done
+}
+
+
+get_url() {
+    # $1 : Module name
+    # return : URL to download
+    echo ${TRYTON_BASE_URL}/${TRYTON_VERSION}/$(wget --quiet -O- ${TRYTON_BASE_URL}/${TRYTON_VERSION} | egrep -o "${1}-${TRYTON_VERSION}.[0-9\.]+.tar.gz" | sort -V | tail -1)
+}
+
+
+install_tryton_modules() {
+    #
+    # Get the lastest revision number for each Tryton module.
+    #
+    message "[INFO] Getting list of lastest Tryton packages..." ${YELLOW}
+
+    local TRYTOND_URL=$(get_url trytond)
+    local TRYTOND_FILE=$(basename ${TRYTOND_URL})
+
+    local TRYTON_MODULES="account account_invoice account_product calendar company country currency party product stock stock_lot"
+
+    local TRYTON_MODULES_FILE=""
+    local TRYTON_MODULES_URL=""
+    local AUX="" MODULE=""
+    for MODULE in ${TRYTON_MODULES}
+    do
+        AUX=$(get_url trytond_${MODULE})
+        TRYTON_MODULES_URL="${TRYTON_MODULES_URL} ${AUX}"
+        TRYTON_MODULES_FILE="${TRYTON_MODULES_FILE} $(basename ${AUX})"
+    done
+
+    message "[INFO] OK." ${GREEN}
+
+    #
+    # Download Tryton packages.
+    #
+    message "[INFO] Changing to temporary directory." ${BLUE}
+    cd ${TMP_DIR} || exit 1
+
+    message "[INFO] Downloading the Tryton server..." ${YELLOW}
+    wget ${TRYTOND_URL} || exit 1
+    message "[INFO] OK." ${GREEN}
+
+    message "[INFO] Downloading Tryton modules..." ${YELLOW}
+    local URL=""
+    for URL in ${TRYTON_MODULES_URL}; do
+        wget ${URL} || exit 1
+    done
+    message "[INFO] OK." ${GREEN}
+
+    #
+    # Uncompress the Tryton packages.
+    #
+    message "[INFO] Uncompressing the Tryton server..." ${YELLOW}
+    cd ${TRYTOND_DIR}
+    tar -xzf ${TMP_DIR}/${TRYTOND_FILE} || exit 1
+    message "[INFO] OK." ${GREEN}
+
+    message "[INFO] Uncompressing the Tryton modules..." ${YELLOW}
+    cd ${MODULES_DIR} || exit 1
+    for MODULE in $(ls ${TMP_DIR}/trytond_*); do
+        tar -xzf ${MODULE} || exit 1
+    done
+    message "[INFO] OK." ${GREEN}
+
+    #
+    # Links to modules.
+    #
+    message "[INFO] Changing directory to <../trytond/modules>." ${BLUE}
+    local TRYTOND_FOLDER=$(basename ${TRYTOND_FILE} .tar.gz)
+    cd "${TRYTOND_DIR}/${TRYTOND_FOLDER}/trytond/modules" || exit 1
+
+    message "[INFO] Linking the Tryton modules..." ${YELLOW}
+    local LNMOD=""
+    for LNMOD in ${TRYTON_MODULES}; do
+        ln -si ${MODULES_DIR}/trytond_${LNMOD}-* ${LNMOD} || exit 1
+    done
+    message "[INFO] OK." ${GREEN}
+
+    message "[INFO] Copying GNU Health modules to the Tryton modules directory..." ${YELLOW}
+    cp -a ${GNUHEALTH_INST_DIR}/health* ${MODULES_DIR} || exit 1
+
+    local EXTRA_FILES="COPYING README version"
+    for FILE in ${EXTRA_FILES}; do
+        cp -a ${GNUHEALTH_INST_DIR}/${FILE} ${BASEDIR} || exit 1
+    done
+
+    ln -si ${MODULES_DIR}/health* .
+    message "[INFO] OK." ${GREEN}
+
+}
+
+
 bash_profile () {
 
     message "[INFO] Creating or Updating the BASH profile for GNU Health" ${BLUE}
 
     cd $INSTDIR
-    
+
     PROFILE="$HOME/.gnuhealthrc"
 
-    if [ -e ${PROFILE} ] ; then
+    if [[ -e ${PROFILE} ]]; then
         # Make a backup copy of the GNU Health BASH profile if it exists
         message "[INFO] GNU Health BASH Profile exists. Making backup to ${PROFILE}.bak ." ${YELLOW}
         cp ${PROFILE} ${PROFILE}.bak || exit 1
@@ -187,145 +313,58 @@
     cp gnuhealthrc ${PROFILE} ||  exit 1
 
     # Load .gnuhealthrc from .bash_profile . If .bash_profile does not exist, create it.
-    if [ -e $HOME/.bash_profile ] ; then
+    if [[ -e $HOME/.bash_profile ]]; then
         grep --silent "source ${PROFILE}" $HOME/.bash_profile || echo "[[ -f ${PROFILE} ]] && source ${PROFILE}" >> $HOME/.bash_profile
     else
         echo "[[ -f ${PROFILE} ]] && source ${PROFILE}" >> $HOME/.bash_profile
     fi
-   
-}
-
-#
-# (0) Start.
-#
-GNUHEALTH_INST_DIR=$PWD
-GNUHEALTH_VERSION=`cat version`
-
-message "[INFO] Starting GNU Health ${GNUHEALTH_VERSION} installation..." ${BLUE}
-
-#
-# (1) Check requirements.
-#
-check_requirements
-
-#
-# (2) Install directories.
-#
-install_directories
-
-
-#
-# (3) Download settings.
-#
-TRYTON_VERSION="3.0"
-TRYTON_BASE_URL="http://downloads.tryton.org"
-
-get_url() {
-    # $1 : Module name
-    # return : URL to download
-
-    echo ${TRYTON_BASE_URL}/${TRYTON_VERSION}/$(wget --quiet -O- ${TRYTON_BASE_URL}/${TRYTON_VERSION} | egrep -o "${1}-${TRYTON_VERSION}.[0-9\.]+.tar.gz" | sort -V | tail -1)
-}
-
-#
-# Get the lastest revision number for each Tryton module.
-#
-message "[INFO] Getting list of lastest Tryton packages..." ${YELLOW}
-
-TRYTOND_URL=$(get_url trytond)
-TRYTOND_FILE=$(basename ${TRYTOND_URL})
-
-TRYTON_MODULES="account account_invoice account_product calendar company country currency party product stock stock_lot"
-
-TRYTON_MODULES_FILE=""
-TRYTON_MODULES_URL=""
-for MODULE in ${TRYTON_MODULES}
-do
-    AUX=$(get_url trytond_${MODULE})
-    TRYTON_MODULES_URL="${TRYTON_MODULES_URL} ${AUX}"
-    TRYTON_MODULES_FILE="${TRYTON_MODULES_FILE} $(basename ${AUX})"
-done
-
-message "[INFO] OK." ${GREEN}
-
-
-#
-# (4) Install Python dependencies.
-#
-install_python_dependencies
-
-
-#
-# (5) Download Tryton packages.
-#
-message "[INFO] Changing to temporary directory." ${BLUE}
-cd ${TMP_DIR} || exit 1
-
-message "[INFO] Downloading the Tryton server..." ${YELLOW}
-wget ${TRYTOND_URL} || exit 1
-message "[INFO] OK." ${GREEN}
-
-message "[INFO] Downloading Tryton modules..." ${YELLOW}
-for URL in ${TRYTON_MODULES_URL}; do
-    wget ${URL} || exit 1
-done
-message "[INFO] OK." ${GREEN}
-
-
-#
-# (6) Uncompress the Tryton packages.
-#
-message "[INFO] Uncompressing the Tryton server..." ${YELLOW}
-cd ${TRYTOND_DIR}
-tar -xzf ${TMP_DIR}/${TRYTOND_FILE} || exit 1
-message "[INFO] OK." ${GREEN}
-
-message "[INFO] Uncompressing the Tryton modules..." ${YELLOW}
-cd ${MODULES_DIR} || exit 1
-for MODULE in `ls ${TMP_DIR}/trytond_*`; do
-    tar -xzf ${MODULE} || exit 1
-done
-message "[INFO] OK." ${GREEN}
-
-
-#
-# (7) Links to modules.
-#
-message "[INFO] Changing directory to <../trytond/modules>." ${BLUE}
-TRYTOND_FOLDER=$(basename ${TRYTOND_FILE} .tar.gz)
-cd "${TRYTOND_DIR}/${TRYTOND_FOLDER}/trytond/modules" || exit 1
-
-message "[INFO] Linking the Tryton modules..." ${YELLOW}
-for LNMOD in ${TRYTON_MODULES}; do
-    ln -si ${MODULES_DIR}/trytond_${LNMOD}-* ${LNMOD} || exit 1
-done
-message "[INFO] OK." ${GREEN}
-
-message "[INFO] Copying GNU Health modules to the Tryton modules directory..." ${YELLOW}
-cp -a ${GNUHEALTH_INST_DIR}/health* ${MODULES_DIR} || exit 1
-
-EXTRA_FILES="COPYING README version"
-for FILE in ${EXTRA_FILES}; do
-    cp -a ${GNUHEALTH_INST_DIR}/${FILE} ${BASEDIR} || exit 1
-done
-
-ln -si ${MODULES_DIR}/health* .
-message "[INFO] OK." ${GREEN}
-
-
-#
-# (8) BASH Profile
-#
-bash_profile
-
-
-#
-# Clean.
-#
-message "[INFO] Cleaning Up..." ${YELLOW}
-rm -rf ${TMP_DIR} || exit 1
-
-message "[INFO] OK." ${GREEN}
-
-
-message "[INFO] Installed successfully in ${BASEDIR}." ${BLUE}
+
+    # Include .gnuhealthrc in .bashrc for non-login shells
+    if [[ -e $HOME/.bashrc ]]; then
+        grep --silent "source ${PROFILE}" $HOME/.bashrc || echo "[[ -f ${PROFILE} ]] && source ${PROFILE}" >> $HOME/.bashrc
+    else
+        echo "[[ -f ${PROFILE} ]] && source ${PROFILE}" >> $HOME/.bashrc
+    fi
+
+}
+
+
+cleanup() {
+    message "[INFO] Cleaning Up..." ${YELLOW}
+    rm -rf ${TMP_DIR} || exit 1
+
+    message "[INFO] OK." ${GREEN}
+}
+
+
+#-----------------------------------------------------------------------------
+# Main
+#-----------------------------------------------------------------------------
+
+main() {
+    message "[INFO] Starting GNU Health ${GNUHEALTH_VERSION} installation..." ${BLUE}
+
+    # (1) Check requirements.
+    check_requirements
+
+    # (2) Install directories.
+    install_directories
+
+    # (3) Install Python dependencies.
+    install_python_dependencies
+
+    # (4) Download Tryton modules.
+    install_tryton_modules
+
+    # (5) BASH Profile
+    bash_profile
+
+    # (6) Clean
+    cleanup
+
+    message "[INFO] Installed successfully in ${BASEDIR}." ${BLUE}
+}
+
+
+main "$@"
+

=== modified file 'gnuhealthrc'
--- gnuhealthrc	2014-01-27 08:27:26 +0000
+++ gnuhealthrc	2014-07-17 21:57:19 +0000
@@ -9,19 +9,29 @@
     echo "$EDITOR not found" 
 fi
 
+# Get the most current Tryton server version
+# It should only be one trytond, but just in case..
+TRYTOND=`ls -1d $HOME/gnuhealth/tryton/server/trytond-* | egrep -o "trytond-[0-9\.]+.[0-9\.]+.[0-9\.]+" | sort -V | tail -1`
+
+# Add PYTHONPATH environment variable 
+export PYTHONPATH=${HOME}/gnuhealth/tryton/server/${TRYTOND}
 
 # Aliases
 alias cdlogs='cd $HOME/gnuhealth/logs'
-alias cdexe='cd $HOME/gnuhealth/tryton/server/trytond-*/bin'
-alias cdconf='cd $HOME/gnuhealth/tryton/server/trytond-*/etc'
+alias cdexe='cd $HOME/gnuhealth/tryton/server/${TRYTOND}/bin'
+alias cdconf='cd $HOME/gnuhealth/tryton/server/${TRYTOND}/etc'
 alias cdmods='cd $HOME/gnuhealth/tryton/server/modules'
-alias editconf='${EDITOR} $HOME/gnuhealth/tryton/server/trytond-*/etc/trytond.conf'
+alias editconf='${EDITOR} $HOME/gnuhealth/tryton/server/${TRYTOND}/etc/trytond.conf'
 
 alias rm='rm -i'
 alias mv='mv -i'
 alias cp='cp -i'
 
-alias ls='ls --color=auto'
+#GNU HEALTH version
+export GNUHEALTH_VERSION=`cat $HOME/gnuhealth/version`
+
+# Commented to be compatible with FreeBSD
+# alias ls='ls --color=auto'
 
 #Prompt
 

=== modified file 'health/__init__.py'
--- health/__init__.py	2014-01-27 08:27:26 +0000
+++ health/__init__.py	2014-07-17 21:57:19 +0000
@@ -27,21 +27,32 @@
 
 def register():
     Pool.register(
+        OperationalArea,
+        OperationalSector,
+        DomiciliaryUnit,
+        Occupation,
+        Ethnicity,
+        PartyPatient,
+        PartyAddress,
         DrugDoseUnits,
         MedicationFrequency,
         DrugForm,
         DrugRoute,
-        Occupation,
-        Ethnicity,
         MedicalSpecialty,
+        HealthInstitution,
+        HealthInstitutionSpecialties,
+        HealthInstitutionOperationalSector,
+        HealthInstitutionO2M,
+        HospitalBuilding,
+        HospitalUnit,
+        HospitalOR,
+        HospitalWard,
+        HospitalBed,
         HealthProfessional,
         HealthProfessionalSpecialties,        
         PhysicianSP,
-        OperationalArea,
-        OperationalSector,
         Family,
         FamilyMember,
-        DomiciliaryUnit,
         MedicamentCategory,
         Medicament,
         PathologyCategory,
@@ -52,8 +63,6 @@
         InsurancePlan,
         Insurance,
         AlternativePersonID,
-        PartyPatient,
-        PartyAddress,
         ProductCategory,
         ProductTemplate,
         Product,
@@ -72,11 +81,6 @@
         SecondaryCondition,
         DiagnosticHypothesis,
         SignsAndSymptoms,
-        HospitalBuilding,
-        HospitalUnit,
-        HospitalOR,
-        HospitalWard,
-        HospitalBed,
         module='health', type_='model')
     Pool.register(
         OpenAppointmentReport,

=== modified file 'health/data/ethnic_groups.xml'
--- health/data/ethnic_groups.xml	2013-03-06 21:29:52 +0000
+++ health/data/ethnic_groups.xml	2014-07-17 21:57:19 +0000
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tryton>
-    <data skiptest="1" noupdate="1">
+    <data skiptest="1" noupdate="0">
 
         <record model="gnuhealth.ethnicity" id="eth1">
             <field name="name">Black</field>
-            <field name="code">1</field>
+            <field name="code">BLACK</field>
         </record>
         <record model="gnuhealth.ethnicity" id="eth2">
             <field name="name">Asian</field>
-            <field name="code">2</field>
+            <field name="code">ASIAN</field>
         </record>
         <record model="gnuhealth.ethnicity" id="eth3">
             <field name="name">White</field>
-            <field name="code">3</field>
+            <field name="code">WHITE</field>
         </record>
         <record model="gnuhealth.ethnicity" id="eth4">
             <field name="name">Middle-East</field>
-            <field name="code">4</field>
+            <field name="code">MIDEAST</field>
         </record>
         <record model="gnuhealth.ethnicity" id="eth5">
             <field name="name">Hispanic</field>
-            <field name="code">5</field>
+            <field name="code">HISPANIC</field>
         </record>
         <record model="gnuhealth.ethnicity" id="eth6">
             <field name="name">African American</field>
-            <field name="code">6</field>
+            <field name="code">AFRICANAMERICAN</field>
         </record>
         <record model="gnuhealth.ethnicity" id="eth7">
             <field name="name">Indian American</field>
-            <field name="code">7</field>
+            <field name="code">INDIANAMERICAN</field>
         </record>
 
     </data>

=== modified file 'health/data/health_specialties.xml'
--- health/data/health_specialties.xml	2013-03-06 21:29:52 +0000
+++ health/data/health_specialties.xml	2014-07-17 21:57:19 +0000
@@ -1,238 +1,238 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tryton>
-    <data skiptest="1" noupdate="1">
+    <data noupdate="0">
 
         <record model="gnuhealth.specialty" id="2">
             <field name="name">Anatomy</field>
-            <field name="code"></field>
+            <field name="code">ANATOMY</field>
         </record>
         <record model="gnuhealth.specialty" id="3">
             <field name="name">Andrology</field>
-            <field name="code"></field>
+            <field name="code">ANDROLOGY</field>
         </record>
         <record model="gnuhealth.specialty" id="4">
             <field name="name">Alternative Medicine</field>
-            <field name="code"></field>
+            <field name="code">ALTERNATIVE</field>
         </record>
         <record model="gnuhealth.specialty" id="5">
             <field name="name">Anesthesiology</field>
-            <field name="code">AN, PAN</field>
+            <field name="code">ANESTHESIO</field>
         </record>
         <record model="gnuhealth.specialty" id="6">
             <field name="name">Biochemistry</field>
-            <field name="code"></field>
+            <field name="code">BIOCHEM</field>
         </record>
         <record model="gnuhealth.specialty" id="7">
             <field name="name">Cardiology</field>
-            <field name="code"></field>
+            <field name="code">CARDIO</field>
         </record>
         <record model="gnuhealth.specialty" id="8">
             <field name="name">Cardiovascular surgery</field>
-            <field name="code"></field>
+            <field name="code">CARDIOSURG</field>
         </record>
         <record model="gnuhealth.specialty" id="9">
             <field name="name">Clinical laboratory sciences</field>
-            <field name="code"></field>
+            <field name="code">LAB</field>
         </record>
         <record model="gnuhealth.specialty" id="10">
             <field name="name">Clinical Neurophysiology</field>
-            <field name="code"></field>
+            <field name="code">NEUROPHYSIO</field>
         </record>
         <record model="gnuhealth.specialty" id="11">
             <field name="name">Dermatology</field>
-            <field name="code">D, DS</field>
+            <field name="code">DS</field>
         </record>
         <record model="gnuhealth.specialty" id="12">
-            <field name="name">Dietetics</field>
-            <field name="code"></field>
+            <field name="name">Nutrition</field>
+            <field name="code">NUTRITION</field>
         </record>
         <record model="gnuhealth.specialty" id="13">
             <field name="name">Embryology</field>
-            <field name="code"></field>
+            <field name="code">EMBRYO</field>
         </record>
         <record model="gnuhealth.specialty" id="14">
             <field name="name">Emergency medicine</field>
-            <field name="code">EM</field>
+            <field name="code">EMERGENCY</field>
         </record>
         <record model="gnuhealth.specialty" id="15">
             <field name="name">Endocrinology</field>
-            <field name="code"></field>
+            <field name="code">ENDOCRINO</field>
         </record>
         <record model="gnuhealth.specialty" id="16">
             <field name="name">Family Medicine</field>
-            <field name="code">FM</field>
+            <field name="code">FAMILY</field>
         </record>
         <record model="gnuhealth.specialty" id="17">
             <field name="name">Forensic Medicine</field>
-            <field name="code"></field>
+            <field name="code">FORENSIC</field>
         </record>
         <record model="gnuhealth.specialty" id="18">
             <field name="name">Gastroenterology</field>
-            <field name="code">GI</field>
+            <field name="code">GASTRO</field>
         </record>
         <record model="gnuhealth.specialty" id="19">
             <field name="name">General surgery</field>
-            <field name="code">GS</field>
+            <field name="code">GENERALSURG</field>
         </record>
         <record model="gnuhealth.specialty" id="20">
             <field name="name">Genetics</field>
-            <field name="code"></field>
+            <field name="code">GENETICS</field>
         </record>
         <record model="gnuhealth.specialty" id="21">
             <field name="name">Geriatrics</field>
-            <field name="code">IMG</field>
+            <field name="code">GERIATRICS</field>
         </record>
         <record model="gnuhealth.specialty" id="22">
-            <field name="name">Gynaecology</field>
-            <field name="code"></field>
+            <field name="name">Gynecology</field>
+            <field name="code">GYN</field>
         </record>
         <record model="gnuhealth.specialty" id="23">
             <field name="name">Hematology</field>
-            <field name="code"></field>
+            <field name="code">HEMATO</field>
         </record>
         <record model="gnuhealth.specialty" id="24">
             <field name="name">Hepatology</field>
-            <field name="code"></field>
+            <field name="code">HEPATO</field>
         </record>
         <record model="gnuhealth.specialty" id="25">
             <field name="name">Histology</field>
-            <field name="code"></field>
+            <field name="code">HISTOLOGY</field>
         </record>
         <record model="gnuhealth.specialty" id="26">
             <field name="name">Immunology</field>
-            <field name="code"></field>
+            <field name="code">IMMUNO</field>
         </record>
         <record model="gnuhealth.specialty" id="27">
             <field name="name">Infectious disease</field>
-            <field name="code">ID</field>
+            <field name="code">INFECTIOUS</field>
         </record>
         <record model="gnuhealth.specialty" id="28">
             <field name="name">Intensive care medicine</field>
-            <field name="code"></field>
+            <field name="code">INTENSIVECARE</field>
         </record>
         <record model="gnuhealth.specialty" id="29">
             <field name="name">Maxillofacial surgery</field>
-            <field name="code">Maxfacs, OMFS</field>
+            <field name="code">MAXILLOFACIALSURG</field>
         </record>
         <record model="gnuhealth.specialty" id="30">
             <field name="name">Nephrology</field>
-            <field name="code"></field>
+            <field name="code">NEPHRO</field>
         </record>
         <record model="gnuhealth.specialty" id="31">
             <field name="name">Neurology</field>
-            <field name="code">N</field>
+            <field name="code">NEURO</field>
         </record>
         <record model="gnuhealth.specialty" id="32">
             <field name="name">Neurosurgery</field>
-            <field name="code">NS</field>
+            <field name="code">NEUROSURG</field>
         </record>
         <record model="gnuhealth.specialty" id="33">
             <field name="name">Nursing</field>
-            <field name="code"></field>
+            <field name="code">NURSING</field>
         </record>
         <record model="gnuhealth.specialty" id="34">
             <field name="name">Obstetrics and gynecology</field>
-            <field name="code">OB/GYN</field>
+            <field name="code">OBGYN</field>
         </record>
         <record model="gnuhealth.specialty" id="35">
             <field name="name">Oncology</field>
-            <field name="code">ON</field>
+            <field name="code">ONCO</field>
         </record>
         <record model="gnuhealth.specialty" id="36">
             <field name="name">Ophthalmology</field>
-            <field name="code">OPH</field>
+            <field name="code">OPHTALMO</field>
         </record>
         <record model="gnuhealth.specialty" id="37">
             <field name="name">Orthopedic surgery</field>
-            <field name="code">ORS</field>
+            <field name="code">ORTHOSURG</field>
         </record>
         <record model="gnuhealth.specialty" id="38">
-            <field name="name">Otolaryngology, or ENT</field>
-            <field name="code">ORL, ENT</field>
+            <field name="name">Otolaryngology - ENT</field>
+            <field name="code">ENT</field>
         </record>
         <record model="gnuhealth.specialty" id="39">
             <field name="name">Palliative care</field>
-            <field name="code">PLM</field>
+            <field name="code">PALLIATIVE</field>
         </record>
         <record model="gnuhealth.specialty" id="40">
             <field name="name">Pathology</field>
-            <field name="code">PTH</field>
+            <field name="code">PATHOLOGY</field>
         </record>
         <record model="gnuhealth.specialty" id="41">
             <field name="name">Pediatrics</field>
-            <field name="code">PD</field>
+            <field name="code">PEDIATRICS</field>
         </record>
         <record model="gnuhealth.specialty" id="42">
             <field name="name">Pediatric surgery</field>
-            <field name="code"></field>
+            <field name="code">PEDIATRICSURG</field>
         </record>
         <record model="gnuhealth.specialty" id="43">
             <field name="name">Pharmacology</field>
-            <field name="code"></field>
+            <field name="code">PHARMA</field>
         </record>
         <record model="gnuhealth.specialty" id="44">
             <field name="name">Physical medicine and rehabilitation</field>
-            <field name="code">PM&amp;R</field>
+            <field name="code">PHYSICALREHAB</field>
         </record>
         <record model="gnuhealth.specialty" id="45">
             <field name="name">Plastic surgery</field>
-            <field name="code">PS</field>
+            <field name="code">PLASTICSURG</field>
         </record>
         <record model="gnuhealth.specialty" id="46">
             <field name="name">Proctology</field>
-            <field name="code">PRO</field>
+            <field name="code">PROCTO</field>
         </record>
         <record model="gnuhealth.specialty" id="47">
             <field name="name">Psychiatry</field>
-            <field name="code">P</field>
+            <field name="code">PSYCHIATRY</field>
         </record>
         <record model="gnuhealth.specialty" id="48">
             <field name="name">Pulmonology</field>
-            <field name="code"></field>
+            <field name="code">PULMO</field>
         </record>
         <record model="gnuhealth.specialty" id="49">
             <field name="name">Radiology</field>
-            <field name="code">R, DR</field>
+            <field name="code">RADIO</field>
         </record>
         <record model="gnuhealth.specialty" id="50">
             <field name="name">Rheumatology</field>
-            <field name="code">RHU</field>
+            <field name="code">RHEUMATO</field>
         </record>
         <record model="gnuhealth.specialty" id="51">
             <field name="name">Stomatology</field>
-            <field name="code"></field>
+            <field name="code">STOMATO</field>
         </record>
         <record model="gnuhealth.specialty" id="52">
             <field name="name">Surgical oncology</field>
-            <field name="code">SO</field>
+            <field name="code">SURGICALONCO</field>
         </record>
         <record model="gnuhealth.specialty" id="53">
             <field name="name">Thoracic surgery</field>
-            <field name="code">TS</field>
+            <field name="code">THORACICSURG</field>
         </record>
         <record model="gnuhealth.specialty" id="54">
             <field name="name">Toxicology</field>
-            <field name="code"></field>
+            <field name="code">TOXICO</field>
         </record>
         <record model="gnuhealth.specialty" id="55">
             <field name="name">Transplant surgery</field>
-            <field name="code">TTS</field>
+            <field name="code">TRANSPLANTSURG</field>
         </record>
         <record model="gnuhealth.specialty" id="56">
             <field name="name">Trauma surgery</field>
-            <field name="code">TRS</field>
-        </record>
+            <field name="code">TRAUMASURG</field>
+        </record>        
         <record model="gnuhealth.specialty" id="57">
             <field name="name">Urgent Care Medicine</field>
-            <field name="code">UCM</field>
+            <field name="code">URGENTCARE</field>
         </record>
         <record model="gnuhealth.specialty" id="58">
             <field name="name">Urology</field>
-            <field name="code">U</field>
+            <field name="code">UROLOGY</field>
         </record>
         <record model="gnuhealth.specialty" id="59">
             <field name="name">Vascular surgery</field>
-            <field name="code">VS</field>
+            <field name="code">VASCULARSURG</field>
         </record>
 
         <record model="gnuhealth.specialty" id="60">
@@ -240,5 +240,75 @@
             <field name="code">GP</field>
         </record>
 
+        <record model="gnuhealth.specialty" id="61">
+            <field name="name">Internal Medicine</field>
+            <field name="code">INTERNAL</field>
+        </record>
+
+        <record model="gnuhealth.specialty" id="62">
+            <field name="name">Speech Therapy / Phonoaudiology</field>
+            <field name="code">PHONO</field>
+        </record>
+
+        <record model="gnuhealth.specialty" id="63">
+            <field name="name">Psychology</field>
+            <field name="code">PSYCHO</field>
+        </record>
+
+        <record model="gnuhealth.specialty" id="64">
+            <field name="name">Pain Medicine</field>
+            <field name="code">PAIN</field>
+        </record>
+
+        <record model="gnuhealth.specialty" id="65">
+            <field name="name">Integrative Medicine</field>
+            <field name="code">INTEGRATIVE</field>
+        </record>
+
+        <record model="gnuhealth.specialty" id="66">
+            <field name="name">Neonatology</field>
+            <field name="code">NEONATO</field>
+        </record>
+
+        <record model="gnuhealth.specialty" id="67">
+            <field name="name">Cardiothoracic Surgery</field>
+            <field name="code">CARDIOTHORAXSURG</field>
+        </record>
+
+        <record model="gnuhealth.specialty" id="68">
+            <field name="name">Obstetrics</field>
+            <field name="code">OBS</field>
+        </record>
+
+        <record model="gnuhealth.specialty" id="70">
+            <field name="name">Primary Care</field>
+            <field name="code">PRIMARYCARE</field>
+        </record>
+
+        <record model="gnuhealth.specialty" id="71">
+            <field name="name">Family Planning (Primary Care)</field>
+            <field name="code">PRIMARY-FAMILYPLANNING</field>
+        </record>
+
+        <record model="gnuhealth.specialty" id="72">
+            <field name="name">Social Services</field>
+            <field name="code">SOCIALSERVICE</field>
+        </record>
+
+        <record model="gnuhealth.specialty" id="73">
+            <field name="name">Oral Medicine (Primary Care)</field>
+            <field name="code">PRIMARY-ORAL</field>
+        </record>
+
+        <record model="gnuhealth.specialty" id="74">
+            <field name="name">Child Health (Primary Care)</field>
+            <field name="code">PRIMARY-CHILD</field>
+        </record>
+
+        <record model="gnuhealth.specialty" id="75">
+            <field name="name">Woman Health (Primary Care)</field>
+            <field name="code">PRIMARY-WOMAN</field>
+        </record>
+
     </data>
 </tryton>

=== modified file 'health/health.py'
--- health/health.py	2014-01-27 08:27:26 +0000
+++ health/health.py	2014-07-17 21:57:19 +0000
@@ -27,29 +27,380 @@
 from trytond.wizard import Wizard, StateAction, StateView, Button
 from trytond.transaction import Transaction
 from trytond import backend
-from trytond.pyson import Eval, Not, Bool, PYSONEncoder, Equal
+from trytond.pyson import Eval, Not, Bool, PYSONEncoder, Equal, And
 from trytond.pool import Pool
 from trytond.tools import datetime_strftime
 
 
 __all__ = [
-    'DrugDoseUnits', 'MedicationFrequency', 'DrugForm', 'DrugRoute',
-    'Occupation', 'Ethnicity', 'MedicalSpecialty', 'HealthProfessional',
-    'HealthProfessionalSpecialties', 'PhysicianSP', 'OperationalArea',
-    'OperationalSector', 'Family', 'FamilyMember', 'DomiciliaryUnit',
-    'MedicamentCategory', 'Medicament', 'PathologyCategory',
-    'PathologyGroup', 'Pathology', 'DiseaseMembers', 'ProcedureCode',
+    'OperationalArea', 'OperationalSector', 'Occupation', 'Ethnicity',
+    'DomiciliaryUnit','PartyPatient', 'PartyAddress','DrugDoseUnits',
+    'MedicationFrequency', 'DrugForm', 'DrugRoute', 'MedicalSpecialty',
+    'HealthInstitution', 'HealthInstitutionSpecialties',
+    'HealthInstitutionOperationalSector','HealthInstitutionO2M', 
+    'HospitalBuilding', 'HospitalUnit', 'HospitalOR', 'HospitalWard',
+    'HospitalBed', 'HealthProfessional',
+    'HealthProfessionalSpecialties', 'PhysicianSP', 'Family',
+    'FamilyMember', 'MedicamentCategory',
+    'Medicament', 'PathologyCategory', 'PathologyGroup',
+    'Pathology', 'DiseaseMembers', 'ProcedureCode',
     'InsurancePlan', 'Insurance', 'AlternativePersonID',
-    'PartyPatient', 'PartyAddress', 'ProductCategory',
-    'ProductTemplate', 'Product', 'GnuHealthSequences', 'PatientData',
-    'PatientDiseaseInfo', 'Appointment', 'AppointmentReport',
+    'ProductCategory', 'ProductTemplate', 'Product',
+    'GnuHealthSequences', 'PatientData', 'PatientDiseaseInfo',
+    'Appointment', 'AppointmentReport',
     'OpenAppointmentReportStart', 'OpenAppointmentReport',
     'PatientMedication', 'PatientVaccination',
     'PatientPrescriptionOrder', 'PrescriptionLine', 'PatientEvaluation',
     'Directions', 'SecondaryCondition', 'DiagnosticHypothesis',
-    'SignsAndSymptoms', 'HospitalBuilding', 'HospitalUnit',
-    'HospitalOR', 'HospitalWard', 'HospitalBed']
-
+    'SignsAndSymptoms']
+
+
+class DomiciliaryUnit(ModelSQL, ModelView):
+    'Domiciliary Unit'
+    __name__ = 'gnuhealth.du'
+
+    name = fields.Char('Code', required=True)
+    desc = fields.Char('Desc')
+    address_street = fields.Char('Street')
+    address_street_number = fields.Integer('Number')
+    address_street_bis = fields.Char('Apartment')
+
+    address_district = fields.Char(
+        'District', help="Neighborhood, Village, Barrio....")
+
+    address_municipality = fields.Char(
+        'Municipality', help="Municipality, Township, county ..")
+    address_city = fields.Char('City')
+    address_zip = fields.Char('Zip Code')
+    address_country = fields.Many2One(
+        'country.country', 'Country', help='Country')
+
+    address_subdivision = fields.Many2One(
+        'country.subdivision', 'Province',
+        domain=[('country', '=', Eval('address_country'))],
+        depends=['address_country'])
+
+    operational_sector = fields.Many2One(
+        'gnuhealth.operational_sector', 'Operational Sector')
+
+    picture = fields.Binary('Picture')
+
+    latitude = fields.Numeric('Latidude', digits=(3, 14))
+    longitude = fields.Numeric('Longitude', digits=(4, 14))
+
+    urladdr = fields.Char(
+        'OSM Map',
+        help="Locates the DU on the Open Street Map by default")
+
+    # Infrastructure
+
+    dwelling = fields.Selection([
+        (None, ''),
+        ('single_house', 'Single / Detached House'),
+        ('apartment', 'Apartment'),
+        ('townhouse', 'Townhouse'),
+        ('factory', 'Factory'),
+        ('building', 'Building'),
+        ('mobilehome', 'Mobile House'),
+        ], 'Type', sort=False)
+
+    materials = fields.Selection([
+        (None, ''),
+        ('concrete', 'Concrete'),
+        ('adobe', 'Adobe'),
+        ('wood', 'Wood'),
+        ('mud', 'Mud / Straw'),
+        ('stone', 'Stone'),
+        ], 'Material', sort=False)
+
+    roof_type = fields.Selection([
+        (None, ''),
+        ('concrete', 'Concrete'),
+        ('adobe', 'Adobe'),
+        ('wood', 'Wood'),
+        ('mud', 'Mud'),
+        ('thatch', 'Thatched'),
+        ('stone', 'Stone'),
+        ], 'Roof', sort=False)
+
+    total_surface = fields.Integer('Surface', help="Surface in sq. meters")
+    bedrooms = fields.Integer('Bedrooms')
+    bathrooms = fields.Integer('Bathrooms')
+
+    housing = fields.Selection([
+        (None, ''),
+        ('0', 'Shanty, deficient sanitary conditions'),
+        ('1', 'Small, crowded but with good sanitary conditions'),
+        ('2', 'Comfortable and good sanitary conditions'),
+        ('3', 'Roomy and excellent sanitary conditions'),
+        ('4', 'Luxury and excellent sanitary conditions'),
+        ], 'Conditions',
+        help="Housing and sanitary living conditions", sort=False)
+
+    sewers = fields.Boolean('Sanitary Sewers')
+    water = fields.Boolean('Running Water')
+    trash = fields.Boolean('Trash recollection')
+    electricity = fields.Boolean('Electrical supply')
+    gas = fields.Boolean('Gas supply')
+    telephone = fields.Boolean('Telephone')
+    television = fields.Boolean('Television')
+    internet = fields.Boolean('Internet')
+
+    members = fields.One2Many('party.party', 'du', 'Members', readonly=True)
+
+    @fields.depends('latitude', 'longitude', 'address_street',
+        'address_street_number', 'address_district', 'address_municipality',
+        'address_city', 'address_zip', 'address_subdivision',
+        'address_country')
+    def on_change_with_urladdr(self):
+        # Generates the URL to be used in OpenStreetMap
+        # The address will be mapped to the URL in the following way
+        # If the latitud and longitude of the DU are given, then those
+        # parameters will be used.
+        # Otherwise, it will try to find the address by the
+        # Street, municipality, city, postalcode, state and country.
+
+        if (self.latitude and self.longitude):
+            ret_url = 'http://openstreetmap.org/?mlat=' + \
+                str(self.latitude) + '&mlon=' + str(self.longitude)
+
+        else:
+            state = ''
+            country = ''
+            street_number = str(self.address_street_number).encode('utf-8') \
+                or ''
+            street = (self.address_street).encode('utf-8') or ''
+            municipality = (self.address_municipality).encode('utf-8') or ''
+            city = (self.address_city).encode('utf-8') or ''
+            if (self.address_subdivision):
+                state = (self.address_subdivision.name).encode('utf-8') or ''
+            postalcode = (self.address_zip).encode('utf-8') or ''
+
+            if (self.address_country):
+                country = (self.address_country.code).encode('utf-8') or ''
+
+            ret_url = 'http://nominatim.openstreetmap.org/search?' + \
+                'street=' + street_number + ' ' + \
+                street + '&county=' + municipality \
+                + '&city=' + city + '&state=' + state \
+                + '&postalcode=' + postalcode + '&country=' + country
+
+        return ret_url
+
+    @classmethod
+    def __setup__(cls):
+        super(DomiciliaryUnit, cls).__setup__()
+        cls._sql_constraints = [
+            ('name_uniq', 'UNIQUE(name)',
+                'The Domiciliary Unit must be unique !'),
+        ]
+
+class PartyPatient (ModelSQL, ModelView):
+    'Party'
+    __name__ = 'party.party'
+
+    activation_date = fields.Date(
+        'Activation date', help='Date of activation of the party')
+
+    alias = fields.Char('Alias', help='Common name that the Party is reffered')
+    ref = fields.Char(
+        'PUID',
+        help='Person Unique Identifier',
+        states={'invisible': Not(Bool(Eval('is_person')))})
+
+    unidentified = fields.Boolean(
+        'Unidentified',
+        help='Patient is currently unidentified',
+        states={'invisible': Not(Bool(Eval('is_person')))})
+
+    is_person = fields.Boolean(
+        'Person',
+        help='Check if the party is a person.')
+
+    is_patient = fields.Boolean(
+        'Patient',
+        states={'invisible': Not(Bool(Eval('is_person')))},
+        help='Check if the party is a patient')
+
+    is_healthprof = fields.Boolean(
+        'Health Prof',
+        states={'invisible': Not(Bool(Eval('is_person')))},
+        help='Check if the party is a health professional')
+
+    is_institution = fields.Boolean(
+        'Institution', help='Check if the party is a Health Care Institution')
+    is_insurance_company = fields.Boolean(
+        'Insurance Company', help='Check if the party is an Insurance Company')
+    is_pharmacy = fields.Boolean(
+        'Pharmacy', help='Check if the party is a Pharmacy')
+
+    lastname = fields.Char('Last Name', help='Last Name',
+        states={'invisible': Not(Bool(Eval('is_person')))})
+    dob = fields.Date('DoB', help='Date of Birth')
+
+    sex = fields.Selection([
+        (None, ''),
+        ('m', 'Male'),
+        ('f', 'Female'),
+        ], 'Sex', states={'required': Bool(Eval('is_person'))})
+
+    photo = fields.Binary('Picture')
+    ethnic_group = fields.Many2One('gnuhealth.ethnicity', 'Ethnic group')
+
+    marital_status = fields.Selection([
+        (None, ''),
+        ('s', 'Single'),
+        ('m', 'Married'),
+        ('c', 'Concubinage'),
+        ('w', 'Widowed'),
+        ('d', 'Divorced'),
+        ('x', 'Separated'),
+        ], 'Marital Status', sort=False)
+
+    citizenship = fields.Many2One(
+        'country.country', 'Citizenship', help='Country of Citizenship')
+    residence = fields.Many2One(
+        'country.country', 'Country of Residence', help='Country of Residence')
+    alternative_identification = fields.Boolean(
+        'Alternative IDs', help='Other types of '
+        'identification, not the official PUID . '
+        'Examples : Passport, foreign ID,..')
+
+    alternative_ids = fields.One2Many(
+        'gnuhealth.person_alternative_identification',
+        'name', 'Alternative IDs',
+        states={'invisible': Not(Bool(Eval('alternative_identification')))})
+
+    insurance = fields.One2Many('gnuhealth.insurance', 'name', 'Insurances',
+        help="Insurance Plans associated to this party")
+
+    internal_user = fields.Many2One(
+        'res.user', 'Internal User',
+        help='In GNU Health is the user (doctor, nurse, ...) that logins.When the'
+        ' party is a health professional, it will be the user'
+        ' that maps the health professional party. It must be present.',
+        states={
+            'invisible': Not(Bool(Eval('is_healthprof'))),
+            'required': Bool(Eval('is_healthprof')),
+            })
+
+    insurance_company_type = fields.Selection([
+        (None, ''),
+        ('state', 'State'),
+        ('labour_union', 'Labour Union / Syndical'),
+        ('private', 'Private'),
+        ], 'Insurance Type', select=True)
+    insurance_plan_ids = fields.One2Many(
+        'gnuhealth.insurance.plan', 'company', 'Insurance Plans')
+
+    du = fields.Many2One('gnuhealth.du', 'Domiciliary Unit')
+
+    @staticmethod
+    def default_activation_date():
+        return datetime.today()
+
+    @classmethod
+    def write(cls, parties, vals):
+        # We use this method overwrite to make the fields that have a unique
+        # constraint get the NULL value at PostgreSQL level, and not the value
+        # '' coming from the client
+
+        if vals.get('ref') == '':
+            vals['ref'] = None
+        return super(PartyPatient, cls).write(parties, vals)
+
+    @classmethod
+    def create(cls, vlist):
+        # We use this method overwrite to make the fields that have a unique
+        # constraint get the NULL value at PostgreSQL level, and not the value
+        # '' coming from the client
+
+        vlist = [x.copy() for x in vlist]
+        for values in vlist:
+            if 'ref' in values and not values['ref']:
+                values['ref'] = None
+
+        return super(PartyPatient, cls).create(vlist)
+
+    @classmethod
+    def __setup__(cls):
+        super(PartyPatient, cls).__setup__()
+        cls._sql_constraints += [
+            ('ref_uniq', 'UNIQUE(ref)', 'The PUID must be unique'),
+            ('internal_user_uniq', 'UNIQUE(internal_user)',
+                'This health professional is already assigned to a party')]
+
+    def get_rec_name(self, name):
+        if self.lastname:
+            return self.lastname + ', ' + self.name
+        else:
+            return self.name
+
+
+    @classmethod
+    def search_rec_name(cls, name, clause):
+        """ Search for the name, lastname, PUID and any alternative IDs"""
+        field = None
+        for field in ('name', 'lastname', 'ref', 'alternative_ids.code'):
+            parties = cls.search([(field,) + tuple(clause[1:])], limit=1)
+            if parties:
+                break
+        if parties:
+            return [(field,) + tuple(clause[1:])]
+        return [(cls._rec_name,) + tuple(clause[1:])]
+
+    @fields.depends('is_person', 'is_patient', 'is_healthprof')
+    def on_change_with_is_person(self):
+        # Set is_person if the party is a health professional or a patient
+        if (self.is_healthprof or self.is_patient or self.is_person):
+            return True
+
+    @classmethod
+    def validate(cls, parties):
+        super(PartyPatient, cls).validate(parties)
+        for party in parties:
+            party.check_person()
+
+    def check_person(self):
+    # Verify that health professional and patient
+    # are unchecked when is_person is False
+
+        if not self.is_person and (self.is_patient or self.is_healthprof):
+            self.raise_user_error(
+                "The Person field must be set if the party is a health"
+                " professional or a patient")
+
+    @classmethod
+    # Update to version 2.4
+
+    def __register__(cls, module_name):
+
+        cursor = Transaction().cursor
+        TableHandler = backend.get('TableHandler')
+        table = TableHandler(cursor, cls, module_name)
+        # Rename is_doctor to a more general term is_healthprof
+
+        if table.column_exist('is_doctor'):
+            table.column_rename('is_doctor', 'is_healthprof')
+
+        super(PartyPatient, cls).__register__(module_name)
+
+class PartyAddress(ModelSQL, ModelView):
+    'Party Address'
+    __name__ = 'party.address'
+
+    relationship = fields.Char(
+        'Relationship',
+        help='Include the relationship with the person - friend, co-worker,'
+        ' brother,...')
+    relative_id = fields.Many2One(
+        'party.party', 'Contact', domain=[('is_person', '=', True)],
+        help='Include link to the relative')
+
+    is_school = fields.Boolean(
+        "School", help="Check this box to mark the school address")
+    is_work = fields.Boolean(
+        "Work", help="Check this box to mark the work address")
 
 class DrugDoseUnits(ModelSQL, ModelView):
     'Drug Dose Unit'
@@ -74,8 +425,9 @@
         'Frequency', required=True, select=True, translate=True,
         help='Common frequency name')
     code = fields.Char(
-        'Code',
-        help='Dosage Code,for example: SNOMED 229798009 = 3 times per day')
+        'Code', required=True,
+        help='Dosage Code,for example: SNOMED 229798009 = 3 times per day.'
+           'Please use CAPITAL LETTERS and no spaces')
     abbreviation = fields.Char(
         'Abbreviation',
         help='Dosage abbreviation, such as tid in the US or tds in the UK')
@@ -85,6 +437,7 @@
         super(MedicationFrequency, cls).__setup__()
         cls._sql_constraints = [
             ('name_uniq', 'UNIQUE(name)', 'The Unit must be unique !'),
+            ('code_uniq', 'UNIQUE(code)', 'The CODE must be unique !'),
         ]
 
 
@@ -93,13 +446,15 @@
     __name__ = 'gnuhealth.drug.form'
 
     name = fields.Char('Form', required=True, select=True, translate=True)
-    code = fields.Char('Code')
+    code = fields.Char('Code', required=True,
+        help="Please use CAPITAL LETTERS and no spaces")
 
     @classmethod
     def __setup__(cls):
         super(DrugForm, cls).__setup__()
         cls._sql_constraints = [
             ('name_uniq', 'UNIQUE(name)', 'The Unit must be unique !'),
+            ('code_uniq', 'UNIQUE(code)', 'The CODE must be unique !'),
         ]
 
 
@@ -108,13 +463,15 @@
     __name__ = 'gnuhealth.drug.route'
 
     name = fields.Char('Unit', required=True, select=True, translate=True)
-    code = fields.Char('Code')
+    code = fields.Char('Code', required=True,
+        help="Please use CAPITAL LETTERS and no spaces")
 
     @classmethod
     def __setup__(cls):
         super(DrugRoute, cls).__setup__()
         cls._sql_constraints = [
             ('name_uniq', 'UNIQUE(name)', 'The Name must be unique !'),
+            ('code_uniq', 'UNIQUE(code)', 'The CODE must be unique !'),
         ]
 
 
@@ -123,13 +480,15 @@
     __name__ = 'gnuhealth.occupation'
 
     name = fields.Char('Name', required=True, translate=True)
-    code = fields.Char('Code')
+    code = fields.Char('Code',  required=True, 
+        help="Please use CAPITAL LETTERS and no spaces")
 
     @classmethod
     def __setup__(cls):
         super(Occupation, cls).__setup__()
         cls._sql_constraints = [
             ('name_uniq', 'UNIQUE(name)', 'The Name must be unique !'),
+            ('code_uniq', 'UNIQUE(code)', 'The CODE must be unique !'),
         ]
 
 
@@ -138,7 +497,8 @@
     __name__ = 'gnuhealth.ethnicity'
 
     name = fields.Char('Name', required=True, translate=True)
-    code = fields.Char('Code')
+    code = fields.Char('Code', required=True,
+        help="Please use CAPITAL LETTERS and no spaces")
     notes = fields.Char('Notes')
 
     @classmethod
@@ -146,6 +506,530 @@
         super(Ethnicity, cls).__setup__()
         cls._sql_constraints = [
             ('name_uniq', 'UNIQUE(name)', 'The Name must be unique !'),
+            ('code_uniq', 'UNIQUE(code)', 'The CODE must be unique !'),
+
+        ]
+
+class OperationalArea(ModelSQL, ModelView):
+    'Operational Area'
+    __name__ = 'gnuhealth.operational_area'
+
+    name = fields.Char(
+        'Name', required=True, help='Operational Area of the city or region')
+
+    operational_sector = fields.One2Many(
+        'gnuhealth.operational_sector', 'operational_area',
+        'Operational Sector', readonly=True)
+
+    info = fields.Text('Extra Information')
+
+    @classmethod
+    def __setup__(cls):
+        super(OperationalArea, cls).__setup__()
+        cls._sql_constraints += [
+            ('name_uniq', 'UNIQUE(name)',
+                'The operational area must be unique !'),
+        ]
+
+
+class OperationalSector(ModelSQL, ModelView):
+    'Operational Sector'
+    __name__ = 'gnuhealth.operational_sector'
+
+    name = fields.Char(
+        'Op. Sector', required=True,
+        help='Region included in an operational area')
+
+    operational_area = fields.Many2One(
+        'gnuhealth.operational_area', 'Operational Area')
+
+    info = fields.Text('Extra Information')
+
+    @classmethod
+    def __setup__(cls):
+        super(OperationalSector, cls).__setup__()
+        cls._sql_constraints += [
+            ('name_uniq', 'UNIQUE(name, operational_area)',
+                'The operational sector must be unique in each'
+                ' operational area!'),
+        ]
+
+
+
+# HEALTH INSTITUTION
+class HealthInstitution(ModelSQL, ModelView):
+    'Health Institution'
+    __name__ = 'gnuhealth.institution'
+
+    @classmethod
+    def get_institution(cls):
+        # Retrieve the institution associated to this GNU Health instance
+        # That is associated to the Company.
+        
+        company = Transaction().context.get('company')
+        
+        cursor = Transaction().cursor
+        cursor.execute('SELECT party FROM company_company WHERE id=%s \
+            LIMIT 1', (company,))
+        party_id = cursor.fetchone()
+        if party_id:
+            cursor = Transaction().cursor
+            cursor.execute('SELECT id FROM gnuhealth_institution WHERE \
+                name = %s LIMIT 1', (party_id[0],))
+            institution_id = cursor.fetchone()
+            if (institution_id):
+                return int(institution_id[0])
+        
+
+    name = fields.Many2One(
+        'party.party', 'Institution',
+        domain=[('is_institution', '=', True)],
+        help='Party Associated to this Health Institution',
+        required=True,
+        states={'readonly': Bool(Eval('name'))})
+        
+    code = fields.Char('Code', required=True,
+        help="Institution code")
+
+    picture = fields.Binary('Picture')
+
+    institution_type = fields.Selection((
+        ('doctor_office', 'Doctor office'),
+        ('primary_care', 'Primary Care Center'),
+        ('clinic', 'Clinic'),
+        ('hospital', 'General Hospital'),
+        ('specialized', 'Specialized Hospital'),
+        ('nursing_home', 'Nursing Home'),
+        ('hospice', 'Hospice'),
+        ('rural', 'Rural facility'),
+        ), 'Type', required=True, sort=False)
+   
+    beds = fields.Integer("Beds")
+
+    operating_room = fields.Boolean("Operating Room", 
+        help="Check this box if the institution" \
+        " has operating rooms",
+        )
+    or_number = fields.Integer("ORs",
+        states={'invisible': Not(Bool(Eval('operating_room')))})
+    
+    public_level = fields.Selection((  
+        ('private', 'Private'),
+        ('public', 'Public'),
+        ('mixed', 'Private - State'),
+        ), 'Public Level', required=True, sort=False)
+
+    teaching = fields.Boolean("Teaching", help="Mark if this is a" \
+        " teaching institution")
+    heliport = fields.Boolean("Heliport")
+    trauma_center = fields.Boolean("Trauma Center")
+    trauma_level = fields.Selection((
+        (None, ''),
+        ('one', 'Level I'),
+        ('two', 'Level II'),
+        ('three', 'Level III'),
+        ('four', 'Level IV'),
+        ('five', 'Level V'),
+        ), 'Trauma Level', sort=False,
+        states={'invisible': Not(Bool(Eval('trauma_center')))})
+    
+    extra_info = fields.Text("Extra Info")
+
+    def get_rec_name(self, name):
+        if self.name:
+            return self.name.name
+
+    @classmethod
+    def __setup__(cls):
+        super(HealthInstitution, cls).__setup__()
+        cls._sql_constraints = [
+            ('name_uniq', 'UNIQUE(name)', 'This Institution already exists !'),
+            ('code_uniq', 'UNIQUE(code)', 'This CODE already exists !'),
+        ]
+
+    @classmethod
+    def __register__(cls, module_name):
+
+        super(HealthInstitution, cls).__register__(module_name)
+
+        # Upgrade to GNU Health 2.6
+        # Insert to the gnuhealth.institution model the existing
+        # institutions in party 
+
+        # Users need to specify the new type and plublic level attributes of 
+        # the institution after the upgrade.
+         
+        cursor = Transaction().cursor
+        cursor.execute("select name from gnuhealth_institution limit 1;")
+        records = cursor.fetchone()
+        if not records:
+            cursor.execute(
+                "INSERT INTO gnuhealth_institution \
+                (name, code, institution_type, public_level) \
+                SELECT id, id,\'set_me\',\'set_me\' \
+                from party_party where is_institution='true';")
+
+            # Drop old foreign key from institution building
+            
+            TableHandler = backend.get('TableHandler')
+
+            if TableHandler.table_exist(cursor,'gnuhealth_hospital_building'):
+                cursor.execute("ALTER TABLE gnuhealth_hospital_building DROP \
+                    CONSTRAINT gnuhealth_hospital_building_institution_fkey;")
+
+                # Link building with new institution model
+                
+                cursor.execute(
+                    'UPDATE GNUHEALTH_HOSPITAL_BUILDING '
+                    'SET INSTITUTION = GNUHEALTH_INSTITUTION.ID '
+                    'FROM GNUHEALTH_INSTITUTION '
+                    'WHERE GNUHEALTH_HOSPITAL_BUILDING.INSTITUTION = \
+                    GNUHEALTH_INSTITUTION.NAME')
+
+
+                # Drop old foreign key from institution UNIT
+                
+                cursor = Transaction().cursor
+                
+                if TableHandler.table_exist(cursor,'gnuhealth_hospital_unit'):
+                    cursor.execute("ALTER TABLE gnuhealth_hospital_unit DROP \
+                        CONSTRAINT gnuhealth_hospital_unit_institution_fkey;")
+
+                # Link unit with new institution model
+                
+                cursor.execute(
+                    'UPDATE GNUHEALTH_HOSPITAL_UNIT '
+                    'SET INSTITUTION = GNUHEALTH_INSTITUTION.ID '
+                    'FROM GNUHEALTH_INSTITUTION '
+                    'WHERE GNUHEALTH_HOSPITAL_UNIT.INSTITUTION = \
+                    GNUHEALTH_INSTITUTION.NAME')
+
+            # Drop old foreign key from institution WARD
+            
+            if TableHandler.table_exist(cursor,'gnuhealth_hospital_ward'):
+                cursor.execute("ALTER TABLE gnuhealth_hospital_ward DROP \
+                    CONSTRAINT gnuhealth_hospital_ward_institution_fkey;")
+
+                # Link ward with new institution model
+                
+                cursor.execute(
+                    'UPDATE GNUHEALTH_HOSPITAL_WARD '
+                    'SET INSTITUTION = GNUHEALTH_INSTITUTION.ID '
+                    'FROM GNUHEALTH_INSTITUTION '
+                    'WHERE GNUHEALTH_HOSPITAL_WARD.INSTITUTION = \
+                    GNUHEALTH_INSTITUTION.NAME')
+
+                # Drop old foreign key from institution OR
+                      
+            if TableHandler.table_exist(cursor,'gnuhealth_hospital_or'):
+                cursor.execute("ALTER TABLE gnuhealth_hospital_or DROP \
+                    CONSTRAINT gnuhealth_hospital_or_institution_fkey;")
+
+                # Link Operating Room with new institution model
+                
+                cursor.execute(
+                    'UPDATE GNUHEALTH_HOSPITAL_OR '
+                    'SET INSTITUTION = GNUHEALTH_INSTITUTION.ID '
+                    'FROM GNUHEALTH_INSTITUTION '
+                    'WHERE GNUHEALTH_HOSPITAL_OR.INSTITUTION = \
+                    GNUHEALTH_INSTITUTION.NAME')
+
+            # Drop old foreign key from Appointment
+            
+            if TableHandler.table_exist(cursor,'gnuhealth_hospital_appointment'):
+                cursor.execute("ALTER TABLE gnuhealth_appointment DROP \
+                    CONSTRAINT gnuhealth_appointment_institution_fkey;")
+
+                # Link Appointment with new institution model
+                
+                cursor.execute(
+                    'UPDATE GNUHEALTH_APPOINTMENT '
+                    'SET INSTITUTION = GNUHEALTH_INSTITUTION.ID '
+                    'FROM GNUHEALTH_INSTITUTION '
+                    'WHERE GNUHEALTH_APPOINTMENT.INSTITUTION = \
+                    GNUHEALTH_INSTITUTION.NAME')
+
+
+class HealthInstitutionSpecialties(ModelSQL, ModelView):
+    'Health Institution Specialties'
+    __name__ = 'gnuhealth.institution.specialties'
+
+    name = fields.Many2One('gnuhealth.institution', 'Institution')
+    specialty = fields.Many2One('gnuhealth.specialty', 'Specialty')
+
+    
+    def get_rec_name(self, name):
+        if self.name:
+            return self.specialty.name
+
+
+class HealthInstitutionOperationalSector(ModelSQL, ModelView):
+    'Operational Sectors covered by Institution'
+    __name__ = 'gnuhealth.institution.operationalsector'
+
+    name = fields.Many2One('gnuhealth.institution', 'Institution')
+    operational_sector = fields.Many2One('gnuhealth.operational_sector', 'Operational Sector')
+
+class HealthInstitutionO2M(ModelSQL, ModelView):
+    'Health Institution'
+    __name__ = 'gnuhealth.institution'
+
+    # Add Specialties to the Health Institution
+    specialties = fields.One2Many('gnuhealth.institution.specialties',
+        'name','Specialties',
+        help="Specialties Provided in this Health Institution")
+
+    main_specialty = fields.Many2One('gnuhealth.institution.specialties',
+        'Specialty',
+        domain=[('name', '=', Eval('active_id'))], depends=['specialties'], 
+        help="Choose the speciality in the case of Specialized Hospitals" \
+            " or where this center excels", 
+        states={'required': And(Eval('institution_type') == 'specialized', Bool(Eval('specialties'))),
+            'readonly': Not(Bool(Eval('name')))})
+
+    # Add Specialties to the Health Institution
+    operational_sectors = fields.One2Many('gnuhealth.institution.operationalsector',
+        'name','Operational Sector',
+        help="Operational Sectors covered by this institution")
+
+
+# HEALTH CENTER / HOSPITAL INFRASTRUCTURE
+class HospitalBuilding(ModelSQL, ModelView):
+    'Hospital Building'
+    __name__ = 'gnuhealth.hospital.building'
+
+    name = fields.Char(
+        'Name', required=True,
+        help='Name of the building within the institution')
+
+    institution = fields.Many2One(
+        'gnuhealth.institution', 'Institution', required=True,
+        help='Health Instituion of this building')
+
+    code = fields.Char('Code', required=True)
+    extra_info = fields.Text('Extra Info')
+
+    @staticmethod
+    def default_institution():
+        return HealthInstitution().get_institution()
+
+    @classmethod
+    def __setup__(cls):
+        super(HospitalBuilding, cls).__setup__()
+        cls._sql_constraints = [
+            ('name_uniq', 'UNIQUE(name, institution)',
+                'The Building name must be unique per Health'
+                ' Center'),
+            ('code_uniq', 'UNIQUE(code, institution)',
+                'The Building name must be unique per Health'
+                ' Center'),
+        ]
+
+
+class HospitalUnit(ModelSQL, ModelView):
+    'Hospital Unit'
+    __name__ = 'gnuhealth.hospital.unit'
+
+    name = fields.Char(
+        'Name', required=True,
+        help='Name of the unit, eg Neonatal, Intensive Care, ...')
+
+    institution = fields.Many2One(
+        'gnuhealth.institution', 'Institution',required=True,
+        help='Health Institution')
+
+    code = fields.Char('Code', required=True)
+    extra_info = fields.Text('Extra Info')
+
+    @staticmethod
+    def default_institution():
+        return HealthInstitution().get_institution()
+
+    @classmethod
+    def __setup__(cls):
+        super(HospitalUnit, cls).__setup__()
+        cls._sql_constraints = [
+            ('name_uniq', 'UNIQUE(name, institution)',
+                'The Unit NAME must be unique per Health'
+                ' Center'),
+            ('code_uniq', 'UNIQUE(code, institution)',
+                'The Unit CODE must be unique per Health'
+                ' Center'),
+        ]
+
+
+class HospitalOR(ModelSQL, ModelView):
+    'Operating Room'
+    __name__ = 'gnuhealth.hospital.or'
+
+    name = fields.Char(
+        'Name', required=True, help='Name of the Operating Room')
+
+    institution = fields.Many2One(
+        'gnuhealth.institution', 'Institution', required=True,
+        help='Health Institution')
+
+    building = fields.Many2One(
+        'gnuhealth.hospital.building', 'Building',
+        domain=[('institution', '=', Eval('institution'))],
+        select=True)
+
+    unit = fields.Many2One('gnuhealth.hospital.unit', 'Unit',
+        domain=[('institution', '=', Eval('institution'))])
+    extra_info = fields.Text('Extra Info')
+
+    @staticmethod
+    def default_institution():
+        return HealthInstitution().get_institution()
+
+    @classmethod
+    def __setup__(cls):
+        super(HospitalOR, cls).__setup__()
+        cls._sql_constraints = [
+            ('name_uniq', 'UNIQUE(name, institution)',
+                'The Operating Room Name must be unique per Health'
+                ' Center'),
+        ]
+
+
+class HospitalWard(ModelSQL, ModelView):
+    'Hospital Ward'
+    __name__ = 'gnuhealth.hospital.ward'
+
+    name = fields.Char('Name', required=True, help='Ward / Room code')
+
+    institution = fields.Many2One(
+        'gnuhealth.institution', 'Institution',required=True,
+        help='Health Institution')
+
+    building = fields.Many2One('gnuhealth.hospital.building', 'Building',
+        domain=[('institution', '=', Eval('institution'))])
+    floor = fields.Integer('Floor Number')
+    unit = fields.Many2One('gnuhealth.hospital.unit', 'Unit',
+        domain=[('institution', '=', Eval('institution'))])
+
+    private = fields.Boolean(
+        'Private', help='Check this option for private room')
+
+    bio_hazard = fields.Boolean(
+        'Bio Hazard', help='Check this option if there is biological hazard')
+
+    number_of_beds = fields.Integer(
+        'Number of beds', help='Number of patients per ward')
+
+    telephone = fields.Boolean('Telephone access')
+    ac = fields.Boolean('Air Conditioning')
+    private_bathroom = fields.Boolean('Private Bathroom')
+    guest_sofa = fields.Boolean('Guest sofa-bed')
+    tv = fields.Boolean('Television')
+    internet = fields.Boolean('Internet Access')
+    refrigerator = fields.Boolean('Refrigerator')
+    microwave = fields.Boolean('Microwave')
+
+    gender = fields.Selection((
+        ('men', 'Men Ward'),
+        ('women', 'Women Ward'),
+        ('unisex', 'Unisex'),
+        ), 'Gender', required=True, sort=False)
+
+    state = fields.Selection((
+        (None, ''),
+        ('beds_available', 'Beds available'),
+        ('full', 'Full'),
+        ('na', 'Not available'),
+        ), 'Status', sort=False)
+
+    extra_info = fields.Text('Extra Info')
+
+    @staticmethod
+    def default_gender():
+        return 'unisex'
+
+    @staticmethod
+    def default_number_of_beds():
+        return 1
+
+    @staticmethod
+    def default_institution():
+        return HealthInstitution().get_institution()
+
+    @classmethod
+    def __setup__(cls):
+        super(HospitalWard, cls).__setup__()
+        cls._sql_constraints = [
+            ('name_uniq', 'UNIQUE(name, institution)',
+                'The Ward / Room Name must be unique per Health'
+                ' Center'),
+        ]
+
+
+class HospitalBed(ModelSQL, ModelView):
+    'Hospital Bed'
+    __name__ = 'gnuhealth.hospital.bed'
+    _rec_name = 'telephone_number'
+
+    name = fields.Many2One(
+        'product.product', 'Bed', required=True,
+        domain=[('is_bed', '=', True)],
+        help='Bed Number')
+
+    institution = fields.Many2One(
+        'gnuhealth.institution', 'Institution', required=True,
+        help='Health Institution')
+
+    ward = fields.Many2One(
+        'gnuhealth.hospital.ward', 'Ward',
+        domain=[('institution', '=', Eval('institution'))],
+        help='Ward or room')
+
+    bed_type = fields.Selection((
+        ('gatch', 'Gatch Bed'),
+        ('electric', 'Electric'),
+        ('stretcher', 'Stretcher'),
+        ('low', 'Low Bed'),
+        ('low_air_loss', 'Low Air Loss'),
+        ('circo_electric', 'Circo Electric'),
+        ('clinitron', 'Clinitron'),
+        ), 'Bed Type', required=True, sort=False)
+
+    telephone_number = fields.Char(
+        'Telephone Number', help='Telephone number / Extension')
+
+    extra_info = fields.Text('Extra Info')
+
+    state = fields.Selection((
+        ('free', 'Free'),
+        ('reserved', 'Reserved'),
+        ('occupied', 'Occupied'),
+        ('na', 'Not available'),
+        ), 'Status', readonly=True, sort=False)
+
+    @staticmethod
+    def default_bed_type():
+        return 'gatch'
+
+    @staticmethod
+    def default_state():
+        return 'free'
+
+    @staticmethod
+    def default_institution():
+        return HealthInstitution().get_institution()
+
+    def get_rec_name(self, name):
+        if self.name:
+            return self.name.name
+
+    @classmethod
+    def search_rec_name(cls, name, clause):
+        return [('name',) + tuple(clause[1:])]
+
+    @classmethod
+    def __setup__(cls):
+        super(HospitalBed, cls).__setup__()
+        cls._sql_constraints = [
+            ('name_uniq', 'UNIQUE(name, institution)',
+                'The Bed must be unique per Health Center'),
         ]
 
 
@@ -156,15 +1040,16 @@
     name = fields.Char(
         'Specialty', required=True, translate=True,
         help='ie, Addiction Psychiatry')
-    code = fields.Char('Code', help='ie, ADP')
+    code = fields.Char('Code', required=True,
+        help='ie, ADP. Please use CAPITAL LETTERS and no spaces')
 
     @classmethod
     def __setup__(cls):
+        cls._sql_constraints = [
+            ('name_uniq', 'UNIQUE(name)', 'The Specialty must be unique !'),
+            ('code_uniq', 'UNIQUE(code)', 'The CODE must be unique !'),
+        ]
         super(MedicalSpecialty, cls).__setup__()
-        cls._sql_constraints = [
-            ('name_uniq', 'UNIQUE(name)', 'The Specialty must be unique !'),
-        ]
-
 
 class HealthProfessional(ModelSQL, ModelView):
     'Health Professional'
@@ -198,24 +1083,44 @@
         help='Health Professional\'s Name, from the partner list')
 
     institution = fields.Many2One(
-        'party.party', 'Institution',
-        domain=[('is_institution', '=', True)],
-        help='Instituion where she/he works')
+        'gnuhealth.institution', 'Institution',
+        help='Main instituion where she/he works')
 
-    code = fields.Char('ID', help='License ID')
+    code = fields.Char('LICENSE ID', help='License ID')
 
     specialties = fields.One2Many(
         'gnuhealth.hp_specialty', 'name', 'Specialties')
 
     info = fields.Text('Extra info')
 
+    puid = fields.Function(
+        fields.Char('PUID', help="Person Unique Identifier"),
+        'get_hp_puid', searcher='search_hp_puid')
+
+
+    def get_hp_puid(self, name):
+        return self.name.ref
+
+    @staticmethod
+    def default_institution():
+        return HealthInstitution().get_institution()
+
+    @classmethod
+    def search_hp_puid(cls, name, clause):
+        res = []
+        value = clause[2]
+        res.append(('name.ref', clause[1], value))
+        return res
+
     @classmethod
     def __setup__(cls):
-        super(HealthProfessional, cls).__setup__()
         cls._sql_constraints = [
             ('hp_uniq', 'UNIQUE(name)',
                 'The health professional must be unique'),
+            ('code_uniq', 'UNIQUE(code)',
+                'The LICENSE ID must be unique'),
         ]
+        super(HealthProfessional, cls).__setup__()
 
     def get_rec_name(self, name):
         if self.name:
@@ -282,49 +1187,6 @@
             table.drop_column('specialty')
 
 
-class OperationalArea(ModelSQL, ModelView):
-    'Operational Area'
-    __name__ = 'gnuhealth.operational_area'
-
-    name = fields.Char(
-        'Name', required=True, help='Operational Area of the city or region')
-
-    operational_sector = fields.One2Many(
-        'gnuhealth.operational_sector', 'operational_area',
-        'Operational Sector', readonly=True)
-
-    info = fields.Text('Extra Information')
-
-    @classmethod
-    def __setup__(cls):
-        super(OperationalArea, cls).__setup__()
-        cls._sql_constraints += [
-            ('name_uniq', 'UNIQUE(name)',
-                'The operational area must be unique !'),
-        ]
-
-
-class OperationalSector(ModelSQL, ModelView):
-    'Operational Sector'
-    __name__ = 'gnuhealth.operational_sector'
-
-    name = fields.Char(
-        'Op. Sector', required=True,
-        help='Region included in an operational area')
-
-    operational_area = fields.Many2One(
-        'gnuhealth.operational_area', 'Operational Area')
-
-    info = fields.Text('Extra Information')
-
-    @classmethod
-    def __setup__(cls):
-        super(OperationalSector, cls).__setup__()
-        cls._sql_constraints += [
-            ('name_uniq', 'UNIQUE(name, operational_area)',
-                'The operational sector must be unique in each'
-                ' operational area!'),
-        ]
 
 
 class Family(ModelSQL, ModelView):
@@ -378,144 +1240,6 @@
     role = fields.Char('Role', help='Father, Mother, sibbling...')
 
 
-class DomiciliaryUnit(ModelSQL, ModelView):
-    'Domiciliary Unit'
-    __name__ = 'gnuhealth.du'
-
-    name = fields.Char('Code', required=True)
-    desc = fields.Char('Desc')
-    address_street = fields.Char('Street')
-    address_street_number = fields.Integer('Number')
-    address_street_bis = fields.Char('Apartment')
-
-    address_district = fields.Char(
-        'District', help="Neighborhood, Village, Barrio....")
-
-    address_municipality = fields.Char(
-        'Municipality', help="Municipality, Township, county ..")
-    address_city = fields.Char('City')
-    address_zip = fields.Char('Zip Code')
-    address_country = fields.Many2One(
-        'country.country', 'Country', help='Country')
-
-    address_subdivision = fields.Many2One(
-        'country.subdivision', 'Province',
-        domain=[('country', '=', Eval('address_country'))],
-        depends=['address_country'])
-
-    operational_sector = fields.Many2One(
-        'gnuhealth.operational_sector', 'Operational Sector')
-
-    picture = fields.Binary('Picture')
-
-    latitude = fields.Numeric('Latidude', digits=(3, 14))
-    longitude = fields.Numeric('Longitude', digits=(4, 14))
-
-    urladdr = fields.Char(
-        'OSM Map', on_change_with=[
-            'latitude', 'longitude', 'address_street', 'address_street_number',
-            'address_district', 'address_municipality', 'address_city',
-            'address_zip', 'address_subdivision', 'address_country'],
-        help="Locates the DU on the Open Street Map by default")
-
-    # Infrastructure
-
-    dwelling = fields.Selection([
-        (None, ''),
-        ('single_house', 'Single / Detached House'),
-        ('apartment', 'Apartment'),
-        ('townhouse', 'Townhouse'),
-        ('factory', 'Factory'),
-        ('building', 'Building'),
-        ('mobilehome', 'Mobile House'),
-        ], 'Type', sort=False)
-
-    materials = fields.Selection([
-        (None, ''),
-        ('concrete', 'Concrete'),
-        ('adobe', 'Adobe'),
-        ('wood', 'Wood'),
-        ('mud', 'Mud / Straw'),
-        ('stone', 'Stone'),
-        ], 'Material', sort=False)
-
-    roof_type = fields.Selection([
-        (None, ''),
-        ('concrete', 'Concrete'),
-        ('adobe', 'Adobe'),
-        ('wood', 'Wood'),
-        ('mud', 'Mud'),
-        ('thatch', 'Thatched'),
-        ('stone', 'Stone'),
-        ], 'Roof', sort=False)
-
-    total_surface = fields.Integer('Surface', help="Surface in sq. meters")
-    bedrooms = fields.Integer('Bedrooms')
-    bathrooms = fields.Integer('Bathrooms')
-
-    housing = fields.Selection([
-        (None, ''),
-        ('0', 'Shanty, deficient sanitary conditions'),
-        ('1', 'Small, crowded but with good sanitary conditions'),
-        ('2', 'Comfortable and good sanitary conditions'),
-        ('3', 'Roomy and excellent sanitary conditions'),
-        ('4', 'Luxury and excellent sanitary conditions'),
-        ], 'Conditions',
-        help="Housing and sanitary living conditions", sort=False)
-
-    sewers = fields.Boolean('Sanitary Sewers')
-    water = fields.Boolean('Running Water')
-    trash = fields.Boolean('Trash recollection')
-    electricity = fields.Boolean('Electrical supply')
-    gas = fields.Boolean('Gas supply')
-    telephone = fields.Boolean('Telephone')
-    television = fields.Boolean('Television')
-    internet = fields.Boolean('Internet')
-
-    members = fields.One2Many('party.party', 'du', 'Members', readonly=True)
-
-    def on_change_with_urladdr(self):
-        # Generates the URL to be used in OpenStreetMap
-        # The address will be mapped to the URL in the following way
-        # If the latitud and longitude of the DU are given, then those
-        # parameters will be used.
-        # Otherwise, it will try to find the address by the
-        # Street, municipality, city, postalcode, state and country.
-
-        if (self.latitude and self.longitude):
-            ret_url = 'http://openstreetmap.org/?mlat=' + \
-                str(self.latitude) + '&mlon=' + str(self.longitude)
-
-        else:
-            state = ''
-            country = ''
-            street_number = str(self.address_street_number).encode('utf-8') \
-                or ''
-            street = (self.address_street).encode('utf-8') or ''
-            municipality = (self.address_municipality).encode('utf-8') or ''
-            city = (self.address_city).encode('utf-8') or ''
-            if (self.address_subdivision):
-                state = (self.address_subdivision.name).encode('utf-8') or ''
-            postalcode = (self.address_zip).encode('utf-8') or ''
-
-            if (self.address_country):
-                country = (self.address_country.code).encode('utf-8') or ''
-
-            ret_url = 'http://nominatim.openstreetmap.org/search?' + \
-                'street=' + street_number + ' ' + \
-                street + '&county=' + municipality \
-                + '&city=' + city + '&state=' + state \
-                + '&postalcode=' + postalcode + '&country=' + country
-
-        return ret_url
-
-    @classmethod
-    def __setup__(cls):
-        super(DomiciliaryUnit, cls).__setup__()
-        cls._sql_constraints = [
-            ('name_uniq', 'UNIQUE(name)',
-                'The Domiciliary Unit must be unique !'),
-        ]
 
 
 # Use the template as in Product category.
@@ -679,6 +1403,14 @@
         else:
             return self.name
 
+    @classmethod
+    def __setup__(cls):
+        super(PathologyCategory, cls).__setup__()
+        cls._sql_constraints += [
+            ('name_uniq', 'UNIQUE(name)',
+            'The category name must be unique'),
+        ]
+
 
 class PathologyGroup(ModelSQL, ModelView):
     'Pathology Groups'
@@ -699,6 +1431,14 @@
         'disease_group','Members', readonly=True)
 
     @classmethod
+    def __setup__(cls):
+        super(PathologyGroup, cls).__setup__()
+        cls._sql_constraints += [
+            ('code_uniq', 'UNIQUE(code)',
+            'The Pathology Group code must be unique'),
+        ]
+
+    @classmethod
     def __register__(cls, module_name):
         # Upgrade from GNU Health 1.4.5
         super(PathologyGroup, cls).__register__(module_name)
@@ -858,212 +1598,15 @@
     code = fields.Char('Code', required=True)
     alternative_id_type = fields.Selection(
         [
-            ('country_id', 'Country of origin SSN'),
+            ('country_id', 'Country of origin ID'),
             ('passport', 'Passport'),
+            ('medical_record', 'Medical Record'),
             ('other', 'Other'),
         ], 'ID type', required=True, sort=False,)
 
     comments = fields.Char('Comments')
 
 
-class PartyPatient (ModelSQL, ModelView):
-    'Party'
-    __name__ = 'party.party'
-
-    activation_date = fields.Date(
-        'Activation date', help='Date of activation of the party')
-
-    alias = fields.Char('Alias', help='Common name that the Party is reffered')
-    ref = fields.Char(
-        'SSN',
-        help='Patient Social Security Number or equivalent',
-        states={'invisible': Not(Bool(Eval('is_person')))})
-
-    unidentified = fields.Boolean(
-        'Unidentified',
-        help='Patient is currently unidentified',
-        states={'invisible': Not(Bool(Eval('is_person')))})
-
-    is_person = fields.Boolean(
-        'Person',
-        on_change_with=['is_person', 'is_patient', 'is_healthprof'],
-        help='Check if the party is a person.')
-
-    is_patient = fields.Boolean(
-        'Patient',
-        states={'invisible': Not(Bool(Eval('is_person')))},
-        help='Check if the party is a patient')
-
-    is_healthprof = fields.Boolean(
-        'Health Prof',
-        states={'invisible': Not(Bool(Eval('is_person')))},
-        help='Check if the party is a health professional')
-
-    is_institution = fields.Boolean(
-        'Institution', help='Check if the party is a Medical Center')
-    is_insurance_company = fields.Boolean(
-        'Insurance Company', help='Check if the party is an Insurance Company')
-    is_pharmacy = fields.Boolean(
-        'Pharmacy', help='Check if the party is a Pharmacy')
-
-    lastname = fields.Char('Last Name', help='Last Name')
-    dob = fields.Date('DoB', help='Date of Birth')
-
-    sex = fields.Selection([
-        (None, ''),
-        ('m', 'Male'),
-        ('f', 'Female'),
-        ], 'Sex', states={'required': Bool(Eval('is_person'))})
-
-    photo = fields.Binary('Picture')
-    ethnic_group = fields.Many2One('gnuhealth.ethnicity', 'Ethnic group')
-
-    marital_status = fields.Selection([
-        (None, ''),
-        ('s', 'Single'),
-        ('m', 'Married'),
-        ('c', 'Concubinage'),
-        ('w', 'Widowed'),
-        ('d', 'Divorced'),
-        ('x', 'Separated'),
-        ], 'Marital Status', sort=False)
-
-    citizenship = fields.Many2One(
-        'country.country', 'Citizenship', help='Country of Citizenship')
-    residence = fields.Many2One(
-        'country.country', 'Country of Residence', help='Country of Residence')
-    alternative_identification = fields.Boolean(
-        'Alternative ID', help='Other type of '
-        'identification, not the official SSN from this country health'
-        ' center. Examples : Passport, foreign ID,..')
-
-    alternative_ids = fields.One2Many(
-        'gnuhealth.person_alternative_identification',
-        'name', 'Alternative IDs',
-        states={'invisible': Not(Bool(Eval('alternative_identification')))})
-
-    insurance = fields.One2Many('gnuhealth.insurance', 'name', 'Insurance')
-
-    internal_user = fields.Many2One(
-        'res.user', 'Internal User',
-        help='In GNU Health is the user (doctor, nurse, ...) that logins.When the'
-        ' party is a health professional, it will be the user'
-        ' that maps the health professional party. It must be present.',
-        states={
-            'invisible': Not(Bool(Eval('is_healthprof'))),
-            'required': Bool(Eval('is_healthprof')),
-            })
-
-    insurance_company_type = fields.Selection([
-        (None, ''),
-        ('state', 'State'),
-        ('labour_union', 'Labour Union / Syndical'),
-        ('private', 'Private'),
-        ], 'Insurance Type', select=True)
-    insurance_plan_ids = fields.One2Many(
-        'gnuhealth.insurance.plan', 'company', 'Insurance Plans')
-
-    du = fields.Many2One('gnuhealth.du', 'Domiciliary Unit')
-
-    @classmethod
-    def write(cls, parties, vals):
-        # We use this method overwrite to make the fields that have a unique
-        # constraint get the NULL value at PostgreSQL level, and not the value
-        # '' coming from the client
-
-        if vals.get('ref') == '':
-            vals['ref'] = None
-        return super(PartyPatient, cls).write(parties, vals)
-
-    @classmethod
-    def create(cls, vlist):
-        # We use this method overwrite to make the fields that have a unique
-        # constraint get the NULL value at PostgreSQL level, and not the value
-        # '' coming from the client
-
-        vlist = [x.copy() for x in vlist]
-        for values in vlist:
-            if 'ref' in values and not values['ref']:
-                values['ref'] = None
-
-        return super(PartyPatient, cls).create(vlist)
-
-    @classmethod
-    def __setup__(cls):
-        super(PartyPatient, cls).__setup__()
-        cls._sql_constraints += [
-            ('ref_uniq', 'UNIQUE(ref)', 'The SSN must be unique'),
-            ('internal_user_uniq', 'UNIQUE(internal_user)',
-                'This health professional is already assigned to a party')]
-
-    def get_rec_name(self, name):
-        if self.lastname:
-            return self.lastname + ', ' + self.name
-        else:
-            return self.name
-
-    @classmethod
-    def search_rec_name(cls, name, clause):
-        field = None
-        for field in ('name', 'lastname'):
-            parties = cls.search([(field,) + tuple(clause[1:])], limit=1)
-            if parties:
-                break
-        if parties:
-            return [(field,) + tuple(clause[1:])]
-        return [(cls._rec_name,) + tuple(clause[1:])]
-
-    def on_change_with_is_person(self):
-        # Set is_person if the party is a health professional or a patient
-        if (self.is_healthprof or self.is_patient or self.is_person):
-            return True
-
-    @classmethod
-    def validate(cls, parties):
-        super(PartyPatient, cls).validate(parties)
-        for party in parties:
-            party.check_person()
-
-    def check_person(self):
-    # Verify that health professional and patient
-    # are unchecked when is_person is False
-
-        if not self.is_person and (self.is_patient or self.is_healthprof):
-            self.raise_user_error(
-                "The Person field must be set if the party is a health"
-                " professional or a patient")
-
-    @classmethod
-    # Update to version 2.4
-
-    def __register__(cls, module_name):
-
-        cursor = Transaction().cursor
-        TableHandler = backend.get('TableHandler')
-        table = TableHandler(cursor, cls, module_name)
-        # Rename is_doctor to a more general term is_healthprof
-
-        if table.column_exist('is_doctor'):
-            table.column_rename('is_doctor', 'is_healthprof')
-
-        super(PartyPatient, cls).__register__(module_name)
-
-class PartyAddress(ModelSQL, ModelView):
-    'Party Address'
-    __name__ = 'party.address'
-
-    relationship = fields.Char(
-        'Relationship',
-        help='Include the relationship with the person - friend, co-worker,'
-        ' brother,...')
-    relative_id = fields.Many2One(
-        'party.party', 'Contact', domain=[('is_person', '=', True)],
-        help='Include link to the relative')
-
-    is_school = fields.Boolean(
-        "School", help="Check this box to mark the school address")
-    is_work = fields.Boolean(
-        "Work", help="Check this box to mark the work address")
 
 
 class ProductCategory(ModelSQL, ModelView):
@@ -1161,30 +1704,30 @@
     __name__ = 'gnuhealth.patient'
 
     def patient_critical_summary(self, name):
-		# Patient Critical Information Summary
-		# The information will be shown in the front page
-
-		critical_info = ""
-		allergies=""
-		other_conditions=""
-		conditions=[]
-		for disease in self.diseases:
-			for member in disease.pathology.groups:
-				'''Retrieve patient allergies'''
-				if (member.disease_group.name == "ALLERGIC"):
-					if disease.pathology.name not in conditions:
-						allergies=allergies + str(disease.pathology.name) + "\n"
-						conditions.append (disease.pathology.name)
-
-			'''Retrieve patient other relevant conditions '''
-			'''Chronic and active'''		
-			if (disease.status == "c" or disease.is_active):
-				if disease.pathology.name not in conditions:
-							other_conditions=other_conditions + \
-							 disease.pathology.name + "\n"
-
-		return allergies + other_conditions
-		
+        # Patient Critical Information Summary
+        # The information will be shown in the front page
+
+        critical_info = ""
+        allergies=""
+        other_conditions=""
+        conditions=[]
+        for disease in self.diseases:
+            for member in disease.pathology.groups:
+                '''Retrieve patient allergies'''
+                if (member.disease_group.name == "ALLERGIC"):
+                    if disease.pathology.name not in conditions:
+                        allergies=allergies + str(disease.pathology.name) + "\n"
+                        conditions.append (disease.pathology.name)
+
+            '''Retrieve patient other relevant conditions '''
+            '''Chronic and active'''        
+            if (disease.status == "c" or disease.is_active):
+                if disease.pathology.name not in conditions:
+                            other_conditions=other_conditions + \
+                             disease.pathology.name + "\n"
+
+        return allergies + other_conditions
+        
     # Get the patient age in the following format : 'YEARS MONTHS DAYS'
     # It will calculate the age of the patient while the patient is alive.
     # When the patient dies, it will show the age at time of death.
@@ -1243,14 +1786,16 @@
         fields.Char('Lastname'), 'get_patient_lastname',
         searcher='search_patient_lastname')
 
-    ssn = fields.Function(
-        fields.Char('SSN'),
-        'get_patient_ssn', searcher='search_patient_ssn')
+    puid = fields.Function(
+        fields.Char('PUID', help="Person Unique Identifier"),
+        'get_patient_puid', searcher='search_patient_puid')
 
-    identification_code = fields.Char(
-        'ID', readonly=True,
-        help='Patient Identifier provided by the Health Center.Is not the'
-        ' Social Security Number')
+    # 2.6 Removed from the patient model and code moved to
+    # the patient alternative id as "medical_record"
+    # identification_code = fields.Char(
+    #    'Code', readonly=True,
+    #    help='Patient Identifier provided by the Health Center.Is not the'
+    #    ' Social Security Number')
 
     family = fields.Many2One(
         'gnuhealth.family', 'Family', help='Family Code')
@@ -1332,7 +1877,7 @@
 
     # ethnic_group = fields.Many2One('gnuhealth.ethnicity', 'Ethnic group')
     vaccinations = fields.One2Many(
-        'gnuhealth.vaccination', 'name', 'Vaccinations')
+        'gnuhealth.vaccination', 'name', 'Vaccinations', readonly=True)
     medications = fields.One2Many(
         'gnuhealth.patient.medication', 'name', 'Medications')
 
@@ -1344,7 +1889,7 @@
     critical_summary = fields.Function(fields.Text(
         'Important disease about patient allergies or procedures',
         help='Automated summary of patient allergies and '
-		'other critical information'),
+        'other critical information'),
         'patient_critical_summary')
 
     critical_info = fields.Text(
@@ -1404,14 +1949,14 @@
     def get_patient_photo(self, name):
         return self.name.photo
 
-    def get_patient_ssn(self, name):
+    def get_patient_puid(self, name):
         return self.name.ref
 
     def get_patient_marital_status(self, name):
         return self.name.marital_status
 
     @classmethod
-    def search_patient_ssn(cls, name, clause):
+    def search_patient_puid(cls, name, clause):
         res = []
         value = clause[2]
         res.append(('name.ref', clause[1], value))
@@ -1427,12 +1972,12 @@
         res.append(('name.lastname', clause[1], value))
         return res
 
-    # Search by the patient name, lastname or SSN
+    # Search by the patient name, lastname or PUID
 
     @classmethod
     def search_rec_name(cls, name, clause):
         field = None
-        for field in ('name', 'lastname', 'ssn'):
+        for field in ('name', 'lastname', 'puid'):
             patients = cls.search([(field,) + tuple(clause[1:])], limit=1)
             if patients:
                 break
@@ -1440,20 +1985,6 @@
             return [(field,) + tuple(clause[1:])]
         return [(cls._rec_name,) + tuple(clause[1:])]
 
-    @classmethod
-    def create(cls, vlist):
-        Sequence = Pool().get('ir.sequence')
-        Config = Pool().get('gnuhealth.sequences')
-
-        vlist = [x.copy() for x in vlist]
-        for values in vlist:
-            if not values.get('identification_code'):
-                config = Config(1)
-                values['identification_code'] = Sequence.get_id(
-                    config.patient_sequence.id)
-
-        return super(PatientData, cls).create(vlist)
-
     def get_rec_name(self, name):
         if self.name.lastname:
             return self.name.lastname + ', ' + self.name.name
@@ -1523,6 +2054,18 @@
 
             table.drop_column('marital_status')
 
+        # 2.6 Move Identification Code from patient to party
+
+
+        if table.column_exist('identification_code'):
+            cursor.execute(
+                "INSERT INTO GNUHEALTH_PERSON_ALTERNATIVE_IDENTIFICATION \
+                (NAME, ALTERNATIVE_ID_TYPE, CODE) \
+                SELECT name, 'medical_record', IDENTIFICATION_CODE \
+                FROM GNUHEALTH_PATIENT;")
+
+            table.drop_column('identification_code')
+
 
 # PATIENT DISESASES INFORMATION
 class PatientDiseaseInfo(ModelSQL, ModelView):
@@ -1674,19 +2217,18 @@
 
     patient = fields.Many2One(
         'gnuhealth.patient', 'Patient',
-        select=True, help='Patient Name', on_change=['patient'],
+        select=True, help='Patient Name',
         states={'required': (Eval('state') != 'free')})
 
     appointment_date = fields.DateTime('Date and Time')
 
     institution = fields.Many2One(
-        'party.party', 'Health Center',
-        domain=[('is_institution', '=', True)],
-        help='Medical Center')
+        'gnuhealth.institution', 'Institution',
+        help='Health Care Institution')
 
     speciality = fields.Many2One(
         'gnuhealth.specialty', 'Specialty',
-        on_change_with=['healthprof'], help='Medical Specialty / Sector')
+        help='Medical Specialty / Sector')
 
     state = fields.Selection([
         (None, ''),
@@ -1793,14 +2335,16 @@
 
     @staticmethod
     def default_institution():
-        return Transaction().context.get('company')
+        return HealthInstitution().get_institution()
 
+    @fields.depends('patient')
     def on_change_patient(self):
         res = {'state': 'free'}
         if self.patient:
             res = {'state': 'confirmed'}
         return res
 
+    @fields.depends('healthprof')
     def on_change_with_speciality(self):
         # Return the Current / Main speciality of the Health Professional
         # if this speciality has been specified in the HP record.
@@ -1853,8 +2397,10 @@
     'Appointment Report'
     __name__ = 'gnuhealth.appointment.report'
 
-    identification_code = fields.Char('Identification Code')
-    ref = fields.Char('SSN')
+    # 2.6 Remove the legacy internal identification code for the institution
+    # It's now as part of the party alternative ID (medical_record)
+    # identification_code = fields.Char('Identification Code')
+    ref = fields.Char('PUID')
     patient = fields.Many2One('gnuhealth.patient', 'Patient')
     healthprof = fields.Many2One('gnuhealth.healthprofessional', 'Health Prof')
     age = fields.Function(fields.Char('Age'), 'get_patient_age')
@@ -1900,7 +2446,6 @@
             appointment.create_date,
             appointment.write_uid,
             appointment.write_date,
-            join1.right.identification_code,
             join2.right.ref,
             join1.right.id.as_('patient'),
             join2.right.sex,
@@ -2008,21 +2553,21 @@
         'gnuhealth.patient', 'Patient', readonly=True)
 
     healthprof = fields.Many2One(
-        'gnuhealth.healthprofessional', 'Prescribed by',
-        help='Health Professional who prescribed the medicament')
+        'gnuhealth.healthprofessional', 'Health Prof', readonly=True,
+        help='Health Professional who prescribed or reviewed the medicament')
+
+    institution = fields.Many2One(
+        'gnuhealth.institution', 'Institution')
 
     is_active = fields.Boolean(
         'Active',
-        on_change_with=['discontinued', 'course_completed'],
         help='Check if the patient is currently taking the medication')
 
     discontinued = fields.Boolean(
-        'Discontinued',
-        on_change_with=['is_active', 'course_completed'])
+        'Discontinued')
 
     course_completed = fields.Boolean(
-        'Course Completed',
-        on_change_with=['is_active', 'discontinued'])
+        'Course Completed')
 
     discontinued_reason = fields.Char(
         'Reason for discontinuation',
@@ -2109,6 +2654,22 @@
     frequency_prn = fields.Boolean(
         'PRN', help='Use it as needed, pro re nata')
 
+    infusion = fields.Boolean(
+        'Infusion', 
+        help='Mark if the medication is in the form of infusion' \
+        ' Intravenous, Gastrostomy tube, nasogastric, etc...' )
+    infusion_rate = fields.Float('Rate',
+            states={'invisible': Not(Bool(Eval('infusion')))})
+
+    infusion_rate_units = fields.Selection([
+        (None, ''),
+        ('mlhr', 'mL/hour'),
+        ], 'Unit Rate',
+        states={'invisible': Not(Bool(Eval('infusion')))},
+        select=True, sort=False)
+
+
+    
     @classmethod
     def __setup__(cls):
         super(PatientMedication, cls).__setup__()
@@ -2163,12 +2724,15 @@
 
             table.drop_column('template')
 
+    @fields.depends('discontinued', 'course_completed')
     def on_change_with_is_active(self):
         return not (self.discontinued or self.course_completed)
 
+    @fields.depends('is_active', 'course_completed')
     def on_change_with_discontinued(self):
         return not (self.is_active or self.course_completed)
 
+    @fields.depends('is_active', 'discontinued')
     def on_change_with_course_completed(self):
         return not (self.is_active or self.discontinued)
 
@@ -2188,6 +2752,18 @@
     def default_qty():
         return 1
 
+    @staticmethod
+    def default_institution():
+        HealthInst = Pool().get('gnuhealth.institution')
+        institution = HealthInst.get_institution()
+        return institution
+
+    @staticmethod
+    def default_healthprof():
+        pool = Pool()
+        HealthProf= pool.get('gnuhealth.healthprofessional')
+        return HealthProf.get_health_professional()
+
     @classmethod
     def validate(cls, medications):
         super(PatientMedication, cls).validate(medications)
@@ -2214,10 +2790,10 @@
     'Patient Vaccination information'
     __name__ = 'gnuhealth.vaccination'
 
-    name = fields.Many2One('gnuhealth.patient', 'Patient', readonly=True)
+    name = fields.Many2One('gnuhealth.patient', 'Patient', required=True)
 
     vaccine = fields.Many2One(
-        'product.product', 'Name', required=True,
+        'product.product', 'Vaccine', required=True,
         domain=[('is_vaccine', '=', True)],
         help='Vaccine Name. Make sure that the vaccine (product) has all the'
         ' proper information at product level. Information such as provider,'
@@ -2242,8 +2818,7 @@
         ' tracking number when available !')
 
     institution = fields.Many2One(
-        'party.party', 'Institution',
-        domain=[('is_institution', '=', True)],
+        'gnuhealth.institution', 'Institution',
         help='Medical Center where the patient is being or was vaccinated')
 
     date = fields.DateTime('Date')
@@ -2251,6 +2826,25 @@
     next_dose_date = fields.DateTime('Next Dose')
     observations = fields.Char('Observations')
 
+    institution = fields.Many2One('gnuhealth.institution', 'Institution')
+
+    healthprof = fields.Many2One(
+        'gnuhealth.healthprofessional', 'Health Prof', readonly=True,
+        help="Health Professional who administered or reviewed the vaccine \
+         information")
+
+    @staticmethod
+    def default_institution():
+        HealthInst = Pool().get('gnuhealth.institution')
+        institution = HealthInst.get_institution()
+        return institution
+
+    @staticmethod
+    def default_healthprof():
+        pool = Pool()
+        HealthProf= pool.get('gnuhealth.healthprofessional')
+        return HealthProf.get_health_professional()
+
     @classmethod
     def __setup__(cls):
         super(PatientVaccination, cls).__setup__()
@@ -2297,7 +2891,7 @@
     _rec_name = 'prescription_id'
 
     patient = fields.Many2One(
-        'gnuhealth.patient', 'Patient', required=True, on_change=['patient'])
+        'gnuhealth.patient', 'Patient', required=True)
 
     prescription_id = fields.Char(
         'Prescription ID',
@@ -2358,6 +2952,7 @@
     # Method that makes the doctor to acknowledge if there is any
     # warning in the prescription
 
+    @fields.depends('patient')
     def on_change_patient(self):
         preg_warning = False
         presc_warning_ack = True
@@ -2749,8 +3344,7 @@
     height = fields.Float('Height', help='Height in centimeters, eg 175')
 
     bmi = fields.Float(
-        'Body Mass Index',
-        on_change_with=['weight', 'height', 'bmi'])
+        'Body Mass Index')
 
     head_circumference = fields.Float(
         'Head Circumference',
@@ -2760,15 +3354,13 @@
     hip = fields.Float('Hip', help='Hip circumference in centimeters, eg 100')
 
     whr = fields.Float(
-        'WHR', help='Waist to hip ratio',
-        on_change_with=['abdominal_circ', 'hip', 'whr'])
+        'WHR', help='Waist to hip ratio')
 
     # DEPRECATION NOTE : SIGNS AND SYMPTOMS FIELDS TO BE REMOVED IN 1.6 .
     # NOW WE USE A O2M OBJECT TO MAKE IT MORE SCALABLE, CLEARER AND FUNCTIONAL
     # TO WORK WITH THE CLINICAL FINDINGS OF THE PATIENT
     loc = fields.Integer(
         'Glasgow',
-        on_change_with=['loc_verbal', 'loc_motor', 'loc_eyes'],
         help='Level of Consciousness - on Glasgow Coma Scale :  < 9 severe -'
         ' 9-12 Moderate, > 13 minor')
     loc_eyes = fields.Selection([
@@ -2888,6 +3480,13 @@
         help='Procedures / Actions to take')
 
     notes = fields.Text('Notes')
+    
+    institution = fields.Many2One('gnuhealth.institution', 'Institution')
+
+    @staticmethod
+    def default_institution():
+        return HealthInstitution().get_institution()
+
 
     @classmethod
     def __setup__(cls):
@@ -2987,12 +3586,14 @@
     def default_state():
         return 'in_progress'
 
+    @fields.depends('weight', 'height', 'bmi')
     def on_change_with_bmi(self):
         if self.height and self.weight:
             if (self.height > 0):
                 return self.weight / ((self.height / 100) ** 2)
             return 0
 
+    @fields.depends('loc_verbal', 'loc_motor', 'loc_eyes')
     def on_change_with_loc(self):
         return int(self.loc_motor) + int(self.loc_eyes) + int(self.loc_verbal)
 
@@ -3009,6 +3610,7 @@
         return datetime.now()
 
 # Calculate the WH ratio
+    @fields.depends('abdominal_circ', 'hip', 'whr')
     def on_change_with_whr(self):
         waist = self.abdominal_circ
         hip = self.hip
@@ -3098,176 +3700,3 @@
         domain=[('code', 'like', 'R%')], required=True)
 
     comments = fields.Char('Comments')
-
-
-# HEALTH CENTER / HOSPITAL INFRASTRUCTURE
-class HospitalBuilding(ModelSQL, ModelView):
-    'Hospital Building'
-    __name__ = 'gnuhealth.hospital.building'
-
-    name = fields.Char(
-        'Name', required=True,
-        help='Name of the building within the institution')
-
-    institution = fields.Many2One(
-        'party.party', 'Institution',
-        domain=[('is_institution', '=', True)],
-        help='Medical Center')
-
-    code = fields.Char('Code')
-    extra_info = fields.Text('Extra Info')
-
-
-class HospitalUnit(ModelSQL, ModelView):
-    'Hospital Unit'
-    __name__ = 'gnuhealth.hospital.unit'
-
-    name = fields.Char(
-        'Name', required=True,
-        help='Name of the unit, eg Neonatal, Intensive Care, ...')
-
-    institution = fields.Many2One(
-        'party.party', 'Institution',
-        domain=[('is_institution', '=', True)],
-        help='Medical Center')
-
-    code = fields.Char('Code')
-    extra_info = fields.Text('Extra Info')
-
-
-class HospitalOR(ModelSQL, ModelView):
-    'Operating Room'
-    __name__ = 'gnuhealth.hospital.or'
-
-    name = fields.Char(
-        'Name', required=True, help='Name of the Operating Room')
-
-    institution = fields.Many2One(
-        'party.party', 'Institution',
-        domain=[('is_institution', '=', True)],
-        help='Medical Center')
-
-    building = fields.Many2One(
-        'gnuhealth.hospital.building', 'Building', select=True)
-
-    unit = fields.Many2One('gnuhealth.hospital.unit', 'Unit')
-    extra_info = fields.Text('Extra Info')
-
-    @classmethod
-    def __setup__(cls):
-        super(HospitalOR, cls).__setup__()
-        cls._sql_constraints = [
-            ('name_uniq', 'UNIQUE(name, institution)',
-                'The Operating Room code must be unique per Health'
-                ' Center'),
-        ]
-
-
-class HospitalWard(ModelSQL, ModelView):
-    'Hospital Ward'
-    __name__ = 'gnuhealth.hospital.ward'
-
-    name = fields.Char('Name', required=True, help='Ward / Room code')
-
-    institution = fields.Many2One(
-        'party.party', 'Institution',
-        domain=[('is_institution', '=', True)],
-        help='Medical Center')
-
-    building = fields.Many2One('gnuhealth.hospital.building', 'Building')
-    floor = fields.Integer('Floor Number')
-    unit = fields.Many2One('gnuhealth.hospital.unit', 'Unit')
-
-    private = fields.Boolean(
-        'Private', help='Check this option for private room')
-
-    bio_hazard = fields.Boolean(
-        'Bio Hazard', help='Check this option if there is biological hazard')
-
-    number_of_beds = fields.Integer(
-        'Number of beds', help='Number of patients per ward')
-
-    telephone = fields.Boolean('Telephone access')
-    ac = fields.Boolean('Air Conditioning')
-    private_bathroom = fields.Boolean('Private Bathroom')
-    guest_sofa = fields.Boolean('Guest sofa-bed')
-    tv = fields.Boolean('Television')
-    internet = fields.Boolean('Internet Access')
-    refrigerator = fields.Boolean('Refrigerator')
-    microwave = fields.Boolean('Microwave')
-
-    gender = fields.Selection((
-        ('men', 'Men Ward'),
-        ('women', 'Women Ward'),
-        ('unisex', 'Unisex'),
-        ), 'Gender', required=True, sort=False)
-
-    state = fields.Selection((
-        (None, ''),
-        ('beds_available', 'Beds available'),
-        ('full', 'Full'),
-        ('na', 'Not available'),
-        ), 'Status', sort=False)
-
-    extra_info = fields.Text('Extra Info')
-
-    @staticmethod
-    def default_gender():
-        return 'unisex'
-
-    @staticmethod
-    def default_number_of_beds():
-        return 1
-
-
-class HospitalBed(ModelSQL, ModelView):
-    'Hospital Bed'
-    __name__ = 'gnuhealth.hospital.bed'
-    _rec_name = 'telephone_number'
-
-    name = fields.Many2One(
-        'product.product', 'Bed', required=True,
-        domain=[('is_bed', '=', True)],
-        help='Bed Number')
-
-    ward = fields.Many2One(
-        'gnuhealth.hospital.ward', 'Ward',
-        help='Ward or room')
-
-    bed_type = fields.Selection((
-        ('gatch', 'Gatch Bed'),
-        ('electric', 'Electric'),
-        ('stretcher', 'Stretcher'),
-        ('low', 'Low Bed'),
-        ('low_air_loss', 'Low Air Loss'),
-        ('circo_electric', 'Circo Electric'),
-        ('clinitron', 'Clinitron'),
-        ), 'Bed Type', required=True, sort=False)
-
-    telephone_number = fields.Char(
-        'Telephone Number', help='Telephone number / Extension')
-
-    extra_info = fields.Text('Extra Info')
-
-    state = fields.Selection((
-        ('free', 'Free'),
-        ('reserved', 'Reserved'),
-        ('occupied', 'Occupied'),
-        ('na', 'Not available'),
-        ), 'Status', readonly=True, sort=False)
-
-    @staticmethod
-    def default_bed_type():
-        return 'gatch'
-
-    @staticmethod
-    def default_state():
-        return 'free'
-
-    def get_rec_name(self, name):
-        if self.name:
-            return self.name.name
-
-    @classmethod
-    def search_rec_name(cls, name, clause):
-        return [('name',) + tuple(clause[1:])]

=== modified file 'health/health_view.xml'
--- health/health_view.xml	2014-01-27 08:27:26 +0000
+++ health/health_view.xml	2014-07-17 21:57:19 +0000
@@ -65,12 +65,6 @@
 
 <!-- Initial Menu -->
         <menuitem name="Health" id="gnuhealth_menu" icon="gnuhealth"/>
-        <menuitem name="Patients" id="gnuhealth_patients_menu"
-            parent="gnuhealth_menu" sequence="10" icon="gnuhealth-patient"/>
-        <menuitem name="Appointments" id="gnuhealth_appointment_menu"
-            parent="gnuhealth_menu" sequence="20" icon="gnuhealth-appointment"/>
-        <menuitem name="Prescriptions" id="gnuhealth_prescription_menu"
-            parent="gnuhealth_menu" sequence="30" icon="gnuhealth-prescription"/>
         <menuitem name="Demographics" id="gnuhealth_demographics_menu"
             parent="gnuhealth_menu" sequence="40" icon="gnuhealth-demography"/>
         <menuitem name="Reporting" id="gnuhealth_reporting_menu"
@@ -84,7 +78,7 @@
             parent="gnuhealth_conf_menu" sequence="10" icon="gnuhealth-disease"/>
         <menuitem name="Procedures" id="gnuhealth_conf_procedure"
             parent="gnuhealth_conf_menu" sequence="20" icon="gnuhealth-procedure"/>
-        <menuitem name="Health Centers" id="gnuhealth_conf_hospital"
+        <menuitem name="Institutions" id="gnuhealth_conf_institution"
             parent="gnuhealth_conf_menu" sequence="30" icon="gnuhealth-health-center"/>
         <menuitem name="Health Professionals" id="gnuhealth_conf_healthprofessionals"
             parent="gnuhealth_conf_menu" sequence="40" icon="gnuhealth-healthprofessional"/>
@@ -662,7 +656,7 @@
         <record model="ir.action.act_window" id="action_gnuhealth_medicament_category_tree">
             <field name="name">Medicament categories</field>
             <field name="res_model">gnuhealth.medicament.category</field>
-            <field name="domain">[('parent', '=', False)]</field>
+            <field name="domain">[('parent', '=', None)]</field>
         </record>
 
         <record model="ir.action.act_window.view" id="act_medicament_category_tree_view1">
@@ -794,7 +788,7 @@
         <record model="ir.action.act_window" id="action_gnuhealth_pathology_category_tree">
             <field name="name">Disease categories</field>
             <field name="res_model">gnuhealth.pathology.category</field>
-            <field name="domain">[('parent', '=', False)]</field>
+            <field name="domain">[('parent', '=', None)]</field>
         </record>
 
         <record model="ir.action.act_window.view" id="act_pathology_category_tree_view1">
@@ -915,6 +909,18 @@
             <field name="type">form</field>
             <field name="name">party_form</field>
         </record>
+        
+        <!-- Add "People" menu at party level -->
+    
+        <record model="ir.action.act_window" id="act_people_form">
+            <field name="name">People</field>
+            <field name="res_model">party.party</field>
+            <field name="domain">[('is_person', '=', True)]</field>
+        </record>
+
+        <menuitem parent="party.menu_party_form" sequence="1"
+            icon="gnuhealth-demography" 
+            action="act_people_form" id="menu_people"/>
 
 
 <!-- Add the Lastname and SSN (ref) field to the tree view of the party -->
@@ -1056,9 +1062,9 @@
             <field name="act_window" ref="action_gnuhealth_appointment_view"/>
         </record>
 
-        <menuitem action="action_gnuhealth_appointment_view"
-            id="menu_gnuhealth_appointment_list"
-            icon="gnuhealth-list" parent="gnuhealth_appointment_menu"/>
+        <menuitem name="Appointments" action="action_gnuhealth_appointment_view" 
+            id="gnuhealth_appointment_menu"
+            parent="gnuhealth_menu" sequence="20" icon="gnuhealth-appointment"/>
 
 <!-- Shortcut to the Appointments from the Patient -->
 
@@ -1179,6 +1185,19 @@
         </record>
 
 
+<!-- Shortcut to the Patient vaccinations from the patient view -->
+        <record model="ir.action.act_window" id="act_vaccination_form1">
+            <field name="name">Vaccinations</field>
+            <field name="res_model">gnuhealth.vaccination</field>
+            <field name="domain">[('name', '=', Eval('active_id'))]</field>
+        </record>
+        <record model="ir.action.keyword"
+                id="act_open_vaccination_keyword1">
+            <field name="keyword">form_relate</field>
+            <field name="model">gnuhealth.patient,-1</field>
+            <field name="action" ref="act_vaccination_form1"/>
+        </record>
+
 <!-- PATIENT DIRECTIONS - PROCEDURES / ACTIONS TO TAKE -->
 
         <record model="ir.ui.view" id="gnuhealth_directions_form">
@@ -1285,9 +1304,9 @@
             <field name="act_window" ref="action_gnuhealth_patient_view"/>
         </record>
 
-        <menuitem action="action_gnuhealth_patient_view"
-            id="menu_gnuhealth_patient_list" parent="gnuhealth_patients_menu"
-            icon="gnuhealth-list" sequence="10"/>
+        <menuitem name="Patients" id="gnuhealth_patients_menu"
+            action="action_gnuhealth_patient_view" 
+            parent="gnuhealth_menu" sequence="10" icon="gnuhealth-patient"/>
 
 
 <!-- PATIENT EVALUATION -->
@@ -1367,34 +1386,166 @@
             <field name="act_window" ref="action_gnuhealth_prescription_view"/>
         </record>
 
-        <menuitem action="action_gnuhealth_prescription_view"
-            id="menu_gnuhealth_prescription_list" icon="gnuhealth-list"
-            parent="gnuhealth_prescription_menu" sequence="10"/>
-
-
-<!-- HEALTH CENTERS -->
-
-        <record model="ir.action.act_window" id="action_gnuhealth_hospital">
-            <field name="name">Centers</field>
-            <field name="res_model">party.party</field>
-            <field name="domain">[('is_institution', '=', True)]</field>
-        </record>
-
-        <record model="ir.action.act_window.view" id="act_gnuhealth_hospital_view_list">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="party.party_view_tree"/>
-            <field name="act_window" ref="action_gnuhealth_hospital"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_gnuhealth_hospital_form">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="party.party_view_form"/>
-            <field name="act_window" ref="action_gnuhealth_hospital"/>
-        </record>
-
-        <menuitem action="action_gnuhealth_hospital"
-            id="gnuhealth_conf_hospital_center" icon="gnuhealth-list"
-            parent="gnuhealth_conf_hospital" sequence="1"/>
-
+
+        <menuitem name="Prescriptions" id="gnuhealth_prescription_menu"
+            parent="gnuhealth_menu" sequence="30"
+            action="action_gnuhealth_prescription_view"
+            icon="gnuhealth-prescription"/>
+
+<!-- Health Institutions -->
+
+        <record model="ir.ui.view" id="gnuhealth_institution_form">
+            <field name="model">gnuhealth.institution</field>
+            <field name="type">form</field>
+            <field name="name">gnuhealth_institution_form</field>
+        </record>
+
+        <record model="ir.ui.view" id="gnuhealth_institution_tree">
+            <field name="model">gnuhealth.institution</field>
+            <field name="type">tree</field>
+            <field name="name">gnuhealth_institution_tree</field>
+        </record>
+
+        <record model="ir.action.act_window" id="action_gnuhealth_institution">
+            <field name="name">Institutions</field>
+            <field name="res_model">gnuhealth.institution</field>
+        </record>
+
+        <record model="ir.action.act_window.view" id="act_gnuhealth_institution_tree">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="gnuhealth_institution_tree"/>
+            <field name="act_window" ref="action_gnuhealth_institution"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_gnuhealth_institution_form">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="gnuhealth_institution_form"/>
+            <field name="act_window" ref="action_gnuhealth_institution"/>
+        </record>
+
+        <menuitem action="action_gnuhealth_institution"
+            id="gnuhealth_menu_institution" icon="gnuhealth-health-center"
+            parent="gnuhealth_menu" sequence="15"/>
+
+<!-- Shortcut to the Health center Buildings from the Institution -->