[tryton-debian-vcs] tryton-modules-party-relationship branch upstream-3.2 updated. upstream/3.2.1-1-gab667e0
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 12 13:53:01 UTC 2014
The following commit has been merged in the upstream-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-party-relationship.git;a=commitdiff;h=upstream/3.2.1-1-gab667e0
commit ab667e0c862ee54009543a80c2a426dd8e4acde6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:28:18 2014 +0100
Adding upstream version 3.2.2.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 0093e9c..f14f919 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.2 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.1 - 2014-07-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 0cedda5..2f7d6b2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_party_relationship
-Version: 3.2.1
+Version: 3.2.2
Summary: Party Relationship module for Tryton
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/party.py b/party.py
index 5f9d989..61515e1 100644
--- a/party.py
+++ b/party.py
@@ -122,6 +122,7 @@ class PartyRelationAll(PartyRelation, ModelView):
def write(cls, *args):
pool = Pool()
Relation = pool.get('party.relation')
+ RelationType = pool.get('party.relation.type')
all_records = sum(args[0:None:2], [])
@@ -154,6 +155,10 @@ class PartyRelationAll(PartyRelation, ModelView):
reverse_values['to'] = reverse_values.pop('from_')
elif 'to' in values:
reverse_values['from_'] = reverse_values.pop('to')
+ if values.get('type'):
+ type_ = RelationType(values['type'])
+ reverse_values['type'] = (type_.reverse.id
+ if type_.reverse else None)
straight_relations = [r for r in relations if not r.id % 2]
reverse_relations = [r for r in relations if r.id % 2]
if straight_relations:
diff --git a/tryton.cfg b/tryton.cfg
index 532cef5..4e552c1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.1
+version=3.2.2
depends:
party
xml:
diff --git a/trytond_party_relationship.egg-info/PKG-INFO b/trytond_party_relationship.egg-info/PKG-INFO
index 86af66d..75ef579 100644
--- a/trytond_party_relationship.egg-info/PKG-INFO
+++ b/trytond_party_relationship.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-party-relationship
-Version: 3.2.1
+Version: 3.2.2
Summary: Party Relationship module for Tryton
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_party_relationship.egg-info/SOURCES.txt b/trytond_party_relationship.egg-info/SOURCES.txt
index f0e2566..93f87da 100644
--- a/trytond_party_relationship.egg-info/SOURCES.txt
+++ b/trytond_party_relationship.egg-info/SOURCES.txt
@@ -9,8 +9,21 @@ setup.py
tryton.cfg
./__init__.py
./party.py
+./party.xml
+./tryton.cfg
+./locale/ca_ES.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/sl_SI.po
./tests/__init__.py
./tests/test_party_relationship.py
+./view/party_form.xml
+./view/relation_form.xml
+./view/relation_tree.xml
+./view/relation_type_form.xml
+./view/relation_type_tree.xml
doc/index.rst
locale/ca_ES.po
locale/de_DE.po
--
tryton-modules-party-relationship
More information about the tryton-debian-vcs
mailing list