[tryton-debian-vcs] tryton-modules-product-attribute branch upstream updated. upstream/3.8.0-1-gd403119

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:21:40 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-product-attribute.git;a=commitdiff;h=upstream/3.8.0-1-gd403119

commit d403119e5294eb042718689062c55082362ab253
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 27 18:26:07 2016 +0200

    Adding upstream version 4.0.0.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 2905b9b..9de2516 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 776aee6..442fb2d 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2012-2015 Cédric Krier.
-Copyright (C) 2012-2015 B2CK SPRL.
+Copyright (C) 2012-2016 Cédric Krier.
+Copyright (C) 2012-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 c2c4b6d..a7c32d3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_product_attribute
-Version: 3.8.0
+Version: 4.0.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.8/
+Download-URL: http://downloads.tryton.org/4.0/
 Description: trytond_product_attribute
         =========================
         
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
 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 b153e2d..3273333 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -202,18 +202,22 @@ msgctxt "selection:product.attribute,type_:"
 msgid "Selection"
 msgstr "Selección"
 
+#, fuzzy
 msgctxt "view:product.attribute.set:"
 msgid "Attribute Set"
-msgstr ""
+msgstr "Grupos de atributos"
 
+#, fuzzy
 msgctxt "view:product.attribute.set:"
 msgid "Attribute Sets"
-msgstr ""
+msgstr "Grupos de atributos"
 
+#, fuzzy
 msgctxt "view:product.attribute:"
 msgid "Attribute"
-msgstr ""
+msgstr "Atributo"
 
+#, fuzzy
 msgctxt "view:product.attribute:"
 msgid "Attributes"
-msgstr ""
+msgstr "Atributos"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 5bb515a..e7e2031 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -64,7 +64,7 @@ msgstr "Tulajdonságok"
 
 msgctxt "field:product.attribute-product.attribute-set,attribute_set:"
 msgid "Set"
-msgstr ""
+msgstr "Megad"
 
 msgctxt "field:product.attribute-product.attribute-set,create_date:"
 msgid "Create Date"
@@ -122,17 +122,19 @@ msgctxt "field:product.attribute.set,write_uid:"
 msgid "Write User"
 msgstr "Által módosítva"
 
+#, fuzzy
 msgctxt "field:product.product,attribute_set:"
 msgid "Set"
-msgstr ""
+msgstr "Megad"
 
 msgctxt "field:product.product,attributes:"
 msgid "Attributes"
 msgstr "Tulajdonságok"
 
+#, fuzzy
 msgctxt "field:product.template,attribute_set:"
 msgid "Set"
-msgstr ""
+msgstr "Rész"
 
 msgctxt "help:product.attribute,selection:"
 msgid "A couple of key and label separated by \":\" per line"
@@ -212,8 +214,8 @@ msgstr ""
 
 msgctxt "view:product.attribute:"
 msgid "Attribute"
-msgstr ""
+msgstr "Tulajdonságok"
 
 msgctxt "view:product.attribute:"
 msgid "Attributes"
-msgstr ""
+msgstr "Tulajdonságok"
diff --git a/locale/hu_HU.po b/locale/lo_LA.po
similarity index 80%
copy from locale/hu_HU.po
copy to locale/lo_LA.po
index 5bb515a..9672754 100644
--- a/locale/hu_HU.po
+++ b/locale/lo_LA.po
@@ -4,63 +4,63 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "field:product.attribute,create_date:"
 msgid "Create Date"
-msgstr "Létrehozás dátuma"
+msgstr ""
 
 msgctxt "field:product.attribute,create_uid:"
 msgid "Create User"
-msgstr "Által létrehozva"
+msgstr ""
 
 msgctxt "field:product.attribute,digits:"
 msgid "Digits"
-msgstr "Számjegyek"
+msgstr ""
 
 msgctxt "field:product.attribute,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:product.attribute,name:"
 msgid "Name"
-msgstr "Név"
+msgstr ""
 
 msgctxt "field:product.attribute,rec_name:"
 msgid "Name"
