[tryton-debian-vcs] tryton-modules-health branch upstream updated. upstream/3.0.1-1-g0464927
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Aug 10 19:13:35 UTC 2016
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-health.git;a=commitdiff;h=upstream/3.0.1-1-g0464927
commit 0464927762f7026ef5297b514c5f623bd65a5f49
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Aug 10 18:37:59 2016 +0200
Adding upstream version 3.0.2.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/PKG-INFO b/PKG-INFO
index 9e82376..afe91fb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_health
-Version: 3.0.1
+Version: 3.0.2
Summary: GNU Health core module
Home-page: http://health.gnu.org
Author: GNU Solidario
diff --git a/health.py b/health.py
index e88a029..7d9287b 100644
--- a/health.py
+++ b/health.py
@@ -143,7 +143,7 @@ class DomiciliaryUnit(ModelSQL, ModelView):
'country.country', 'Country', help='Country')
address_subdivision = fields.Many2One(
- 'country.subdivision', 'Province',
+ 'country.subdivision', 'Subdivision',
domain=[('country', '=', Eval('address_country'))],
depends=['address_country'])
@@ -472,7 +472,8 @@ class PartyPatient (ModelSQL, ModelView):
given_name = vals['name']
if 'lastname' in vals:
family_name=vals['lastname']
-
+
+ if (vals.get('is_person')):
cls.update_person_official_name(person_id,given_name,
family_name)
diff --git a/icons/stop.svg b/icons/stop.svg
index 04fd856..40971c1 100644
--- a/icons/stop.svg
+++ b/icons/stop.svg
@@ -62,143 +62,5 @@
/>
</g
>
- <metadata
- >
- <rdf:RDF
- >
- <cc:Work
- >
- <dc:format
- >image/svg+xml</dc:format
- >
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"
- />
- <cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/"
- />
- <dc:publisher
- >
- <cc:Agent
- rdf:about="http://openclipart.org/"
- >
- <dc:title
- >Openclipart</dc:title
- >
- </cc:Agent
- >
- </dc:publisher
- >
- <dc:title
- >Prohibited Sign - Forbidden Sign - Abort</dc:title
- >
- <dc:date
- >2010-04-15T21:55:32</dc:date
- >
- <dc:description
- >Prohibited Sign / Forbidden Sign / Abort - Signe Interdit / Abandon - Verboten Zeichen / Abbruch - Segnale Proibito </dc:description
- >
- <dc:source
- >https://openclipart.org/detail/48337/prohibited-sign---forbidden-sign---abort-by-palomaironique</dc:source
- >
- <dc:creator
- >
- <cc:Agent
- >
- <dc:title
- >palomaironique</dc:title
- >
- </cc:Agent
- >
- </dc:creator
- >
- <dc:subject
- >
- <rdf:Bag
- >
- <rdf:li
- >Symbol</rdf:li
- >
- <rdf:li
- >abandon</rdf:li
- >
- <rdf:li
- >abbrechen</rdf:li
- >
- <rdf:li
- >abbruch</rdf:li
- >
- <rdf:li
- >abort</rdf:li
- >
- <rdf:li
- >accès interdit</rdf:li
- >
- <rdf:li
- >annuler</rdf:li
- >
- <rdf:li
- >avorter</rdf:li
- >
- <rdf:li
- >forbidden</rdf:li
- >
- <rdf:li
- >interdit</rdf:li
- >
- <rdf:li
- >interrompre</rdf:li
- >
- <rdf:li
- >keinen Zugang</rdf:li
- >
- <rdf:li
- >no access</rdf:li
- >
- <rdf:li
- >prohibited</rdf:li
- >
- <rdf:li
- >simbolo</rdf:li
- >
- <rdf:li
- >symbol</rdf:li
- >
- <rdf:li
- >symbole</rdf:li
- >
- <rdf:li
- >verboten</rdf:li
- >
- <rdf:li
- >vietato</rdf:li
- >
- <rdf:li
- >vietato l'accesso</rdf:li
- >
- </rdf:Bag
- >
- </dc:subject
- >
- </cc:Work
- >
- <cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/"
- >
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction"
- />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution"
- />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
- />
- </cc:License
- >
- </rdf:RDF
- >
- </metadata
- >
</svg
>
diff --git a/icons/warning.svg b/icons/warning.svg
index 6ad2303..0aed732 100644
--- a/icons/warning.svg
+++ b/icons/warning.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="iso-8859-1"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -16,83 +16,28 @@
version="1.1"
inkscape:version="0.48.0 r9654"
>
- <sodipodi:namedview
- id="base"
- fit-margin-left="0"
- inkscape:snap-center="true"
- inkscape:zoom="4.0561525"
- borderopacity="1.0"
- inkscape:current-layer="svg1609"
- inkscape:cx="86.544262"
- inkscape:cy="62.751906"
- inkscape:object-paths="true"
- inkscape:window-maximized="1"
- showgrid="true"
- fit-margin-right="0"
- inkscape:snap-midpoints="true"
- bordercolor="#666666"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:snap-smooth-nodes="true"
- inkscape:object-nodes="true"
- fit-margin-bottom="0"
- inkscape:window-width="1680"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- pagecolor="#ffffff"
- inkscape:snap-object-midpoints="true"
- inkscape:window-height="988"
- fit-margin-top="0"
+ <linearGradient
+ id="linearGradient3799"
+ y2="115.22"
+ gradientUnits="userSpaceOnUse"
+ x2="120"
+ gradientTransform="translate(.84950 3.3271)"
+ y1="57.222"
+ x1="58"
+ inkscape:collect="always"
>
- <inkscape:grid
- id="grid2994"
- enabled="true"
- visible="true"
- snapvisiblegridlinesonly="true"
- type="xygrid"
- empspacing="10"
+ <stop
+ id="stop3795"
+ style="stop-color:#ffcc00"
+ offset="0"
/>
- </sodipodi:namedview
- >
- <defs
- id="defs1610"
- >
- <filter
- id="filter3789"
- inkscape:collect="always"
- color-interpolation-filters="sRGB"
- >
- <feGaussianBlur
- id="feGaussianBlur3791"
- stdDeviation="1.3360687"
- inkscape:collect="always"
- />
- </filter
- >
- <linearGradient
- id="linearGradient3799"
- y2="115.22"
- gradientUnits="userSpaceOnUse"
- x2="120"
- gradientTransform="translate(.84950 3.3271)"
- y1="57.222"
- x1="58"
- inkscape:collect="always"
- >
- <stop
- id="stop3795"
- style="stop-color:#ffcc00"
- offset="0"
- />
- <stop
- id="stop3797"
- style="stop-color:#ff9000"
- offset="1"
- />
- </linearGradient
+ <stop
+ id="stop3797"
+ style="stop-color:#ff9000"
+ offset="1"
+ />
+ </linearGradient
>
- </defs
- >
<path
id="path4153-1-1"
style="filter:url(#filter3789);stroke:#000000;stroke-width:3;fill:none"
@@ -135,119 +80,5 @@
/>
</g
>
- <metadata
- >
- <rdf:RDF
- >
- <cc:Work
- >
- <dc:format
- >image/svg+xml</dc:format
- >
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"
- />
- <cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/"
- />
- <dc:publisher
- >
- <cc:Agent
- rdf:about="http://openclipart.org/"
- >
- <dc:title
- >Openclipart</dc:title
- >
- </cc:Agent
- >
- </dc:publisher
- >
- <dc:title
- >Warning Sign</dc:title
- >
- <dc:date
- >2011-01-10T06:09:42</dc:date
- >
- <dc:description
- >Just another Warning sigh with exclamation mark. I made it symmetric with some gradient. The file in wiki (http://commons.wikimedia.org/wiki/File:Warning.svg) is not so symmetric.</dc:description
- >
- <dc:source
- >https://openclipart.org/detail/104263/warning-sign-by-kg</dc:source
- >
- <dc:creator
- >
- <cc:Agent
- >
- <dc:title
- >kg</dc:title
- >
- </cc:Agent
- >
- </dc:creator
- >
- <dc:subject
- >
- <rdf:Bag
- >
- <rdf:li
- >Caution</rdf:li
- >
- <rdf:li
- >Hazard</rdf:li
- >
- <rdf:li
- >Sign</rdf:li
- >
- <rdf:li
- >Warning</rdf:li
- >
- <rdf:li
- >Warning Sign</rdf:li
- >
- <rdf:li
- >alert</rdf:li
- >
- <rdf:li
- >carefulness</rdf:li
- >
- <rdf:li
- >danger</rdf:li
- >
- <rdf:li
- >exclamation mark</rdf:li
- >
- <rdf:li
- >protection</rdf:li
- >
- <rdf:li
- >safeguard</rdf:li
- >
- <rdf:li
- >safety</rdf:li
- >
- </rdf:Bag
- >
- </dc:subject
- >
- </cc:Work
- >
- <cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/"
- >
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction"
- />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution"
- />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
- />
- </cc:License
- >
- </rdf:RDF
- >
- </metadata
- >
</svg
>
diff --git a/report/patient_card.odt b/report/patient_card.odt
index 18f57f7..3375a65 100644
Binary files a/report/patient_card.odt and b/report/patient_card.odt differ
diff --git a/tryton.cfg b/tryton.cfg
index 5b4d17a..172d260 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.1
+version=3.0.2
depends:
company
currency
diff --git a/trytond_health.egg-info/PKG-INFO b/trytond_health.egg-info/PKG-INFO
index 261d642..0a65b88 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.1
+Version: 3.0.2
Summary: GNU Health core module
Home-page: http://health.gnu.org
Author: GNU Solidario
diff --git a/view/party_address_form.xml b/view/party_address_form.xml
index 2958bcc..b96010a 100644
--- a/view/party_address_form.xml
+++ b/view/party_address_form.xml
@@ -14,4 +14,11 @@
<label name="is_school"/>
<field name="is_school"/>
</xpath>
+ <xpath expr="/form/field[@name="country"]" position="replace_attributes">
+ <field name="country" widget="many2one"/>
+ </xpath>
+ <xpath expr="/form/field[@name="subdivision"]" position="replace_attributes">
+ <field name="subdivision" widget="many2one"/>
+ </xpath>
+
</data>
--
tryton-modules-health
More information about the tryton-debian-vcs
mailing list