[tryton-debian-vcs] tryton-modules-party-relationship branch upstream updated. upstream/3.2.1-1-g7b507e2
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:16:21 UTC 2014
The following commit has been merged in the upstream 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-g7b507e2
commit 7b507e2fbba2c8738a5bfb676fda1e7383830594
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:14 2014 +0200
Adding upstream version 3.4.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 0093e9c..b9db783 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 3.2.1 - 2014-07-02
+Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
Version 3.2.0 - 2014-04-21
diff --git a/PKG-INFO b/PKG-INFO
index 0cedda5..b7fd0ec 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_party_relationship
-Version: 3.2.1
+Version: 3.4.0
Summary: Party Relationship module for Tryton
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_party_relationship
==========================
diff --git a/locale/sl_SI.po b/locale/es_CO.po
similarity index 73%
copy from locale/sl_SI.po
copy to locale/es_CO.po
index b50ba46..f5c0780 100644
--- a/locale/sl_SI.po
+++ b/locale/es_CO.po
@@ -4,19 +4,19 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:party.party,relations:"
msgid "Relations"
-msgstr "Razmerja"
+msgstr "Relaciones"
msgctxt "field:party.relation,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Fecha de Creación"
msgctxt "field:party.relation,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Creado por Usuario"
msgctxt "field:party.relation,from_:"
msgid "From"
-msgstr "Od"
+msgstr "De"
msgctxt "field:party.relation,id:"
msgid "ID"
@@ -24,35 +24,35 @@ msgstr "ID"
msgctxt "field:party.relation,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Nombre"
msgctxt "field:party.relation,to:"
msgid "To"
-msgstr "Do"
+msgstr "A"
msgctxt "field:party.relation,type:"
msgid "Type"
-msgstr "Vrsta"
+msgstr "Tipo"
msgctxt "field:party.relation,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Modificado por Usuario"
msgctxt "field:party.relation,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Modificado por Usuario"
msgctxt "field:party.relation.all,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Fecha de Creación"
msgctxt "field:party.relation.all,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Creado por Usuario"
msgctxt "field:party.relation.all,from_:"
msgid "From"
-msgstr "Od"
+msgstr "De"
msgctxt "field:party.relation.all,id:"
msgid "ID"
@@ -60,31 +60,31 @@ msgstr "ID"
msgctxt "field:party.relation.all,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Nombre"
msgctxt "field:party.relation.all,to:"
msgid "To"
-msgstr "Do"
+msgstr "A"
msgctxt "field:party.relation.all,type:"
msgid "Type"
-msgstr "Vrsta"
+msgstr "Tipo"
msgctxt "field:party.relation.all,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Modificado por Usuario"
msgctxt "field:party.relation.all,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Modificado por Usuario"
msgctxt "field:party.relation.type,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Fecha de Creación"
msgctxt "field:party.relation.type,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Creado por Usuario"
msgctxt "field:party.relation.type,id:"
msgid "ID"
@@ -92,68 +92,68 @@ msgstr "ID"
msgctxt "field:party.relation.type,name:"
msgid "Name"
-msgstr "Naziv"
+msgstr "Nombre"
msgctxt "field:party.relation.type,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Nombre"
msgctxt "field:party.relation.type,reverse:"
msgid "Reverse Relation"
-msgstr "Obratno razmerje"
+msgstr "Relación Inversa"
msgctxt "field:party.relation.type,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Modificado por Usuario"
msgctxt "field:party.relation.type,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Modificado por Usuario"
msgctxt "model:ir.action,name:act_relation_all"
msgid "Party Relations"
-msgstr "Partnerska razmerja"
+msgstr "Relaciones de Tercero"
msgctxt "model:ir.action,name:act_relation_type"
msgid "Relation Types"
-msgstr "Vrste razmerij"
+msgstr "Tipos de Relación"
msgctxt "model:ir.ui.menu,name:menu_relation_all"
msgid "Party Relations"
-msgstr "Partnerska razmerja"
+msgstr "Relaciones de Tercero"
msgctxt "model:ir.ui.menu,name:menu_relation_type"
msgid "Relation Types"
-msgstr "Vrste razmerij"
+msgstr "Tipos de Relación"
msgctxt "model:party.relation,name:"
msgid "Party Relation"
-msgstr "Partnersko razmerje"
+msgstr "Relación de Tercero"
msgctxt "model:party.relation.all,name:"
msgid "Party Relation"
-msgstr "Partnersko razmerje"
+msgstr "Relación de Tercero"
msgctxt "model:party.relation.type,name:"
msgid "Relation Type"
-msgstr "Vrste razmerja"
+msgstr "Tipo de Relación"
msgctxt "view:party.party:"
msgid "Relations"
-msgstr "Razmerja"
+msgstr "Relaciones"
msgctxt "view:party.relation.all:"
msgid "Relation"
-msgstr "Razmerje"
+msgstr "Relación"
msgctxt "view:party.relation.all:"
msgid "Relations"
-msgstr "Razmerja"
+msgstr "Relaciones"
msgctxt "view:party.relation.type:"
msgid "Party Relation Type"
-msgstr "Vrsta partnerskega razmerja"
+msgstr "Tipo Relación de Tercero"
msgctxt "view:party.relation.type:"
msgid "Party Relation Types"
-msgstr "Vrste partnerskega razmerja"
+msgstr "Tipos Relación de Tercero"
diff --git a/locale/sl_SI.po b/locale/es_EC.po
similarity index 73%
copy from locale/sl_SI.po
copy to locale/es_EC.po
index b50ba46..cc12d4a 100644
--- a/locale/sl_SI.po
+++ b/locale/es_EC.po
@@ -4,19 +4,19 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:party.party,relations:"
msgid "Relations"
-msgstr "Razmerja"
+msgstr "Relaciones"
msgctxt "field:party.relation,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Fecha de Creación"
msgctxt "field:party.relation,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Creado por Usuario"
msgctxt "field:party.relation,from_:"
msgid "From"
-msgstr "Od"
+msgstr "De"
msgctxt "field:party.relation,id:"
msgid "ID"
@@ -24,35 +24,35 @@ msgstr "ID"
msgctxt "field:party.relation,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Nombre"
msgctxt "field:party.relation,to:"
msgid "To"
-msgstr "Do"
+msgstr "Para"
msgctxt "field:party.relation,type:"
msgid "Type"
-msgstr "Vrsta"
+msgstr "Tipo"
msgctxt "field:party.relation,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Fecha de Modificación"
msgctxt "field:party.relation,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Modificado por Usuario"
msgctxt "field:party.relation.all,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Fecha de Creación"
msgctxt "field:party.relation.all,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Creado por Usuario"
msgctxt "field:party.relation.all,from_:"
msgid "From"
-msgstr "Od"
+msgstr "De"
msgctxt "field:party.relation.all,id:"
msgid "ID"
@@ -60,31 +60,31 @@ msgstr "ID"
msgctxt "field:party.relation.all,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Nombre"
msgctxt "field:party.relation.all,to:"
msgid "To"
-msgstr "Do"
+msgstr "Para"
msgctxt "field:party.relation.all,type:"
msgid "Type"
-msgstr "Vrsta"
+msgstr "Tipo"
msgctxt "field:party.relation.all,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Fecha de Modificación"
msgctxt "field:party.relation.all,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Modificado por Usuario"
msgctxt "field:party.relation.type,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Fecha de Creación"
msgctxt "field:party.relation.type,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Creado por Usuario"
msgctxt "field:party.relation.type,id:"
msgid "ID"
@@ -92,68 +92,68 @@ msgstr "ID"
msgctxt "field:party.relation.type,name:"
msgid "Name"
-msgstr "Naziv"
+msgstr "Nombre"
msgctxt "field:party.relation.type,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Nombre"
msgctxt "field:party.relation.type,reverse:"
msgid "Reverse Relation"
-msgstr "Obratno razmerje"
+msgstr "Relación Inversa"
msgctxt "field:party.relation.type,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Fecha de Modificación"
msgctxt "field:party.relation.type,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Modificado por Usuario"
msgctxt "model:ir.action,name:act_relation_all"
msgid "Party Relations"
-msgstr "Partnerska razmerja"
+msgstr "Relaciones entre Terceros"
msgctxt "model:ir.action,name:act_relation_type"
msgid "Relation Types"
-msgstr "Vrste razmerij"
+msgstr "Tipos de relación"
msgctxt "model:ir.ui.menu,name:menu_relation_all"
msgid "Party Relations"
-msgstr "Partnerska razmerja"
+msgstr "Relaciones entre terceros"
msgctxt "model:ir.ui.menu,name:menu_relation_type"
msgid "Relation Types"
-msgstr "Vrste razmerij"
+msgstr "Tipos de Relación"
msgctxt "model:party.relation,name:"
msgid "Party Relation"
-msgstr "Partnersko razmerje"
+msgstr "Relación entre Terceros"
msgctxt "model:party.relation.all,name:"
msgid "Party Relation"
-msgstr "Partnersko razmerje"
+msgstr "Relación entre Terceros"
msgctxt "model:party.relation.type,name:"
msgid "Relation Type"
-msgstr "Vrste razmerja"
+msgstr "Tipo de Relación"
msgctxt "view:party.party:"
msgid "Relations"
-msgstr "Razmerja"
+msgstr "Relaciones"
msgctxt "view:party.relation.all:"
msgid "Relation"
-msgstr "Razmerje"
+msgstr "Relación"
msgctxt "view:party.relation.all:"
msgid "Relations"
-msgstr "Razmerja"
+msgstr "Relaciones"
msgctxt "view:party.relation.type:"
msgid "Party Relation Type"
-msgstr "Vrsta partnerskega razmerja"
+msgstr "Tipo de Relación entre Terceros"
msgctxt "view:party.relation.type:"
msgid "Party Relation Types"
-msgstr "Vrste partnerskega razmerja"
+msgstr "Tipos de Relación entre Terceros"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index b50ba46..52c3222 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -8,11 +8,11 @@ msgstr "Razmerja"
msgctxt "field:party.relation,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:party.relation,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:party.relation,from_:"
msgid "From"
@@ -44,11 +44,11 @@ msgstr "Zapisal"
msgctxt "field:party.relation.all,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:party.relation.all,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:party.relation.all,from_:"
msgid "From"
@@ -80,11 +80,11 @@ msgstr "Zapisal"
msgctxt "field:party.relation.type,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:party.relation.type,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:party.relation.type,id:"
msgid "ID"
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/tests/test_party_relationship.py b/tests/test_party_relationship.py
index b1f84d8..178b5d7 100644
--- a/tests/test_party_relationship.py
+++ b/tests/test_party_relationship.py
@@ -125,6 +125,24 @@ class TestCase(unittest.TestCase):
self.assertEqual(relation.from_, party1)
self.assertEqual(relation.to, party3)
+ reverse_relation.type = reverse_relation_type
+ reverse_relation.save()
+ self.assertEqual(reverse_relation.from_, party3)
+ self.assertEqual(reverse_relation.to, party1)
+ self.assertEqual(reverse_relation.type, reverse_relation_type)
+ self.assertEqual(relation.from_, party1)
+ self.assertEqual(relation.to, party3)
+ self.assertEqual(relation.type, relation_type)
+
+ relation.type = relation_type
+ relation.save()
+ self.assertEqual(reverse_relation.from_, party3)
+ self.assertEqual(reverse_relation.to, party1)
+ self.assertEqual(reverse_relation.type, reverse_relation_type)
+ self.assertEqual(relation.from_, party1)
+ self.assertEqual(relation.to, party3)
+ self.assertEqual(relation.type, relation_type)
+
reverse_relation.to = party2
reverse_relation.save()
relation.save() # clear cache
diff --git a/tryton.cfg b/tryton.cfg
index 532cef5..e044b44 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.1
+version=3.4.0
depends:
party
xml:
diff --git a/trytond_party_relationship.egg-info/PKG-INFO b/trytond_party_relationship.egg-info/PKG-INFO
index 86af66d..8e0d5f7 100644
--- a/trytond_party_relationship.egg-info/PKG-INFO
+++ b/trytond_party_relationship.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-party-relationship
-Version: 3.2.1
+Version: 3.4.0
Summary: Party Relationship module for Tryton
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_party_relationship
==========================
diff --git a/trytond_party_relationship.egg-info/SOURCES.txt b/trytond_party_relationship.egg-info/SOURCES.txt
index f0e2566..d225750 100644
--- a/trytond_party_relationship.egg-info/SOURCES.txt
+++ b/trytond_party_relationship.egg-info/SOURCES.txt
@@ -9,12 +9,29 @@ 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_CO.po
+./locale/es_EC.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
locale/es_AR.po
+locale/es_CO.po
+locale/es_EC.po
locale/es_ES.po
locale/fr_FR.po
locale/sl_SI.po
diff --git a/trytond_party_relationship.egg-info/requires.txt b/trytond_party_relationship.egg-info/requires.txt
index 099085f..f763c5a 100644
--- a/trytond_party_relationship.egg-info/requires.txt
+++ b/trytond_party_relationship.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_party >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_party >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
--
tryton-modules-party-relationship
More information about the tryton-debian-vcs
mailing list