-msgstr "Név"
+msgstr ""
 
 msgctxt "field:product.attribute,selection:"
 msgid "Selection"
-msgstr "Kiválasztás"
+msgstr ""
 
 msgctxt "field:product.attribute,selection_json:"
 msgid "Selection JSON"
-msgstr "Kijelölés JSON"
+msgstr ""
 
 msgctxt "field:product.attribute,selection_sorted:"
 msgid "Selection Sorted"
-msgstr "Válogatott kiválasztás"
+msgstr ""
 
 msgctxt "field:product.attribute,sets:"
 msgid "Sets"
-msgstr "Rész"
+msgstr ""
 
 msgctxt "field:product.attribute,string:"
 msgid "String"
-msgstr "Karakterlánc"
+msgstr ""
 
 msgctxt "field:product.attribute,type_:"
 msgid "Type"
-msgstr "Típus"
+msgstr ""
 
 msgctxt "field:product.attribute,write_date:"
 msgid "Write Date"
-msgstr "Utolsó módosítás dátuma"
+msgstr ""
 
 msgctxt "field:product.attribute,write_uid:"
 msgid "Write User"
-msgstr "Által módosítva"
+msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,attribute:"
 msgid "Attribute"
-msgstr "Tulajdonságok"
+msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,attribute_set:"
 msgid "Set"
@@ -68,59 +68,59 @@ msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,create_date:"
 msgid "Create Date"
-msgstr "Létrehozás dátuma"
+msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,create_uid:"
 msgid "Create User"
-msgstr "Által létrehozva"
+msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,rec_name:"
 msgid "Name"
-msgstr "Név"
+msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,write_date:"
 msgid "Write Date"
-msgstr "Utolsó módosítás dátuma"
+msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,write_uid:"
 msgid "Write User"
-msgstr "Által módosítva"
+msgstr ""
 
 msgctxt "field:product.attribute.set,attributes:"
 msgid "Attributes"
-msgstr "Tulajdonságok"
+msgstr ""
 
 msgctxt "field:product.attribute.set,create_date:"
 msgid "Create Date"
-msgstr "Létrehozás dátuma"
+msgstr ""
 
 msgctxt "field:product.attribute.set,create_uid:"
 msgid "Create User"
-msgstr "Által létrehozva"
+msgstr ""
 
 msgctxt "field:product.attribute.set,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:product.attribute.set,name:"
 msgid "Name"
-msgstr "Név"
+msgstr ""
 
 msgctxt "field:product.attribute.set,rec_name:"
 msgid "Name"
-msgstr "Név"
+msgstr ""
 
 msgctxt "field:product.attribute.set,write_date:"
 msgid "Write Date"
-msgstr "Utolsó módosítás dátuma"
+msgstr ""
 
 msgctxt "field:product.attribute.set,write_uid:"
 msgid "Write User"
-msgstr "Által módosítva"
+msgstr ""
 
 msgctxt "field:product.product,attribute_set:"
 msgid "Set"
@@ -128,7 +128,7 @@ msgstr ""
 
 msgctxt "field:product.product,attributes:"
 msgid "Attributes"
-msgstr "Tulajdonságok"
+msgstr ""
 
 msgctxt "field:product.template,attribute_set:"
 msgid "Set"
@@ -144,7 +144,7 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_attribute_form"
 msgid "Attributes"
-msgstr "Tulajdonságok"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_attribute_set_form"
 msgid "Attribute Sets"
@@ -152,7 +152,7 @@ msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_attribute"
 msgid "Attributes"
-msgstr "Tulajdonságok"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_attribute_set"
 msgid "Attribute Sets"
@@ -160,15 +160,15 @@ msgstr ""
 
 msgctxt "model:product.attribute,name:"
 msgid "Product Attribute"
-msgstr "Termékek jellemzői"
+msgstr ""
 
 msgctxt "model:product.attribute-product.attribute-set,name:"
 msgid "Product Attribute - Set"
