[tryton-debian-vcs] tryton-modules-party-relationship branch debian updated. debian/3.4.1-1-2-g89607fc
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:04:19 UTC 2015
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-party-relationship.git;a=commitdiff;h=debian/3.4.1-1-2-g89607fc
commit 89607fc6544370b9c6ab43d088ce8df9e07eb881
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 17:00:00 2015 +0200
Merging upstream version 3.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index 36c6d3b..24733d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-02-25
+Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
-
+* Add support for PyPy
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 87497df..5492537 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_party_relationship
-Version: 3.4.1
+Version: 3.6.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.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_party_relationship
==========================
@@ -65,4 +65,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index d6e4414..977d989 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of this
-#repository contains the full copyright notices and license terms.
+# 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 trytond.pool import Pool
from party import *
diff --git a/locale/es_CO.po b/locale/es_CO.po
index f5c0780..c5175ee 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,158 +2,183 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+msgctxt "error:party.address:"
+msgid "Invalid SIRET number \"%(siret)s\" on address \"%(address)s\""
+msgstr "Inválido número SIRET \"%(siret)s\" en la dirección \"%(address)s\""
+
+msgctxt "error:party.party:"
+msgid "Invalid SIREN number \"%(siren)s\" on party \"%(party)s\"."
+msgstr "Inválido número SIREN \"%(siren)s\" del tercero \"%(party)s\"."
+
+msgctxt "field:party.address,siret:"
+msgid "SIRET"
+msgstr "SIRET"
+
+msgctxt "field:party.address,siret_nic:"
+msgid "SIRET NIC"
+msgstr "SIRET NIC"
+
msgctxt "field:party.party,relations:"
msgid "Relations"
-msgstr "Relaciones"
+msgstr ""
+
+msgctxt "field:party.party,siren:"
+msgid "SIREN"
+msgstr "SIREN"
+#, 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 "Relación Inversa"
+msgstr ""
+#, 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 "Relaciones de Tercero"
+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 de Tercero"
+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 de Tercero"
+msgstr ""
msgctxt "model:party.relation.all,name:"
msgid "Party Relation"
-msgstr "Relación de Tercero"
+msgstr ""
msgctxt "model:party.relation.type,name:"
msgid "Relation Type"
-msgstr "Tipo de Relación"
-
-msgctxt "view:party.party:"
-msgid "Relations"
-msgstr "Relaciones"
-
-msgctxt "view:party.relation.all:"
-msgid "Relation"
-msgstr "Relación"
-
-msgctxt "view:party.relation.all:"
-msgid "Relations"
-msgstr "Relaciones"
-
-msgctxt "view:party.relation.type:"
-msgid "Party Relation Type"
-msgstr "Tipo Relación de Tercero"
-
-msgctxt "view:party.relation.type:"
-msgid "Party Relation Types"
-msgstr "Tipos Relación de Tercero"
+msgstr ""
diff --git a/locale/es_EC.po b/locale/es_EC.po
index cc12d4a..b667d5b 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -8,7 +8,7 @@ msgstr "Relaciones"
msgctxt "field:party.relation,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:party.relation,create_uid:"
msgid "Create User"
@@ -36,19 +36,19 @@ msgstr "Tipo"
msgctxt "field:party.relation,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:party.relation,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:party.relation.all,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:party.relation.all,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:party.relation.all,from_:"
msgid "From"
@@ -72,11 +72,11 @@ msgstr "Tipo"
msgctxt "field:party.relation.all,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:party.relation.all,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:party.relation.type,create_date:"
msgid "Create Date"
@@ -84,7 +84,7 @@ msgstr "Fecha de Creación"
msgctxt "field:party.relation.type,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:party.relation.type,id:"
msgid "ID"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 52c3222..e278743 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -32,7 +32,7 @@ msgstr "Do"
msgctxt "field:party.relation,type:"
msgid "Type"
-msgstr "Vrsta"
+msgstr "Tip"
msgctxt "field:party.relation,write_date:"
msgid "Write Date"
@@ -68,7 +68,7 @@ msgstr "Do"
msgctxt "field:party.relation.all,type:"
msgid "Type"
-msgstr "Vrsta"
+msgstr "Tip"
msgctxt "field:party.relation.all,write_date:"
msgid "Write Date"
diff --git a/party.py b/party.py
index 61515e1..1d16900 100644
--- a/party.py
+++ b/party.py
@@ -1,6 +1,6 @@
-#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 sql import Union, As, Column
+# 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 sql import Union, As, Column, Null
from trytond.pool import Pool, PoolMeta
from trytond.model import ModelSQL, ModelView, fields
@@ -50,7 +50,7 @@ class PartyRelationAll(PartyRelation, ModelView):
None: (relation, None),
'type': {
None: (type, (relation.type == type.id) &
- (type.reverse != None)),
+ (type.reverse != Null)),
},
}
diff --git a/setup.py b/setup.py
index addcec2..80296f1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-#This file is part of Tryton. The COPYRIGHT file at the top level of this
-#repository contains the full copyright notices and license terms.
+# 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 setuptools import setup
import re
@@ -41,7 +41,7 @@ if minor_version % 2:
'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
name[8:], name, version))
-requires = []
+requires = ['python-sql >= 0.4']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
@@ -87,6 +87,8 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: Implementation :: CPython',
+ 'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
],
license='GPL-3',
diff --git a/tests/__init__.py b/tests/__init__.py
index 9b02eb5..ee65d1b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,6 @@
-# The COPYRIGHT file at the top level of this repository contains the full
-# copyright notices and license terms.
+# 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
+
+__all__ = ['suite']
diff --git a/tests/test_party_relationship.py b/tests/test_party_relationship.py
index 178b5d7..fb39138 100644
--- a/tests/test_party_relationship.py
+++ b/tests/test_party_relationship.py
@@ -1,29 +1,23 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of this
-#repository contains the full copyright notices and license terms.
+# 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 POOL, DB_NAME, USER, CONTEXT, test_view,\
- test_depends, install_module, suite as tryton_suite
+from trytond.tests.test_tryton import ModuleTestCase
+from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
+from trytond.tests.test_tryton import suite as tryton_suite
from trytond.transaction import Transaction
-class TestCase(unittest.TestCase):
+class TestCase(ModuleTestCase):
'Test Party relationship module'
+ module = 'party_relationship'
def setUp(self):
- install_module('party_relationship')
+ 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 test0005views(self):
- 'Test views'
- test_view('party_relationship')
-
- def test0006depends(self):
- 'Test depends'
- test_depends()
-
def test0010reverse_relationship(self):
'Test reverse relationship'
with Transaction().start(DB_NAME, USER, context=CONTEXT):
diff --git a/tryton.cfg b/tryton.cfg
index f555dcc..32c99c2 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
party
xml:
diff --git a/trytond_party_relationship.egg-info/PKG-INFO b/trytond_party_relationship.egg-info/PKG-INFO
index abfcc3b..4771f44 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.4.1
+Version: 3.6.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.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_party_relationship
==========================
@@ -65,4 +65,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_party_relationship.egg-info/requires.txt b/trytond_party_relationship.egg-info/requires.txt
index f763c5a..f2d0f42 100644
--- a/trytond_party_relationship.egg-info/requires.txt
+++ b/trytond_party_relationship.egg-info/requires.txt
@@ -1,2 +1,3 @@
-trytond_party >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+python-sql >= 0.4
+trytond_party >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
--
tryton-modules-party-relationship
More information about the tryton-debian-vcs
mailing list