[tryton-debian-vcs] tryton-modules-product-attribute branch upstream updated. upstream/3.4.1-1-g57bc752
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:04:40 UTC 2015
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product-attribute.git;a=commitdiff;h=upstream/3.4.1-1-g57bc752
commit 57bc75224f3c37205a37d0e998fb4b88d2efd346
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 17:00:00 2015 +0200
Adding upstream version 3.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 21b802a..546c219 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-02-22
+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 b9733a7..7c07a41 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product_attribute
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module with product attributes
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_product_attribute
=========================
@@ -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 6b32482..da2b562 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 product import *
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index f6fbcaf..9deaea9 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -12,7 +12,7 @@ msgstr "Usuari creació"
msgctxt "field:product.attribute,digits:"
msgid "Digits"
-msgstr "Dígits"
+msgstr "Decimals"
msgctxt "field:product.attribute,id:"
msgid "ID"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index b9e8249..c2a4cd3 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.attribute,create_date:"
msgid "Create Date"
-msgstr "Creado por Usuario"
+msgstr "Fecha de Creación"
msgctxt "field:product.attribute,create_uid:"
msgid "Create User"
@@ -68,7 +68,7 @@ msgstr "Kit"
msgctxt "field:product.attribute-product.attribute-set,create_date:"
msgid "Create Date"
-msgstr "Creado por Usuario"
+msgstr "Fecha de Creación"
msgctxt "field:product.attribute-product.attribute-set,create_uid:"
msgid "Create User"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 0c08318..a65ba44 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -4,11 +4,11 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.attribute,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:product.attribute,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:product.attribute,digits:"
msgid "Digits"
@@ -36,11 +36,11 @@ msgstr "Selección JSON"
msgctxt "field:product.attribute,selection_sorted:"
msgid "Selection Sorted"
-msgstr "Selección Ordenada"
+msgstr "Selección ordenada"
msgctxt "field:product.attribute,sets:"
msgid "Sets"
-msgstr "Grupos"
+msgstr "Grupos de atributos"
msgctxt "field:product.attribute,string:"
msgid "String"
@@ -52,11 +52,11 @@ msgstr "Tipo"
msgctxt "field:product.attribute,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:product.attribute,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:product.attribute-product.attribute-set,attribute:"
msgid "Attribute"
@@ -64,15 +64,15 @@ msgstr "Atributo"
msgctxt "field:product.attribute-product.attribute-set,attribute_set:"
msgid "Set"
-msgstr "Grupo"
+msgstr "Grupo de atributos"
msgctxt "field:product.attribute-product.attribute-set,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:product.attribute-product.attribute-set,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:product.attribute-product.attribute-set,id:"
msgid "ID"
@@ -84,11 +84,11 @@ msgstr "Nombre"
msgctxt "field:product.attribute-product.attribute-set,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:product.attribute-product.attribute-set,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:product.attribute.set,attributes:"
msgid "Attributes"
@@ -96,11 +96,11 @@ msgstr "Atributos"
msgctxt "field:product.attribute.set,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:product.attribute.set,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:product.attribute.set,id:"
msgid "ID"
@@ -116,15 +116,15 @@ msgstr "Nombre"
msgctxt "field:product.attribute.set,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:product.attribute.set,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:product.product,attribute_set:"
msgid "Set"
-msgstr "Grupo"
+msgstr "Grupo de atributos"
msgctxt "field:product.product,attributes:"
msgid "Attributes"
@@ -132,7 +132,7 @@ msgstr "Atributos"
msgctxt "field:product.template,attribute_set:"
msgid "Set"
-msgstr "Grupo"
+msgstr "Grupo de atributos"
msgctxt "help:product.attribute,selection:"
msgid "A couple of key and label separated by \":\" per line"
@@ -148,7 +148,7 @@ msgstr "Atributos"
msgctxt "model:ir.action,name:act_attribute_set_form"
msgid "Attribute Sets"
-msgstr "Grupos de Atributos"
+msgstr "Grupos de atributos"
msgctxt "model:ir.ui.menu,name:menu_attribute"
msgid "Attributes"
@@ -160,19 +160,19 @@ msgstr "Grupos de Atributos"
msgctxt "model:product.attribute,name:"
msgid "Product Attribute"
-msgstr "Atributo de Producto"
+msgstr "Atributo de producto"
msgctxt "model:product.attribute-product.attribute-set,name:"
msgid "Product Attribute - Set"
-msgstr "Atributo de Producto - Grupo"
+msgstr "Atributo de producto - Grupo"
msgctxt "model:product.attribute.set,name:"
msgid "Product Attribute Set"
-msgstr "Grupo de Atributos de Producto"
+msgstr "Grupo de atributos de producto"
msgctxt "selection:product.attribute,type_:"
msgid "Boolean"
-msgstr "Boleano"
+msgstr "Booleano"
msgctxt "selection:product.attribute,type_:"
msgid "Char"
@@ -184,11 +184,11 @@ msgstr "Fecha"
msgctxt "selection:product.attribute,type_:"
msgid "DateTime"
-msgstr "Fecha-Hora"
+msgstr "Fecha-hora"
msgctxt "selection:product.attribute,type_:"
msgid "Float"
-msgstr "Flotante"
+msgstr "Número coma flotante"
msgctxt "selection:product.attribute,type_:"
msgid "Integer"
@@ -204,11 +204,11 @@ msgstr "Selección"
msgctxt "view:product.attribute.set:"
msgid "Attribute Set"
-msgstr "Grupo de Atributos"
+msgstr "Grupo de atributos"
msgctxt "view:product.attribute.set:"
msgid "Attribute Sets"
-msgstr "Grupos de Atributos"
+msgstr "Grupos de atributos"
msgctxt "view:product.attribute:"
msgid "Attribute"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index e439748..6e5fd52 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -12,7 +12,7 @@ msgstr "Usuario creación"
msgctxt "field:product.attribute,digits:"
msgid "Digits"
-msgstr "Dígitos"
+msgstr "Decimales"
msgctxt "field:product.attribute,id:"
msgid "ID"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 4094674..f533a8c 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -44,7 +44,7 @@ msgstr "Ensembles"
msgctxt "field:product.attribute,string:"
msgid "String"
-msgstr "String"
+msgstr "Chaîne de caractères"
msgctxt "field:product.attribute,type_:"
msgid "Type"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index b6da33e..e3f7795 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -36,7 +36,7 @@ msgstr "JSON izbor"
msgctxt "field:product.attribute,selection_sorted:"
msgid "Selection Sorted"
-msgstr "Izbor razvrščen"
+msgstr "Razvrščen izbor"
msgctxt "field:product.attribute,sets:"
msgid "Sets"
diff --git a/product.py b/product.py
index 26a1916..c40a806 100644
--- a/product.py
+++ b/product.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.model import ModelSQL, ModelView, DictSchemaMixin, fields
from trytond.pool import PoolMeta
from trytond.pyson import Eval
diff --git a/setup.py b/setup.py
index 2d96eed..eff3108 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
@@ -86,6 +86,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 cca7582..e7892f4 100644
--- a/tests/__init__.py
+++ b/tests/__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 .test_product_attribute import suite
diff --git a/tests/test_product_attribute.py b/tests/test_product_attribute.py
index 1cd3f3f..b336be8 100644
--- a/tests/test_product_attribute.py
+++ b/tests/test_product_attribute.py
@@ -1,23 +1,13 @@
-#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
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import ModuleTestCase
-class ProductTestCase(unittest.TestCase):
+class ProductTestCase(ModuleTestCase):
'Test Product Attribute module'
-
- def setUp(self):
- trytond.tests.test_tryton.install_module('product_attribute')
-
- def test0005views(self):
- 'Test views'
- test_view('product')
-
- def test0006depends(self):
- 'Test depends'
- test_depends()
+ module = 'product_attribute'
def suite():
diff --git a/tryton.cfg b/tryton.cfg
index 3df795e..7bb4e02 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
ir
product
diff --git a/trytond_product_attribute.egg-info/PKG-INFO b/trytond_product_attribute.egg-info/PKG-INFO
index 5b1cb89..9d7c6f4 100644
--- a/trytond_product_attribute.egg-info/PKG-INFO
+++ b/trytond_product_attribute.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-product-attribute
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module with product attributes
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_product_attribute
=========================
@@ -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_product_attribute.egg-info/requires.txt b/trytond_product_attribute.egg-info/requires.txt
index 019b751..110e9bb 100644
--- a/trytond_product_attribute.egg-info/requires.txt
+++ b/trytond_product_attribute.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_product >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_product >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
--
tryton-modules-product-attribute
More information about the tryton-debian-vcs
mailing list