-msgstr "Termék jellemzői"
+msgstr ""
 
 msgctxt "model:product.attribute.set,name:"
 msgid "Product Attribute Set"
-msgstr "Termék tulajdonság"
+msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "Boolean"
@@ -176,15 +176,15 @@ msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "Char"
-msgstr "Karakter"
+msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "Date"
-msgstr "Dátum"
+msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "DateTime"
-msgstr "Dátum és idő"
+msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "Float"
@@ -192,15 +192,15 @@ msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "Integer"
-msgstr "Egész szám"
+msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "Numeric"
-msgstr "Numerikus"
+msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "Selection"
-msgstr "Kiválasztás"
+msgstr ""
 
 msgctxt "view:product.attribute.set:"
 msgid "Attribute Set"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index b090afd..1dc8e7c 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -44,9 +44,10 @@ msgctxt "field:product.attribute,selection_sorted:"
 msgid "Selection Sorted"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:product.attribute,sets:"
 msgid "Sets"
-msgstr ""
+msgstr "Применить"
 
 msgctxt "field:product.attribute,string:"
 msgid "String"
diff --git a/locale/hu_HU.po b/locale/zh_CN.po
similarity index 80%
copy from locale/hu_HU.po
copy to locale/zh_CN.po
index 5bb515a..9672754 100644
--- a/locale/hu_HU.po
+++ b/locale/zh_CN.po
@@ -4,63 +4,63 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "field:product.attribute,create_date:"
 msgid "Create Date"
-msgstr "Létrehozás dátuma"
+msgstr ""
 
 msgctxt "field:product.attribute,create_uid:"
 msgid "Create User"
-msgstr "Által létrehozva"
+msgstr ""
 
 msgctxt "field:product.attribute,digits:"
 msgid "Digits"
-msgstr "Számjegyek"
+msgstr ""
 
 msgctxt "field:product.attribute,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:product.attribute,name:"
 msgid "Name"
-msgstr "Név"
+msgstr ""
 
 msgctxt "field:product.attribute,rec_name:"
 msgid "Name"
-msgstr "Név"
+msgstr ""
 
 msgctxt "field:product.attribute,selection:"
 msgid "Selection"
-msgstr "Kiválasztás"
+msgstr ""
 
 msgctxt "field:product.attribute,selection_json:"
 msgid "Selection JSON"
-msgstr "Kijelölés JSON"
+msgstr ""
 
 msgctxt "field:product.attribute,selection_sorted:"
 msgid "Selection Sorted"
-msgstr "Válogatott kiválasztás"
+msgstr ""
 
 msgctxt "field:product.attribute,sets:"
 msgid "Sets"
-msgstr "Rész"
+msgstr ""
 
 msgctxt "field:product.attribute,string:"
 msgid "String"
-msgstr "Karakterlánc"
+msgstr ""
 
 msgctxt "field:product.attribute,type_:"
 msgid "Type"
-msgstr "Típus"
+msgstr ""
 
 msgctxt "field:product.attribute,write_date:"
 msgid "Write Date"
-msgstr "Utolsó módosítás dátuma"
+msgstr ""
 
 msgctxt "field:product.attribute,write_uid:"
 msgid "Write User"
-msgstr "Által módosítva"
+msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,attribute:"
 msgid "Attribute"
-msgstr "Tulajdonságok"
+msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,attribute_set:"
 msgid "Set"
@@ -68,59 +68,59 @@ msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,create_date:"
 msgid "Create Date"
-msgstr "Létrehozás dátuma"
+msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,create_uid:"
 msgid "Create User"
-msgstr "Által létrehozva"
+msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,rec_name:"
 msgid "Name"
-msgstr "Név"
+msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,write_date:"
 msgid "Write Date"
-msgstr "Utolsó módosítás dátuma"
+msgstr ""
 
 msgctxt "field:product.attribute-product.attribute-set,write_uid:"
 msgid "Write User"
