[tryton-debian-vcs] tryton-modules-health branch debian updated. debian/3.0.5-1-2-g6725a73
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Feb 14 10:30:43 UTC 2017
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-health.git;a=commitdiff;h=debian/3.0.5-1-2-g6725a73
commit 6725a73061a8486859891fc9b1fa876237d72164
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 14 09:04:59 2017 +0100
Releasing debian version 3.0.6-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 308cbbb..272853b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-health (3.0.6-1) unstable; urgency=medium
+
+ * Merging upstream version 3.0.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 14 Feb 2017 09:04:59 +0100
+
tryton-modules-health (3.0.5-1) unstable; urgency=medium
* Merging upstream version 3.0.5.
commit 82c9c95e45c62b4bac4fb4b419d4e3dea39769aa
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 14 09:04:59 2017 +0100
Merging upstream version 3.0.6.
diff --git a/PKG-INFO b/PKG-INFO
index f953939..e47e1fc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_health
-Version: 3.0.5
+Version: 3.0.6
Summary: GNU Health core module
Home-page: http://health.gnu.org
Author: GNU Solidario
diff --git a/health.py b/health.py
index cd1eaf7..5edcca5 100644
--- a/health.py
+++ b/health.py
@@ -2707,15 +2707,15 @@ class PatientData(ModelSQL, ModelView):
'''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)
+ allergies=allergies + disease.pathology.rec_name + "\n"
+ conditions.append (disease.pathology.rec_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"
+ disease.pathology.rec_name + "\n"
return allergies + other_conditions
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff --git a/tryton.cfg b/tryton.cfg
index c1f0db2..7fea22d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.5
+version=3.0.6
depends:
company
currency
diff --git a/trytond_health.egg-info/PKG-INFO b/trytond_health.egg-info/PKG-INFO
index 88c3123..28a023d 100644
--- a/trytond_health.egg-info/PKG-INFO
+++ b/trytond_health.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-health
-Version: 3.0.5
+Version: 3.0.6
Summary: GNU Health core module
Home-page: http://health.gnu.org
Author: GNU Solidario
--
tryton-modules-health
More information about the tryton-debian-vcs
mailing list