[tryton-debian-vcs] tryton-modules-party-relationship branch upstream updated. upstream/3.8.0-2-g3542fd2
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:20:28 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-party-relationship.git;a=commitdiff;h=upstream/3.8.0-2-g3542fd2
commit 3542fd28855e81c605e6a33d78e8f9fca025a894
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:23 2016 +0200
Adding upstream version 4.0.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 68cbe07..269fc46 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.1 - 2016-05-11
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.0 - 2016-05-02
* Bug fixes (see mercurial logs for details)
* Add Python3 support
diff --git a/PKG-INFO b/PKG-INFO
index df35456..6118811 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_party_relationship
-Version: 4.0.0
+Version: 4.0.1
Summary: Party Relationship module for Tryton
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/es_CO.po b/locale/es_CO.po
index f2b7a29..d642d65 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,181 +4,156 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:party.party,relations:"
msgid "Relations"
-msgstr ""
+msgstr "Relaciones"
-#, fuzzy
msgctxt "field:party.relation,create_date:"
msgid "Create Date"
msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:party.relation,create_uid:"
msgid "Create User"
msgstr "Creado por Usuario"
-#, fuzzy
msgctxt "field:party.relation,from_:"
msgid "From"
msgstr "De"
-#, fuzzy
msgctxt "field:party.relation,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:party.relation,rec_name:"
msgid "Name"
msgstr "Nombre"
-#, fuzzy
msgctxt "field:party.relation,to:"
msgid "To"
msgstr "A"
-#, fuzzy
msgctxt "field:party.relation,type:"
msgid "Type"
msgstr "Tipo"
-#, fuzzy
msgctxt "field:party.relation,write_date:"
msgid "Write Date"
msgstr "Modificado por Usuario"
-#, fuzzy
msgctxt "field:party.relation,write_uid:"
msgid "Write User"
msgstr "Modificado por Usuario"
-#, fuzzy
msgctxt "field:party.relation.all,create_date:"
msgid "Create Date"
msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:party.relation.all,create_uid:"
msgid "Create User"
msgstr "Creado por Usuario"
-#, fuzzy
msgctxt "field:party.relation.all,from_:"
msgid "From"
msgstr "De"
-#, fuzzy
msgctxt "field:party.relation.all,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:party.relation.all,rec_name:"
msgid "Name"
msgstr "Nombre"
-#, fuzzy
msgctxt "field:party.relation.all,to:"
msgid "To"
msgstr "A"
-#, fuzzy
msgctxt "field:party.relation.all,type:"
msgid "Type"
msgstr "Tipo"
-#, fuzzy
msgctxt "field:party.relation.all,write_date:"
msgid "Write Date"
msgstr "Modificado por Usuario"
-#, fuzzy
msgctxt "field:party.relation.all,write_uid:"
msgid "Write User"
msgstr "Modificado por Usuario"
-#, fuzzy
msgctxt "field:party.relation.type,create_date:"
msgid "Create Date"
msgstr "Fecha de Creación"
-#, fuzzy
msgctxt "field:party.relation.type,create_uid:"
msgid "Create User"
msgstr "Creado por Usuario"
-#, fuzzy
msgctxt "field:party.relation.type,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:party.relation.type,name:"
msgid "Name"
msgstr "Nombre"
-#, fuzzy
msgctxt "field:party.relation.type,rec_name:"
msgid "Name"
msgstr "Nombre"
msgctxt "field:party.relation.type,reverse:"
msgid "Reverse Relation"
-msgstr ""
+msgstr "Relación Inversa"
-#, fuzzy
msgctxt "field:party.relation.type,write_date:"
msgid "Write Date"
msgstr "Modificado por Usuario"
-#, fuzzy
msgctxt "field:party.relation.type,write_uid:"
msgid "Write User"
msgstr "Modificado por Usuario"
msgctxt "model:ir.action,name:act_relation_all"
msgid "Party Relations"
-msgstr ""
+msgstr "Relaciones de Tercero"
msgctxt "model:ir.action,name:act_relation_type"
msgid "Relation Types"
-msgstr ""
+msgstr "Tipos de Relación"
msgctxt "model:ir.ui.menu,name:menu_relation_all"
msgid "Party Relations"
-msgstr ""
+msgstr "Relaciones de Tercero"
msgctxt "model:ir.ui.menu,name:menu_relation_type"
msgid "Relation Types"
-msgstr ""
+msgstr "Tipos de Relación"
msgctxt "model:party.relation,name:"
msgid "Party Relation"
-msgstr ""
+msgstr "Relación de Tercero"
msgctxt "model:party.relation.all,name:"
msgid "Party Relation"
-msgstr ""
+msgstr "Relación de Tercero"
msgctxt "model:party.relation.type,name:"
msgid "Relation Type"
-msgstr ""
+msgstr "Tipo de Relación"
msgctxt "view:party.party:"
msgid "Relations"
-msgstr ""
+msgstr "Relaciones"
msgctxt "view:party.relation.all:"
msgid "Relation"
-msgstr ""
+msgstr "Relación"
msgctxt "view:party.relation.all:"
msgid "Relations"
-msgstr ""
+msgstr "Relaciones"
msgctxt "view:party.relation.type:"
msgid "Party Relation Type"
-msgstr ""
+msgstr "Tipo de Relación de Tercero"
msgctxt "view:party.relation.type:"
msgid "Party Relation Types"
-msgstr ""
+msgstr "Tipos de Relación de Tercero"
diff --git a/tryton.cfg b/tryton.cfg
index 04e50d5..63079c3 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
party
xml:
diff --git a/trytond_party_relationship.egg-info/PKG-INFO b/trytond_party_relationship.egg-info/PKG-INFO
index b10ac2e..3aa574d 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: 4.0.0
+Version: 4.0.1
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 316fe0b..000e4c1 100644
--- a/trytond_party_relationship.egg-info/SOURCES.txt
+++ b/trytond_party_relationship.egg-info/SOURCES.txt
@@ -24,11 +24,13 @@ tryton.cfg
./locale/hu_HU.po
./locale/it_IT.po
./locale/ja_JP.po
+./locale/lo_LA.po
./locale/lt_LT.po
./locale/nl_NL.po
./locale/pt_BR.po
./locale/ru_RU.po
./locale/sl_SI.po
+./locale/zh_CN.po
./tests/__init__.py
./tests/test_party_relationship.py
./view/party_form.xml
diff --git a/trytond_party_relationship.egg-info/requires.txt b/trytond_party_relationship.egg-info/requires.txt
index 894601e..d1cd3e3 100644
--- a/trytond_party_relationship.egg-info/requires.txt
+++ b/trytond_party_relationship.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-sql >= 0.4
trytond_party >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit ff790794b1b8ff47aff05654340222aa3c6f05e7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:06 2016 +0200
Adding upstream version 4.0.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 8d80dcb..68cbe07 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+* Add Python3 support
+
Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 3d2eaa4..7fe653a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
Copyright (C) 2013 NaN·tic
-Copyright (C) 2014-2015 Cédric Krier.
-Copyright (C) 2014-2015 B2CK SPRL.
+Copyright (C) 2014-2016 Cédric Krier.
+Copyright (C) 2014-2016 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index a96cc40..df35456 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_party_relationship
-Version: 3.8.0
+Version: 4.0.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.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_party_relationship
==========================
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -68,6 +69,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/locale/es_MX.po b/locale/es_MX.po
index fad5228..2ba29b1 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -138,22 +138,26 @@ msgctxt "model:party.relation.type,name:"
msgid "Relation Type"
msgstr "Tipo de relación"
+#, fuzzy
msgctxt "view:party.party:"
msgid "Relations"
-msgstr ""
+msgstr "Relaciones"
+#, fuzzy
msgctxt "view:party.relation.all:"
msgid "Relation"
-msgstr ""
+msgstr "Relaciones"
+#, fuzzy
msgctxt "view:party.relation.all:"
msgid "Relations"
-msgstr ""
+msgstr "Relaciones"
msgctxt "view:party.relation.type:"
msgid "Party Relation Type"
msgstr ""
+#, fuzzy
msgctxt "view:party.relation.type:"
msgid "Party Relation Types"
-msgstr ""
+msgstr "Relaciones entre entidades"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 1926ccd..66cc66a 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -140,20 +140,23 @@ msgstr "Kapcsolat típusa"
msgctxt "view:party.party:"
msgid "Relations"
-msgstr ""
+msgstr "Kapcsolatok"
+#, fuzzy
msgctxt "view:party.relation.all:"
msgid "Relation"
-msgstr ""
+msgstr "Kapcsolatok"
msgctxt "view:party.relation.all:"
msgid "Relations"
-msgstr ""
+msgstr "Kapcsolatok"
+#, fuzzy
msgctxt "view:party.relation.type:"
msgid "Party Relation Type"
-msgstr ""
+msgstr "Partner kapcsolat"
+#, fuzzy
msgctxt "view:party.relation.type:"
msgid "Party Relation Types"
-msgstr ""
+msgstr "Partner kapcsolat"
diff --git a/locale/es_MX.po b/locale/lo_LA.po
similarity index 76%
copy from locale/es_MX.po
copy to locale/lo_LA.po
index fad5228..58b7fd2 100644
--- a/locale/es_MX.po
+++ b/locale/lo_LA.po
@@ -4,139 +4,139 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:party.party,relations:"
msgid "Relations"
-msgstr "Relaciones"
+msgstr ""
msgctxt "field:party.relation,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
msgctxt "field:party.relation,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
msgctxt "field:party.relation,from_:"
msgid "From"
-msgstr "De"
+msgstr ""
msgctxt "field:party.relation,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:party.relation,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr ""
msgctxt "field:party.relation,to:"
msgid "To"
-msgstr "Para"
+msgstr ""
msgctxt "field:party.relation,type:"
msgid "Type"
-msgstr "Tipo"
+msgstr ""
msgctxt "field:party.relation,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
msgctxt "field:party.relation,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
msgctxt "field:party.relation.all,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
msgctxt "field:party.relation.all,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
msgctxt "field:party.relation.all,from_:"
msgid "From"
-msgstr "De"
+msgstr ""
msgctxt "field:party.relation.all,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:party.relation.all,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr ""
msgctxt "field:party.relation.all,to:"
msgid "To"
-msgstr "Para"
+msgstr ""
msgctxt "field:party.relation.all,type:"
msgid "Type"
-msgstr "Tipo"
+msgstr ""
msgctxt "field:party.relation.all,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
msgctxt "field:party.relation.all,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
msgctxt "field:party.relation.type,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
msgctxt "field:party.relation.type,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
msgctxt "field:party.relation.type,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:party.relation.type,name:"
msgid "Name"
-msgstr "Nombre"
+msgstr ""
msgctxt "field:party.relation.type,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr ""
msgctxt "field:party.relation.type,reverse:"
msgid "Reverse Relation"
-msgstr "Relación inversa"
+msgstr ""
msgctxt "field:party.relation.type,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
msgctxt "field:party.relation.type,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
msgctxt "model:ir.action,name:act_relation_all"
msgid "Party Relations"
-msgstr "Relaciones entre entidades"
+msgstr ""
msgctxt "model:ir.action,name:act_relation_type"
msgid "Relation Types"
-msgstr "Tipos de relación"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_relation_all"
msgid "Party Relations"
-msgstr "Relaciones entre entidades"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_relation_type"
msgid "Relation Types"
-msgstr "Tipos de relación"
+msgstr ""
msgctxt "model:party.relation,name:"
msgid "Party Relation"
-msgstr "Relación entre entidades"
+msgstr ""
msgctxt "model:party.relation.all,name:"
msgid "Party Relation"
-msgstr "Relación entre entidades"
+msgstr ""
msgctxt "model:party.relation.type,name:"
msgid "Relation Type"
-msgstr "Tipo de relación"
+msgstr ""
msgctxt "view:party.party:"
msgid "Relations"
diff --git a/locale/es_MX.po b/locale/zh_CN.po
similarity index 76%
copy from locale/es_MX.po
copy to locale/zh_CN.po
index fad5228..58b7fd2 100644
--- a/locale/es_MX.po
+++ b/locale/zh_CN.po
@@ -4,139 +4,139 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:party.party,relations:"
msgid "Relations"
-msgstr "Relaciones"
+msgstr ""
msgctxt "field:party.relation,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
msgctxt "field:party.relation,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
msgctxt "field:party.relation,from_:"
msgid "From"
-msgstr "De"
+msgstr ""
msgctxt "field:party.relation,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:party.relation,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr ""
msgctxt "field:party.relation,to:"
msgid "To"
-msgstr "Para"
+msgstr ""
msgctxt "field:party.relation,type:"
msgid "Type"
-msgstr "Tipo"
+msgstr ""
msgctxt "field:party.relation,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
msgctxt "field:party.relation,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
msgctxt "field:party.relation.all,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
msgctxt "field:party.relation.all,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
msgctxt "field:party.relation.all,from_:"
msgid "From"
-msgstr "De"
+msgstr ""
msgctxt "field:party.relation.all,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:party.relation.all,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr ""
msgctxt "field:party.relation.all,to:"
msgid "To"
-msgstr "Para"
+msgstr ""
msgctxt "field:party.relation.all,type:"
msgid "Type"
-msgstr "Tipo"
+msgstr ""
msgctxt "field:party.relation.all,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
msgctxt "field:party.relation.all,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
msgctxt "field:party.relation.type,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
msgctxt "field:party.relation.type,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
msgctxt "field:party.relation.type,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:party.relation.type,name:"
msgid "Name"
-msgstr "Nombre"
+msgstr ""
msgctxt "field:party.relation.type,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr ""
msgctxt "field:party.relation.type,reverse:"
msgid "Reverse Relation"
-msgstr "Relación inversa"
+msgstr ""
msgctxt "field:party.relation.type,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
msgctxt "field:party.relation.type,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
msgctxt "model:ir.action,name:act_relation_all"
msgid "Party Relations"
-msgstr "Relaciones entre entidades"
+msgstr ""
msgctxt "model:ir.action,name:act_relation_type"
msgid "Relation Types"
-msgstr "Tipos de relación"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_relation_all"
msgid "Party Relations"
-msgstr "Relaciones entre entidades"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_relation_type"
msgid "Relation Types"
-msgstr "Tipos de relación"
+msgstr ""
msgctxt "model:party.relation,name:"
msgid "Party Relation"
-msgstr "Relación entre entidades"
+msgstr ""
msgctxt "model:party.relation.all,name:"
msgid "Party Relation"
-msgstr "Relación entre entidades"
+msgstr ""
msgctxt "model:party.relation.type,name:"
msgid "Relation Type"
-msgstr "Tipo de relación"
+msgstr ""
msgctxt "view:party.party:"
msgid "Relations"
diff --git a/party.py b/party.py
index 1d16900..077d29f 100644
--- a/party.py
+++ b/party.py
@@ -7,7 +7,6 @@ from trytond.model import ModelSQL, ModelView, fields
from trytond.transaction import Transaction
__all__ = ['RelationType', 'PartyRelation', 'PartyRelationAll', 'Party']
-__metaclass__ = PoolMeta
class RelationType(ModelSQL, ModelView):
@@ -137,7 +136,7 @@ class PartyRelationAll(PartyRelation, ModelView):
local_cache.clear()
# Clean cursor cache
- for cache in Transaction().cursor.cache.itervalues():
+ for cache in Transaction().cache.itervalues():
if cls.__name__ in cache:
for record in all_records:
for record_id in (record.id, record.reverse_id):
@@ -178,7 +177,7 @@ class PartyRelationAll(PartyRelation, ModelView):
Transaction().counter += 1
# Clean cursor cache
- for cache in Transaction().cursor.cache.values():
+ for cache in Transaction().cache.values():
for cache in (cache, cache.get('_language_cache', {}).values()):
if cls.__name__ in cache:
for record in relations:
@@ -190,6 +189,7 @@ class PartyRelationAll(PartyRelation, ModelView):
class Party:
+ __metaclass__ = PoolMeta
__name__ = 'party.party'
relations = fields.One2Many('party.relation.all', 'from_', 'Relations')
diff --git a/setup.py b/setup.py
index da2799f..f77a395 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,17 @@
from setuptools import setup
import re
import os
-import ConfigParser
+import io
+try:
+ from configparser import ConfigParser
+except ImportError:
+ from ConfigParser import ConfigParser
def read(fname):
- return open(os.path.join(os.path.dirname(__file__), fname)).read()
+ return io.open(
+ os.path.join(os.path.dirname(__file__), fname),
+ 'r', encoding='utf-8').read()
def get_require_version(name):
@@ -21,7 +27,7 @@ def get_require_version(name):
major_version, minor_version + 1)
return require
-config = ConfigParser.ConfigParser()
+config = ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
@@ -43,7 +49,7 @@ if minor_version % 2:
requires = ['python-sql >= 0.4']
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
@@ -77,6 +83,7 @@ setup(name=name,
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
+ 'Natural Language :: Chinese (Simplified)',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
@@ -90,6 +97,9 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3.3',
+ 'Programming Language :: Python :: 3.4',
+ 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
@@ -103,5 +113,6 @@ setup(name=name,
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
+ use_2to3=True,
tests_require=tests_require,
)
diff --git a/tests/__init__.py b/tests/__init__.py
index ee65d1b..66eae30 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,9 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
-from .test_party_relationship import suite
+try:
+ from trytond.modules.party_relationship.tests.test_party_relationship import suite
+except ImportError:
+ from .test_party_relationship import suite
__all__ = ['suite']
diff --git a/tests/test_party_relationship.py b/tests/test_party_relationship.py
index fb39138..1a30b84 100644
--- a/tests/test_party_relationship.py
+++ b/tests/test_party_relationship.py
@@ -1,170 +1,177 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
import unittest
-from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
from trytond.tests.test_tryton import suite as tryton_suite
-from trytond.transaction import Transaction
+from trytond.pool import Pool
class TestCase(ModuleTestCase):
'Test Party relationship module'
module = 'party_relationship'
- def setUp(self):
- super(TestCase, self).setUp()
- self.party = POOL.get('party.party')
- self.relation_type = POOL.get('party.relation.type')
- self.relation = POOL.get('party.relation')
- self.relation_all = POOL.get('party.relation.all')
-
- def test0010reverse_relationship(self):
+ @with_transaction()
+ def test_reverse_relationship(self):
'Test reverse relationship'
- with Transaction().start(DB_NAME, USER, context=CONTEXT):
- employee_of, = self.relation_type.create([{
- 'name': 'Employee of',
- }])
- works_for, = self.relation_type.create([{
- 'name': 'Works for',
- 'reverse': employee_of.id,
- }])
- self.relation_type.write([employee_of], {
- 'reverse': works_for.id,
- })
-
- company, employee = self.party.create([{
- 'name': 'Company',
- }, {
- 'name': 'Employee',
- }])
-
- self.relation.create([{
- 'from_': company.id,
- 'to': employee.id,
- 'type': employee_of.id
- }])
- company_relation, = company.relations
- employee_relation, = employee.relations
- self.assertEqual(company_relation.type, employee_of)
- self.assertEqual(company_relation.to, employee)
- self.assertEqual(employee_relation.type, works_for)
- self.assertEqual(employee_relation.to, company)
-
- def test0020without_reverse_relationship(self):
+ pool = Pool()
+ Party = pool.get('party.party')
+ RelationType = pool.get('party.relation.type')
+ Relation = pool.get('party.relation')
+
+ employee_of, = RelationType.create([{
+ 'name': 'Employee of',
+ }])
+ works_for, = RelationType.create([{
+ 'name': 'Works for',
+ 'reverse': employee_of.id,
+ }])
+ RelationType.write([employee_of], {
+ 'reverse': works_for.id,
+ })
+
+ company, employee = Party.create([{
+ 'name': 'Company',
+ }, {
+ 'name': 'Employee',
+ }])
+
+ Relation.create([{
+ 'from_': company.id,
+ 'to': employee.id,
+ 'type': employee_of.id
+ }])
+ company_relation, = company.relations
+ employee_relation, = employee.relations
+ self.assertEqual(company_relation.type, employee_of)
+ self.assertEqual(company_relation.to, employee)
+ self.assertEqual(employee_relation.type, works_for)
+ self.assertEqual(employee_relation.to, company)
+
+ @with_transaction()
+ def test_without_reverse_relationship(self):
'Test without reverse relationship'
- with Transaction().start(DB_NAME, USER, context=CONTEXT):
- employee_of, = self.relation_type.create([{
- 'name': 'Employee of',
- }])
- works_for, = self.relation_type.create([{
- 'name': 'Works for',
- }])
-
- company, employee = self.party.create([{
- 'name': 'Company',
- }, {
- 'name': 'Employee',
- }])
-
- self.relation.create([{
- 'from_': company.id,
- 'to': employee.id,
- 'type': employee_of.id
- }])
- company_relation, = company.relations
- self.assertEqual(len(employee.relations), 0)
- self.assertEqual(company_relation.type, employee_of)
- self.assertEqual(company_relation.to, employee)
-
- def test0030relation_all(self):
+ pool = Pool()
+ Party = pool.get('party.party')
+ RelationType = pool.get('party.relation.type')
+ Relation = pool.get('party.relation')
+
+ employee_of, = RelationType.create([{
+ 'name': 'Employee of',
+ }])
+ works_for, = RelationType.create([{
+ 'name': 'Works for',
+ }])
+
+ company, employee = Party.create([{
+ 'name': 'Company',
+ }, {
+ 'name': 'Employee',
+ }])
+
+ Relation.create([{
+ 'from_': company.id,
+ 'to': employee.id,
+ 'type': employee_of.id
+ }])
+ company_relation, = company.relations
+ self.assertEqual(len(employee.relations), 0)
+ self.assertEqual(company_relation.type, employee_of)
+ self.assertEqual(company_relation.to, employee)
+
+ @with_transaction()
+ def test_relation_all(self):
'Test relation all'
- with Transaction().start(DB_NAME, USER, context=CONTEXT):
- relation_type, reverse_relation_type = self.relation_type.create([{
- 'name': 'Relation',
- }, {
- 'name': 'Reverse',
- }])
- relation_type.reverse = reverse_relation_type
- relation_type.save()
- reverse_relation_type.reverse = relation_type
- reverse_relation_type.save()
-
- party1, party2, party3 = self.party.create([{
- 'name': 'Party 1',
- }, {
- 'name': 'Party 2',
- }, {
- 'name': 'Party 3',
- }])
-
- relation, = self.relation_all.create([{
- 'from_': party1.id,
- 'to': party2.id,
- 'type': relation_type.id,
- }])
- self.assertFalse(relation.id % 2)
- reverse_relation, = self.relation_all.search([
- ('id', '!=', relation.id),
- ])
- self.assertTrue(reverse_relation.id % 2)
- self.assertEqual(relation.reverse_id, reverse_relation.id)
- self.assertEqual(reverse_relation.from_, party2)
- self.assertEqual(reverse_relation.to, party1)
-
- reverse_relation.from_ = party3
- reverse_relation.save()
- relation.save() # clear cache
- self.assertEqual(reverse_relation.from_, party3)
- self.assertEqual(reverse_relation.to, party1)
- 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
- self.assertEqual(reverse_relation.from_, party3)
- self.assertEqual(reverse_relation.to, party2)
- self.assertEqual(relation.from_, party2)
- self.assertEqual(relation.to, party3)
-
- reverse_relation.from_ = party2
- reverse_relation.to = party1
- reverse_relation.save()
- relation.save() # clear cache
- self.assertEqual(reverse_relation.from_, party2)
- self.assertEqual(reverse_relation.to, party1)
- self.assertEqual(relation.from_, party1)
- self.assertEqual(relation.to, party2)
-
- relation.from_ = party2
- relation.to = party1
- relation.save()
- reverse_relation.save() # clear cache
- self.assertEqual(relation.from_, party2)
- self.assertEqual(relation.to, party1)
- self.assertEqual(reverse_relation.from_, party1)
- self.assertEqual(reverse_relation.to, party2)
-
- self.relation_all.delete([reverse_relation])
- self.assertEqual(self.relation_all.search([]), [])
+ pool = Pool()
+ Party = pool.get('party.party')
+ RelationType = pool.get('party.relation.type')
+ RelationAll = pool.get('party.relation.all')
+
+ relation_type, reverse_relation_type = RelationType.create([{
+ 'name': 'Relation',
+ }, {
+ 'name': 'Reverse',
+ }])
+ relation_type.reverse = reverse_relation_type
+ relation_type.save()
+ reverse_relation_type.reverse = relation_type
+ reverse_relation_type.save()
+
+ party1, party2, party3 = Party.create([{
+ 'name': 'Party 1',
+ }, {
+ 'name': 'Party 2',
+ }, {
+ 'name': 'Party 3',
+ }])
+
+ relation, = RelationAll.create([{
+ 'from_': party1.id,
+ 'to': party2.id,
+ 'type': relation_type.id,
+ }])
+ self.assertFalse(relation.id % 2)
+ reverse_relation, = RelationAll.search([
+ ('id', '!=', relation.id),
+ ])
+ self.assertTrue(reverse_relation.id % 2)
+ self.assertEqual(relation.reverse_id, reverse_relation.id)
+ self.assertEqual(reverse_relation.from_, party2)
+ self.assertEqual(reverse_relation.to, party1)
+
+ reverse_relation.from_ = party3
+ reverse_relation.save()
+ relation.save() # clear cache
+ self.assertEqual(reverse_relation.from_, party3)
+ self.assertEqual(reverse_relation.to, party1)
+ 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
+ self.assertEqual(reverse_relation.from_, party3)
+ self.assertEqual(reverse_relation.to, party2)
+ self.assertEqual(relation.from_, party2)
+ self.assertEqual(relation.to, party3)
+
+ reverse_relation.from_ = party2
+ reverse_relation.to = party1
+ reverse_relation.save()
+ relation.save() # clear cache
+ self.assertEqual(reverse_relation.from_, party2)
+ self.assertEqual(reverse_relation.to, party1)
+ self.assertEqual(relation.from_, party1)
+ self.assertEqual(relation.to, party2)
+
+ relation.from_ = party2
+ relation.to = party1
+ relation.save()
+ reverse_relation.save() # clear cache
+ self.assertEqual(relation.from_, party2)
+ self.assertEqual(relation.to, party1)
+ self.assertEqual(reverse_relation.from_, party1)
+ self.assertEqual(reverse_relation.to, party2)
+
+ RelationAll.delete([reverse_relation])
+ self.assertEqual(RelationAll.search([]), [])
def suite():
diff --git a/tryton.cfg b/tryton.cfg
index e964ec6..04e50d5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
party
xml:
diff --git a/trytond_party_relationship.egg-info/PKG-INFO b/trytond_party_relationship.egg-info/PKG-INFO
index 3ded25f..b10ac2e 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.8.0
+Version: 4.0.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.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: trytond_party_relationship
==========================
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -68,6 +69,9 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_party_relationship.egg-info/SOURCES.txt b/trytond_party_relationship.egg-info/SOURCES.txt
index d4eb0a8..316fe0b 100644
--- a/trytond_party_relationship.egg-info/SOURCES.txt
+++ b/trytond_party_relationship.egg-info/SOURCES.txt
@@ -50,11 +50,13 @@ locale/fr_FR.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
+locale/lo_LA.po
locale/lt_LT.po
locale/nl_NL.po
locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
+locale/zh_CN.po
trytond_party_relationship.egg-info/PKG-INFO
trytond_party_relationship.egg-info/SOURCES.txt
trytond_party_relationship.egg-info/dependency_links.txt
diff --git a/trytond_party_relationship.egg-info/requires.txt b/trytond_party_relationship.egg-info/requires.txt
index cf56551..894601e 100644
--- a/trytond_party_relationship.egg-info/requires.txt
+++ b/trytond_party_relationship.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-sql >= 0.4
-trytond_party >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_party >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-party-relationship
More information about the tryton-debian-vcs
mailing list