-msgstr "Által módosítva"
+msgstr ""
 
 msgctxt "field:product.attribute.set,attributes:"
 msgid "Attributes"
-msgstr "Tulajdonságok"
+msgstr ""
 
 msgctxt "field:product.attribute.set,create_date:"
 msgid "Create Date"
-msgstr "Létrehozás dátuma"
+msgstr ""
 
 msgctxt "field:product.attribute.set,create_uid:"
 msgid "Create User"
-msgstr "Által létrehozva"
+msgstr ""
 
 msgctxt "field:product.attribute.set,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:product.attribute.set,name:"
 msgid "Name"
-msgstr "Név"
+msgstr ""
 
 msgctxt "field:product.attribute.set,rec_name:"
 msgid "Name"
-msgstr "Név"
+msgstr ""
 
 msgctxt "field:product.attribute.set,write_date:"
 msgid "Write Date"
-msgstr "Utolsó módosítás dátuma"
+msgstr ""
 
 msgctxt "field:product.attribute.set,write_uid:"
 msgid "Write User"
-msgstr "Által módosítva"
+msgstr ""
 
 msgctxt "field:product.product,attribute_set:"
 msgid "Set"
@@ -128,7 +128,7 @@ msgstr ""
 
 msgctxt "field:product.product,attributes:"
 msgid "Attributes"
-msgstr "Tulajdonságok"
+msgstr ""
 
 msgctxt "field:product.template,attribute_set:"
 msgid "Set"
@@ -144,7 +144,7 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_attribute_form"
 msgid "Attributes"
-msgstr "Tulajdonságok"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_attribute_set_form"
 msgid "Attribute Sets"
@@ -152,7 +152,7 @@ msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_attribute"
 msgid "Attributes"
-msgstr "Tulajdonságok"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_attribute_set"
 msgid "Attribute Sets"
@@ -160,15 +160,15 @@ msgstr ""
 
 msgctxt "model:product.attribute,name:"
 msgid "Product Attribute"
-msgstr "Termékek jellemzői"
+msgstr ""
 
 msgctxt "model:product.attribute-product.attribute-set,name:"
 msgid "Product Attribute - Set"
-msgstr "Termék jellemzői"
+msgstr ""
 
 msgctxt "model:product.attribute.set,name:"
 msgid "Product Attribute Set"
-msgstr "Termék tulajdonság"
+msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "Boolean"
@@ -176,15 +176,15 @@ msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "Char"
-msgstr "Karakter"
+msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "Date"
-msgstr "Dátum"
+msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "DateTime"
-msgstr "Dátum és idő"
+msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "Float"
@@ -192,15 +192,15 @@ msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "Integer"
-msgstr "Egész szám"
+msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "Numeric"
-msgstr "Numerikus"
+msgstr ""
 
 msgctxt "selection:product.attribute,type_:"
 msgid "Selection"
-msgstr "Kiválasztás"
+msgstr ""
 
 msgctxt "view:product.attribute.set:"
 msgid "Attribute Set"
diff --git a/product.py b/product.py
index c40a806..d0265dc 100644
--- a/product.py
+++ b/product.py
@@ -4,13 +4,13 @@ from trytond.model import ModelSQL, ModelView, DictSchemaMixin, fields
 from trytond.pool import PoolMeta
 from trytond.pyson import Eval
 
-__metaclass__ = PoolMeta
 __all__ = ['ProductAttributeSet', 'ProductAttribute',
     'ProductAttributeAttributeSet', 'Template', 'Product']
 
 
 class ProductAttributeSet(ModelSQL, ModelView):
     "Product Attribute Set"
+    __metaclass__ = PoolMeta
     __name__ = 'product.attribute.set'
     name = fields.Char('Name', required=True, translate=True)
     attributes = fields.Many2Many('product.attribute-product.attribute-set',
@@ -19,6 +19,7 @@ class ProductAttributeSet(ModelSQL, ModelView):
 
 class ProductAttribute(DictSchemaMixin, ModelSQL, ModelView):
     "Product Attribute"
+    __metaclass__ = PoolMeta
     __name__ = 'product.attribute'
     sets = fields.Many2Many('product.attribute-product.attribute-set',
         'attribute', 'attribute_set', 'Sets')
@@ -26,6 +27,7 @@ class ProductAttribute(DictSchemaMixin, ModelSQL, ModelView):
 
 class ProductAttributeAttributeSet(ModelSQL):
     "Product Attribute - Set"
+    __metaclass__ = PoolMeta
     __name__ = 'product.attribute-product.attribute-set'
     attribute = fields.Many2One('product.attribute', 'Attribute',
         ondelete='CASCADE', select=True, required=True)
@@ -34,11 +36,13 @@ class ProductAttributeAttributeSet(ModelSQL):
 
 
 class Template:
+    __metaclass__ = PoolMeta
     __name__ = 'product.template'
     attribute_set = fields.Many2One('product.attribute.set', 'Set')
 
 
 class Product:
+    __metaclass__ = PoolMeta
     __name__ = 'product.product'
     attributes = fields.Dict('product.attribute', 'Attributes',
         domain=[
@@ -50,10 +54,3 @@ class Product:
                 & ~Eval('_parent_template', {}).get('attribute_set')),
             },
         depends=['attribute_set'])
-    attribute_set = fields.Function(fields.Many2One('product.attribute.set',
-            'Set'), 'on_change_with_attribute_set')
-
-    @fields.depends('template')
-    def on_change_with_attribute_set(self, name=None):
-        if self.template and getattr(self.template, 'attribute_set', None):
-            return self.template.attribute_set.id
diff --git a/setup.py b/setup.py
index 1ab6ec1..85c707f 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 = []
 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'))
 
@@ -76,6 +82,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',
@@ -89,6 +96,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',
@@ -102,4 +112,5 @@ setup(name=name,
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
+    use_2to3=True,
     )
diff --git a/tests/__init__.py b/tests/__init__.py
index e7892f4..c5dad97 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_product_attribute import suite
+try:
+    from trytond.modules.product_attribute.tests.test_product_attribute import suite
+except ImportError:
+    from .test_product_attribute import suite
 
 __all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 1b26b93..cca9161 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.8.0
+version=4.0.0
 depends:
     ir
     product
diff --git a/trytond_product_attribute.egg-info/PKG-INFO b/trytond_product_attribute.egg-info/PKG-INFO
index 005e5b0..41c8d61 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.8.0
+Version: 4.0.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.8/
+Download-URL: http://downloads.tryton.org/4.0/
 Description: trytond_product_attribute
         =========================
         
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
 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_product_attribute.egg-info/SOURCES.txt b/trytond_product_attribute.egg-info/SOURCES.txt
index c4b86ca..1c8892b 100644
--- a/trytond_product_attribute.egg-info/SOURCES.txt
+++ b/trytond_product_attribute.egg-info/SOURCES.txt
@@ -51,11 +51,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_product_attribute.egg-info/PKG-INFO
 trytond_product_attribute.egg-info/SOURCES.txt
 trytond_product_attribute.egg-info/dependency_links.txt
diff --git a/trytond_product_attribute.egg-info/requires.txt b/trytond_product_attribute.egg-info/requires.txt
index 1df1302..2bc45f9 100644
--- a/trytond_product_attribute.egg-info/requires.txt
+++ b/trytond_product_attribute.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_product >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_product >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
diff --git a/view/product_form.xml b/view/product_form.xml
index c2606c7..0ac3905 100644
--- a/view/product_form.xml
+++ b/view/product_form.xml
@@ -2,9 +2,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. -->
 <data>
-    <xpath
-        expr="/form/separator[@name='description']"
-        position="before">
-        <field name="attributes" colspan="6"/>
+    <xpath expr="/form/notebook" position="inside">
+        <page name="attributes">
+            <field name="attributes" colspan="4"/>
+        </page>
     </xpath>
 </data>
-- 
tryton-modules-product-attribute



More information about the tryton-debian-vcs mailing list