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

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://qastaging/~noskcaj/ubuntu/utopic/gnuhealth/2.6
Merge into: lp://qastaging/ubuntu/utopic-proposed/gnuhealth
Diff against target: 295167 lines (+281509/-3526)
336 files modified
Changelog (+1253/-3)
backend/plugins/crypto/__init__.py (+179/-0)
backend/plugins/crypto/doc/index.rst (+33/-0)
debian/changelog (+7/-0)
debian/control (+27/-26)
gnuhealth_install.sh (+231/-192)
gnuhealthrc (+14/-4)
health/__init__.py (+16/-12)
health/data/ethnic_groups.xml (+8/-8)
health/data/health_specialties.xml (+133/-63)
health/health.py (+1088/-659)
health/health_view.xml (+204/-53)
health/locale/el_GR.po (+10155/-0)
health/locale/es_ES.po (+563/-126)
health/locale/fr_FR.po (+589/-152)
health/locale/it_IT.po (+606/-168)
health/locale/pt_BR.po (+10178/-0)
health/locale/zh_CN.po (+10157/-0)
health/setup.py (+2/-3)
health/tryton.cfg (+1/-1)
health/view/gnuhealth_healthprofessional.xml (+15/-10)
health/view/gnuhealth_healthprofessional_tree.xml (+1/-0)
health/view/gnuhealth_hospital_bed.xml (+2/-0)
health/view/gnuhealth_hospital_bed_tree.xml (+1/-0)
health/view/gnuhealth_institution_form.xml (+45/-0)
health/view/gnuhealth_institution_operationalsector_form.xml (+8/-0)
health/view/gnuhealth_institution_operationalsector_tree.xml (+5/-0)
health/view/gnuhealth_institution_specialties_form.xml (+8/-0)
health/view/gnuhealth_institution_specialties_tree.xml (+5/-0)
health/view/gnuhealth_institution_tree.xml (+8/-0)
health/view/gnuhealth_patient_evaluation.xml (+10/-3)
health/view/gnuhealth_patient_evaluation_tree.xml (+1/-0)
health/view/gnuhealth_patient_form.xml (+17/-4)
health/view/gnuhealth_patient_medication_form.xml (+13/-2)
health/view/gnuhealth_patient_tree.xml (+1/-2)
health/view/gnuhealth_vaccination_form.xml (+21/-15)
health/view/gnuhealth_vaccination_tree.xml (+3/-0)
health/view/party_form.xml (+25/-13)
health/view/party_tree.xml (+18/-4)
health_archives/COPYING (+674/-0)
health_archives/MANIFEST.in (+1/-0)
health_archives/README (+23/-0)
health_archives/__init__.py (+31/-0)
health_archives/doc/index.rst (+6/-0)
health_archives/health_archives.py (+88/-0)
health_archives/health_archives_view.xml (+53/-0)
health_archives/icons/README (+2/-0)
health_archives/icons/archives.svg (+99/-0)
health_archives/locale/el_GR.po (+137/-0)
health_archives/locale/es_ES.po (+137/-0)
health_archives/locale/fr_FR.po (+137/-0)
health_archives/locale/it_IT.po (+137/-0)
health_archives/locale/pt_BR.po (+137/-0)
health_archives/locale/zh_CN.po (+137/-0)
health_archives/setup.py (+89/-0)
health_archives/tryton.cfg (+6/-0)
health_archives/view/gnuhealth_paper_archive_form.xml (+25/-0)
health_archives/view/gnuhealth_paper_archive_tree.xml (+10/-0)
health_calendar/locale/el_GR.po (+138/-0)
health_calendar/locale/es_ES.po (+2/-2)
health_calendar/locale/fr_FR.po (+10/-8)
health_calendar/locale/it_IT.po (+8/-7)
health_calendar/locale/pt_BR.po (+138/-0)
health_calendar/locale/zh_CN.po (+139/-0)
health_calendar/setup.py (+2/-3)
health_calendar/tryton.cfg (+1/-1)
health_calendar/wizard/wizard_health_calendar.py (+4/-3)
health_crypto/COPYING (+674/-0)
health_crypto/MANIFEST.in (+1/-0)
health_crypto/README (+22/-0)
health_crypto/__init__.py (+31/-0)
health_crypto/doc/index.rst (+23/-0)
health_crypto/health_crypto.py (+185/-0)
health_crypto/health_crypto_view.xml (+13/-0)
health_crypto/locale/el_GR.po (+77/-0)
health_crypto/locale/es_ES.po (+78/-0)
health_crypto/locale/fr_FR.po (+77/-0)
health_crypto/locale/it_IT.po (+77/-0)
health_crypto/locale/pt_BR.po (+77/-0)
health_crypto/locale/zh_CN.po (+77/-0)
health_crypto/setup.py (+89/-0)
health_crypto/tests/__init__.py (+1/-0)
health_crypto/tests/test_health_crypto.py (+41/-0)
health_crypto/tryton.cfg (+6/-0)
health_crypto/view/prescription_form.xml (+32/-0)
health_genetics/health_genetics.py (+24/-3)
health_genetics/locale/el_GR.po (+283/-0)
health_genetics/locale/es_ES.po (+2/-2)
health_genetics/locale/fr_FR.po (+2/-2)
health_genetics/locale/it_IT.po (+2/-2)
health_genetics/locale/pt_BR.po (+284/-0)
health_genetics/locale/zh_CN.po (+284/-0)
health_genetics/setup.py (+2/-3)
health_genetics/tryton.cfg (+1/-1)
health_genetics/view/gnuhealth_disease_gene_tree.xml (+4/-4)
health_genetics/view/gnuhealth_family_diseases.xml (+2/-2)
health_genetics/view/gnuhealth_family_diseases_tree.xml (+3/-3)
health_genetics/view/gnuhealth_genetic_risk_tree.xml (+2/-0)
health_gyneco/health_gyneco.py (+290/-21)
health_gyneco/health_gyneco_view.xml (+14/-0)
health_gyneco/locale/el_GR.po (+1533/-0)
health_gyneco/locale/es_ES.po (+172/-29)
health_gyneco/locale/fr_FR.po (+174/-31)
health_gyneco/locale/it_IT.po (+172/-29)
health_gyneco/locale/pt_BR.po (+1536/-0)
health_gyneco/locale/zh_CN.po (+1532/-0)
health_gyneco/setup.py (+2/-3)
health_gyneco/tryton.cfg (+1/-1)
health_gyneco/view/gnuhealth_colposcopy_history.xml (+8/-3)
health_gyneco/view/gnuhealth_colposcopy_history_tree.xml (+3/-1)
health_gyneco/view/gnuhealth_mammography_history.xml (+8/-3)
health_gyneco/view/gnuhealth_mammography_history_tree.xml (+3/-1)
health_gyneco/view/gnuhealth_menstrual_history.xml (+9/-2)
health_gyneco/view/gnuhealth_menstrual_history_tree.xml (+2/-0)
health_gyneco/view/gnuhealth_pap_history.xml (+8/-3)
health_gyneco/view/gnuhealth_pap_history_tree.xml (+3/-1)
health_gyneco/view/gnuhealth_patient.xml (+20/-20)
health_gyneco/view/gnuhealth_patient_pregnancy.xml (+16/-1)
health_gyneco/view/gnuhealth_patient_pregnancy_tree.xml (+2/-0)
health_gyneco/view/gnuhealth_perinatal.xml (+8/-0)
health_gyneco/view/gnuhealth_perinatal_tree.xml (+2/-0)
health_gyneco/view/gnuhealth_prenatal_evaluation.xml (+6/-1)
health_gyneco/view/gnuhealth_prenatal_evaluation_tree.xml (+2/-0)
health_gyneco/view/gnuhealth_puerperium_monitor.xml (+8/-0)
health_gyneco/view/gnuhealth_puerperium_monitor_tree.xml (+2/-0)
health_history/locale/el_GR.po (+541/-0)
health_history/locale/es_ES.po (+19/-11)
health_history/locale/fr_FR.po (+22/-13)
health_history/locale/it_IT.po (+19/-11)
health_history/locale/pt_BR.po (+542/-0)
health_history/locale/zh_CN.po (+541/-0)
health_history/setup.py (+2/-3)
health_history/tryton.cfg (+1/-1)
health_icd10/locale/el_GR.po (+59424/-0)
health_icd10/locale/es_ES.po (+4/-4)
health_icd10/locale/fr_FR.po (+4/-4)
health_icd10/locale/it_IT.po (+5/-5)
health_icd10/locale/pt_BR.po (+59429/-0)
health_icd10/locale/zh_CN.po (+59424/-0)
health_icd10/setup.py (+2/-3)
health_icd10/tryton.cfg (+1/-1)
health_icd10pcs/setup.py (+2/-3)
health_icd10pcs/tryton.cfg (+1/-1)
health_icpm/locale/el_GR.po (+3327/-0)
health_icpm/locale/es_ES.po (+203/-200)
health_icpm/locale/fr_FR.po (+1/-1)
health_icpm/locale/it_IT.po (+187/-186)
health_icpm/locale/pt_BR.po (+3327/-0)
health_icpm/locale/zh_CN.po (+3327/-0)
health_icpm/setup.py (+2/-3)
health_icpm/tryton.cfg (+1/-1)
health_icu/health_icu.py (+12/-11)
health_icu/locale/el_GR.po (+1203/-0)
health_icu/locale/es_ES.po (+2/-2)
health_icu/locale/fr_FR.po (+3/-3)
health_icu/locale/it_IT.po (+2/-2)
health_icu/locale/pt_BR.po (+1206/-0)
health_icu/locale/zh_CN.po (+1203/-0)
health_icu/setup.py (+2/-3)
health_icu/tryton.cfg (+1/-1)
health_imaging/locale/el_GR.po (+452/-0)
health_imaging/locale/es_ES.po (+4/-4)
health_imaging/locale/fr_FR.po (+2/-2)
health_imaging/locale/it_IT.po (+2/-2)
health_imaging/locale/pt_BR.po (+454/-0)
health_imaging/locale/zh_CN.po (+452/-0)
health_imaging/setup.py (+2/-3)
health_imaging/tryton.cfg (+1/-1)
health_inpatient/health_inpatient.py (+13/-5)
health_inpatient/health_inpatient_view.xml (+4/-7)
health_inpatient/locale/el_GR.po (+1328/-0)
health_inpatient/locale/es_ES.po (+9/-9)
health_inpatient/locale/fr_FR.po (+12/-11)
health_inpatient/locale/it_IT.po (+7/-7)
health_inpatient/locale/pt_BR.po (+1332/-0)
health_inpatient/locale/zh_CN.po (+1327/-0)
health_inpatient/setup.py (+2/-3)
health_inpatient/tryton.cfg (+1/-1)
health_inpatient/view/gnuhealth_inpatient_registration_tree.xml (+1/-0)
health_inpatient/view/gnuhealth_patient_extd_tree.xml (+1/-1)
health_inpatient_calendar/locale/el_GR.po (+28/-0)
health_inpatient_calendar/locale/es_ES.po (+1/-1)
health_inpatient_calendar/locale/fr_FR.po (+1/-1)
health_inpatient_calendar/locale/it_IT.po (+1/-1)
health_inpatient_calendar/locale/pt_BR.po (+28/-0)
health_inpatient_calendar/locale/zh_CN.po (+29/-0)
health_inpatient_calendar/setup.py (+2/-3)
health_inpatient_calendar/tryton.cfg (+1/-1)
health_lab/health_lab.py (+2/-2)
health_lab/locale/el_GR.po (+749/-0)
health_lab/locale/es_ES.po (+3/-3)
health_lab/locale/fr_FR.po (+3/-3)
health_lab/locale/it_IT.po (+4/-4)
health_lab/locale/pt_BR.po (+753/-0)
health_lab/locale/zh_CN.po (+748/-0)
health_lab/setup.py (+2/-3)
health_lab/tryton.cfg (+1/-1)
health_lifestyle/data/recreational_drugs.xml (+28/-1)
health_lifestyle/health_lifestyle.py (+17/-3)
health_lifestyle/locale/el_GR.po (+1041/-0)
health_lifestyle/locale/es_ES.po (+3/-3)
health_lifestyle/locale/fr_FR.po (+2/-2)
health_lifestyle/locale/it_IT.po (+2/-2)
health_lifestyle/locale/pt_BR.po (+1044/-0)
health_lifestyle/locale/zh_CN.po (+1043/-0)
health_lifestyle/setup.py (+2/-3)
health_lifestyle/tryton.cfg (+1/-1)
health_lifestyle/view/gnuhealth_drugs_recreational.xml (+5/-2)
health_lifestyle/view/gnuhealth_drugs_recreational_tree.xml (+2/-1)
health_mdg6/locale/el_GR.po (+55/-0)
health_mdg6/locale/es_ES.po (+1/-1)
health_mdg6/locale/fr_FR.po (+1/-1)
health_mdg6/locale/it_IT.po (+3/-3)
health_mdg6/locale/pt_BR.po (+54/-0)
health_mdg6/locale/zh_CN.po (+54/-0)
health_mdg6/setup.py (+2/-3)
health_mdg6/tryton.cfg (+1/-1)
health_ntd/setup.py (+2/-3)
health_ntd/tryton.cfg (+1/-1)
health_ntd_chagas/locale/el_GR.po (+294/-0)
health_ntd_chagas/locale/es_ES.po (+2/-2)
health_ntd_chagas/locale/fr_FR.po (+4/-4)
health_ntd_chagas/locale/it_IT.po (+4/-4)
health_ntd_chagas/locale/pt_BR.po (+296/-0)
health_ntd_chagas/locale/zh_CN.po (+294/-0)
health_ntd_chagas/setup.py (+2/-3)
health_ntd_chagas/tryton.cfg (+1/-1)
health_ntd_dengue/locale/el_GR.po (+248/-0)
health_ntd_dengue/locale/es_ES.po (+2/-2)
health_ntd_dengue/locale/fr_FR.po (+3/-3)
health_ntd_dengue/locale/it_IT.po (+3/-3)
health_ntd_dengue/locale/pt_BR.po (+250/-0)
health_ntd_dengue/locale/zh_CN.po (+249/-0)
health_ntd_dengue/setup.py (+2/-3)
health_ntd_dengue/tryton.cfg (+1/-1)
health_nursing/locale/el_GR.po (+616/-0)
health_nursing/locale/es_ES.po (+4/-4)
health_nursing/locale/fr_FR.po (+3/-3)
health_nursing/locale/it_IT.po (+4/-4)
health_nursing/locale/pt_BR.po (+618/-0)
health_nursing/locale/zh_CN.po (+616/-0)
health_nursing/setup.py (+2/-3)
health_nursing/tryton.cfg (+1/-1)
health_pediatrics/health_pediatrics.py (+88/-27)
health_pediatrics/health_pediatrics_view.xml (+3/-3)
health_pediatrics/locale/el_GR.po (+1209/-0)
health_pediatrics/locale/es_ES.po (+36/-32)
health_pediatrics/locale/fr_FR.po (+34/-29)
health_pediatrics/locale/it_IT.po (+33/-29)
health_pediatrics/locale/pt_BR.po (+1211/-0)
health_pediatrics/locale/zh_CN.po (+1209/-0)
health_pediatrics/setup.py (+2/-3)
health_pediatrics/tryton.cfg (+1/-1)
health_pediatrics/view/gnuhealth_newborn.xml (+29/-42)
health_pediatrics/view/gnuhealth_newborn_tree.xml (+2/-3)
health_pediatrics_growth_charts/locale/el_GR.po (+20/-0)
health_pediatrics_growth_charts/locale/es_ES.po (+1/-1)
health_pediatrics_growth_charts/locale/fr_FR.po (+5/-4)
health_pediatrics_growth_charts/locale/it_IT.po (+1/-1)
health_pediatrics_growth_charts/locale/pt_BR.po (+20/-0)
health_pediatrics_growth_charts/locale/zh_CN.po (+20/-0)
health_pediatrics_growth_charts/setup.py (+2/-3)
health_pediatrics_growth_charts/tryton.cfg (+1/-1)
health_pediatrics_growth_charts_who/locale/el_GR.po (+989/-0)
health_pediatrics_growth_charts_who/locale/es_ES.po (+2/-2)
health_pediatrics_growth_charts_who/locale/fr_FR.po (+810/-808)
health_pediatrics_growth_charts_who/locale/it_IT.po (+2/-2)
health_pediatrics_growth_charts_who/locale/pt_BR.po (+989/-0)
health_pediatrics_growth_charts_who/locale/zh_CN.po (+989/-0)
health_pediatrics_growth_charts_who/setup.py (+2/-3)
health_pediatrics_growth_charts_who/tryton.cfg (+1/-1)
health_profile/setup.py (+2/-3)
health_profile/tryton.cfg (+1/-1)
health_qrcodes/health_qrcodes.py (+6/-6)
health_qrcodes/locale/el_GR.po (+104/-0)
health_qrcodes/locale/es_ES.po (+2/-6)
health_qrcodes/locale/fr_FR.po (+2/-6)
health_qrcodes/locale/it_IT.po (+2/-6)
health_qrcodes/locale/pt_BR.po (+104/-0)
health_qrcodes/locale/zh_CN.po (+105/-0)
health_qrcodes/setup.py (+2/-3)
health_qrcodes/tryton.cfg (+1/-1)
health_reporting/locale/el_GR.po (+304/-0)
health_reporting/locale/es_ES.po (+2/-2)
health_reporting/locale/fr_FR.po (+3/-3)
health_reporting/locale/it_IT.po (+2/-2)
health_reporting/locale/pt_BR.po (+305/-0)
health_reporting/locale/zh_CN.po (+304/-0)
health_reporting/setup.py (+2/-3)
health_reporting/tryton.cfg (+1/-1)
health_services/locale/el_GR.po (+242/-0)
health_services/locale/es_ES.po (+2/-2)
health_services/locale/fr_FR.po (+3/-3)
health_services/locale/it_IT.po (+3/-3)
health_services/locale/pt_BR.po (+244/-0)
health_services/locale/zh_CN.po (+242/-0)
health_services/setup.py (+2/-3)
health_services/tryton.cfg (+1/-1)
health_socioeconomics/health_socioeconomics.py (+3/-3)
health_socioeconomics/locale/el_GR.po (+379/-0)
health_socioeconomics/locale/es_ES.po (+1/-1)
health_socioeconomics/locale/fr_FR.po (+6/-5)
health_socioeconomics/locale/it_IT.po (+1/-1)
health_socioeconomics/locale/pt_BR.po (+380/-0)
health_socioeconomics/locale/zh_CN.po (+379/-0)
health_socioeconomics/setup.py (+2/-3)
health_socioeconomics/tryton.cfg (+1/-1)
health_stock/health_stock.py (+6/-4)
health_stock/locale/el_GR.po (+566/-0)
health_stock/locale/es_ES.po (+3/-7)
health_stock/locale/fr_FR.po (+3/-7)
health_stock/locale/it_IT.po (+4/-8)
health_stock/locale/pt_BR.po (+566/-0)
health_stock/locale/zh_CN.po (+566/-0)
health_stock/setup.py (+2/-3)
health_stock/tryton.cfg (+1/-1)
health_surgery/health_surgery.py (+15/-9)
health_surgery/health_surgery_view.xml (+4/-6)
health_surgery/locale/el_GR.po (+807/-0)
health_surgery/locale/es_ES.po (+13/-21)
health_surgery/locale/fr_FR.po (+11/-19)
health_surgery/locale/it_IT.po (+12/-20)
health_surgery/locale/pt_BR.po (+810/-0)
health_surgery/locale/zh_CN.po (+809/-0)
health_surgery/setup.py (+2/-3)
health_surgery/tryton.cfg (+1/-1)
health_surgery/view/gnuhealth_surgery_tree.xml (+1/-0)
health_who_essential_medicines/locale/el_GR.po (+3924/-0)
health_who_essential_medicines/locale/es_ES.po (+1/-1)
health_who_essential_medicines/locale/fr_FR.po (+1/-1)
health_who_essential_medicines/locale/it_IT.po (+3/-3)
health_who_essential_medicines/locale/pt_BR.po (+3923/-0)
health_who_essential_medicines/locale/zh_CN.po (+3924/-0)
health_who_essential_medicines/setup.py (+2/-3)
health_who_essential_medicines/tryton.cfg (+1/-1)
version (+1/-1)
To merge this branch: bzr merge lp://qastaging/~noskcaj/ubuntu/utopic/gnuhealth/2.6
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+227263@code.qastaging.launchpad.net

Description of the change

New upstream release. Fixes FTBFS

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. uploaded.

review: Approve

Unmerged revisions

9. By Jackson Doak

* New upstream release.
* Use tryton 3.2.x

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: