[tryton-debian-vcs] tryton-modules-sale-extra branch upstream updated. upstream/3.8.0-2-gfbb6309

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:25:49 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-sale-extra.git;a=commitdiff;h=upstream/3.8.0-2-gfbb6309

commit fbb630930b5ede1d1c820095207994a33ecce8d0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 27 18:35:29 2016 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 275727c..f2cca88 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 2b5dd78..2d12b9a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale_extra
-Version: 4.0.0
+Version: 4.0.1
 Summary: Tryton module for sale extra
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 2a986c5..9bee825 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -8,7 +8,7 @@ msgstr "Activo"
 
 msgctxt "field:sale.extra,company:"
 msgid "Company"
-msgstr ""
+msgstr "Compañia"
 
 msgctxt "field:sale.extra,create_date:"
 msgid "Create Date"
@@ -24,7 +24,7 @@ msgstr "Decimales de Moneda"
 
 msgctxt "field:sale.extra,end_date:"
 msgid "End Date"
-msgstr ""
+msgstr "Fecha Final"
 
 msgctxt "field:sale.extra,id:"
 msgid "ID"
@@ -52,7 +52,7 @@ msgstr "Valor"
 
 msgctxt "field:sale.extra,start_date:"
 msgid "Start Date"
-msgstr ""
+msgstr "Fecha Inicial"
 
 msgctxt "field:sale.extra,write_date:"
 msgid "Write Date"
@@ -122,7 +122,6 @@ msgctxt "field:sale.extra.line,write_uid:"
 msgid "Write User"
 msgstr "Modificado por Usuario"
 
-#, fuzzy
 msgctxt "field:sale.line,extra:"
 msgid "Extra"
 msgstr "Extra"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 7798d42..882a0a7 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -126,7 +126,6 @@ msgctxt "field:sale.line,extra:"
 msgid "Extra"
 msgstr "Dodatno"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_extra_form"
 msgid "Extras"
 msgstr "Dodatno"
diff --git a/tryton.cfg b/tryton.cfg
index 5a33608..56fbb71 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.0.0
+version=4.0.1
 depends:
     company
     ir
diff --git a/trytond_sale_extra.egg-info/PKG-INFO b/trytond_sale_extra.egg-info/PKG-INFO
index c1411ca..a812f26 100644
--- a/trytond_sale_extra.egg-info/PKG-INFO
+++ b/trytond_sale_extra.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-sale-extra
-Version: 4.0.0
+Version: 4.0.1
 Summary: Tryton module for sale extra
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_sale_extra.egg-info/SOURCES.txt b/trytond_sale_extra.egg-info/SOURCES.txt
index da50e15..da47310 100644
--- a/trytond_sale_extra.egg-info/SOURCES.txt
+++ b/trytond_sale_extra.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/scenario_sale_extra.rst
 ./tests/test_sale_extra.py
diff --git a/trytond_sale_extra.egg-info/requires.txt b/trytond_sale_extra.egg-info/requires.txt
index 00351d0..dff0cb6 100644
--- a/trytond_sale_extra.egg-info/requires.txt
+++ b/trytond_sale_extra.egg-info/requires.txt
@@ -4,4 +4,4 @@ trytond_product >= 4.0, < 4.1
 trytond_product_price_list >= 4.0, < 4.1
 trytond_sale >= 4.0, < 4.1
 trytond_sale_price_list >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit 5a4cc9976627b28530d91ab35ea7c44992d8b239
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 27 18:26:14 2016 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 3cfd747..275727c 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)
 * Add start/end date criteria
diff --git a/COPYRIGHT b/COPYRIGHT
index 7aea85f..be9339f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2015 Cédric Krier.
-Copyright (C) 2015 B2CK SPRL.
+Copyright (C) 2015-2016 Cédric Krier.
+Copyright (C) 2015-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 0cc7601..2b5dd78 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_sale_extra
-Version: 3.8.0
+Version: 4.0.0
 Summary: Tryton module for sale extra
 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_sale_extra
         ==================
         
@@ -54,6 +54,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
@@ -67,6 +68,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_CO.po b/locale/es_CO.po
index f22f480..2a986c5 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -129,15 +129,15 @@ msgstr "Extra"
 
 msgctxt "model:ir.action,name:act_extra_form"
 msgid "Extras"
-msgstr ""
+msgstr "Extras"
 
 msgctxt "model:ir.action,name:act_extra_relate"
 msgid "Sale Extras"
-msgstr ""
+msgstr "Extras de Venta"
 
 msgctxt "model:ir.ui.menu,name:menu_extra"
 msgid "Extras"
-msgstr ""
+msgstr "Extras"
 
 msgctxt "model:sale.extra,name:"
 msgid "Sale Extra"
diff --git a/locale/es_MX.po b/locale/es_MX.po
index ed714cd..a82e5c1 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -126,17 +126,20 @@ msgctxt "field:sale.line,extra:"
 msgid "Extra"
 msgstr "Extra"
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_extra_form"
 msgid "Extras"
-msgstr ""
+msgstr "Extra"
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_extra_relate"
 msgid "Sale Extras"
-msgstr ""
+msgstr "Extras de venta"
 
+#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_extra"
 msgid "Extras"
-msgstr ""
+msgstr "Extra"
 
 msgctxt "model:sale.extra,name:"
 msgid "Sale Extra"
@@ -158,10 +161,12 @@ msgctxt "view:sale.extra.line:"
 msgid "Sale Line"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:sale.extra:"
 msgid "Extra"
-msgstr ""
+msgstr "Extra"
 
+#, fuzzy
 msgctxt "view:sale.extra:"
 msgid "Extras"
-msgstr ""
+msgstr "Extra"
diff --git a/locale/es_MX.po b/locale/lo_LA.po
similarity index 78%
copy from locale/es_MX.po
copy to locale/lo_LA.po
index ed714cd..0d1b701 100644
--- a/locale/es_MX.po
+++ b/locale/lo_LA.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "field:sale.extra,active:"
 msgid "Active"
-msgstr "Activo"
+msgstr ""
 
 msgctxt "field:sale.extra,company:"
 msgid "Company"
@@ -12,15 +12,15 @@ msgstr ""
 
 msgctxt "field:sale.extra,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
 
 msgctxt "field:sale.extra,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
 
 msgctxt "field:sale.extra,currency_digits:"
 msgid "Currency Digits"
-msgstr "Decimales de la moneda"
+msgstr ""
 
 msgctxt "field:sale.extra,end_date:"
 msgid "End Date"
@@ -28,27 +28,27 @@ msgstr ""
 
 msgctxt "field:sale.extra,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:sale.extra,lines:"
 msgid "Lines"
-msgstr "Líneas"
+msgstr ""
 
 msgctxt "field:sale.extra,name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:sale.extra,price_list:"
 msgid "Price List"
-msgstr "Tarifa"
+msgstr ""
 
 msgctxt "field:sale.extra,rec_name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:sale.extra,sale_amount:"
 msgid "Sale Amount"
-msgstr "Importe de la venta"
+msgstr ""
 
 msgctxt "field:sale.extra,start_date:"
 msgid "Start Date"
@@ -56,75 +56,75 @@ msgstr ""
 
 msgctxt "field:sale.extra,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
 
 msgctxt "field:sale.extra,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
 
 msgctxt "field:sale.extra.line,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
 
 msgctxt "field:sale.extra.line,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
 
 msgctxt "field:sale.extra.line,extra:"
 msgid "Extra"
-msgstr "Extra"
+msgstr ""
 
 msgctxt "field:sale.extra.line,free:"
 msgid "Free"
-msgstr "Gratis"
+msgstr ""
 
 msgctxt "field:sale.extra.line,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:sale.extra.line,product:"
 msgid "Product"
-msgstr "Producto"
+msgstr ""
 
 msgctxt "field:sale.extra.line,product_uom_category:"
 msgid "Product UoM Category"
-msgstr "Categoría UdM del producto"
+msgstr ""
 
 msgctxt "field:sale.extra.line,quantity:"
 msgid "Quantity"
-msgstr "Cantidad"
+msgstr ""
 
 msgctxt "field:sale.extra.line,rec_name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:sale.extra.line,sale_amount:"
 msgid "Sale Amount"
-msgstr "Importe de la venta"
+msgstr ""
 
 msgctxt "field:sale.extra.line,sequence:"
 msgid "Sequence"
-msgstr "Secuencia"
+msgstr ""
 
 msgctxt "field:sale.extra.line,unit:"
 msgid "Unit"
-msgstr "Unidad"
+msgstr ""
 
 msgctxt "field:sale.extra.line,unit_digits:"
 msgid "Unit Digits"
-msgstr "Decimales de la unidad"
+msgstr ""
 
 msgctxt "field:sale.extra.line,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
 
 msgctxt "field:sale.extra.line,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
 
 msgctxt "field:sale.line,extra:"
 msgid "Extra"
-msgstr "Extra"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_extra_form"
 msgid "Extras"
@@ -140,11 +140,11 @@ msgstr ""
 
 msgctxt "model:sale.extra,name:"
 msgid "Sale Extra"
-msgstr "Extra de venta"
+msgstr ""
 
 msgctxt "model:sale.extra.line,name:"
 msgid "Sale Extra Line"
-msgstr "Línea extra de venta"
+msgstr ""
 
 msgctxt "view:sale.extra.line:"
 msgid "Extra Line"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index fe8cd36..7798d42 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -126,8 +126,9 @@ msgctxt "field:sale.line,extra:"
 msgid "Extra"
 msgstr "Dodatno"
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_extra_form"
-msgid "Dodatno"
+msgid "Extras"
 msgstr "Dodatno"
 
 msgctxt "model:ir.action,name:act_extra_relate"
diff --git a/locale/es_MX.po b/locale/zh_CN.po
similarity index 78%
copy from locale/es_MX.po
copy to locale/zh_CN.po
index ed714cd..0d1b701 100644
--- a/locale/es_MX.po
+++ b/locale/zh_CN.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "field:sale.extra,active:"
 msgid "Active"
-msgstr "Activo"
+msgstr ""
 
 msgctxt "field:sale.extra,company:"
 msgid "Company"
@@ -12,15 +12,15 @@ msgstr ""
 
 msgctxt "field:sale.extra,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
 
 msgctxt "field:sale.extra,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
 
 msgctxt "field:sale.extra,currency_digits:"
 msgid "Currency Digits"
-msgstr "Decimales de la moneda"
+msgstr ""
 
 msgctxt "field:sale.extra,end_date:"
 msgid "End Date"
@@ -28,27 +28,27 @@ msgstr ""
 
 msgctxt "field:sale.extra,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:sale.extra,lines:"
 msgid "Lines"
-msgstr "Líneas"
+msgstr ""
 
 msgctxt "field:sale.extra,name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:sale.extra,price_list:"
 msgid "Price List"
-msgstr "Tarifa"
+msgstr ""
 
 msgctxt "field:sale.extra,rec_name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:sale.extra,sale_amount:"
 msgid "Sale Amount"
-msgstr "Importe de la venta"
+msgstr ""
 
 msgctxt "field:sale.extra,start_date:"
 msgid "Start Date"
@@ -56,75 +56,75 @@ msgstr ""
 
 msgctxt "field:sale.extra,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
 
 msgctxt "field:sale.extra,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
 
 msgctxt "field:sale.extra.line,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
 
 msgctxt "field:sale.extra.line,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
 
 msgctxt "field:sale.extra.line,extra:"
 msgid "Extra"
-msgstr "Extra"
+msgstr ""
 
 msgctxt "field:sale.extra.line,free:"
 msgid "Free"
-msgstr "Gratis"
+msgstr ""
 
 msgctxt "field:sale.extra.line,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:sale.extra.line,product:"
 msgid "Product"
-msgstr "Producto"
+msgstr ""
 
 msgctxt "field:sale.extra.line,product_uom_category:"
 msgid "Product UoM Category"
-msgstr "Categoría UdM del producto"
+msgstr ""
 
 msgctxt "field:sale.extra.line,quantity:"
 msgid "Quantity"
-msgstr "Cantidad"
+msgstr ""
 
 msgctxt "field:sale.extra.line,rec_name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:sale.extra.line,sale_amount:"
 msgid "Sale Amount"
-msgstr "Importe de la venta"
+msgstr ""
 
 msgctxt "field:sale.extra.line,sequence:"
 msgid "Sequence"
-msgstr "Secuencia"
+msgstr ""
 
 msgctxt "field:sale.extra.line,unit:"
 msgid "Unit"
-msgstr "Unidad"
+msgstr ""
 
 msgctxt "field:sale.extra.line,unit_digits:"
 msgid "Unit Digits"
-msgstr "Decimales de la unidad"
+msgstr ""
 
 msgctxt "field:sale.extra.line,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
 
 msgctxt "field:sale.extra.line,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
 
 msgctxt "field:sale.line,extra:"
 msgid "Extra"
-msgstr "Extra"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_extra_form"
 msgid "Extras"
@@ -140,11 +140,11 @@ msgstr ""
 
 msgctxt "model:sale.extra,name:"
 msgid "Sale Extra"
-msgstr "Extra de venta"
+msgstr ""
 
 msgctxt "model:sale.extra.line,name:"
 msgid "Sale Extra Line"
-msgstr "Línea extra de venta"
+msgstr ""
 
 msgctxt "view:sale.extra.line:"
 msgid "Extra Line"
diff --git a/sale.py b/sale.py
index 80a84ae..d8a0d7e 100644
--- a/sale.py
+++ b/sale.py
@@ -13,10 +13,10 @@ from trytond import backend
 
 __all__ = ['Sale', 'SaleLine',
     'SaleExtra', 'SaleExtraLine']
-__metaclass__ = PoolMeta
 
 
 class Sale:
+    __metaclass__ = PoolMeta
     __name__ = 'sale.sale'
 
     @classmethod
@@ -58,6 +58,7 @@ class Sale:
 
 
 class SaleLine:
+    __metaclass__ = PoolMeta
     __name__ = 'sale.line'
 
     extra = fields.Many2One('sale.extra.line', 'Extra', ondelete='RESTRICT')
@@ -112,13 +113,13 @@ class SaleExtra(ModelSQL, ModelView, MatchMixin):
         pool = Pool()
         PriceList = pool.get('product.price_list')
         TableHandler = backend.get('TableHandler')
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         sql_table = cls.__table__()
         price_list = PriceList.__table__()
 
         super(SaleExtra, cls).__register__(module_name)
 
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
         # Migration from 3.6: price_list not required and new company
         table.not_null_action('price_list', 'remove')
         query = sql_table.join(price_list,
diff --git a/setup.py b/setup.py
index 58141ec..409e693 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']
 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'))
 
@@ -81,6 +87,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',
@@ -94,6 +101,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',
@@ -110,4 +120,8 @@ setup(name=name,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
     tests_require=tests_require,
+    use_2to3=True,
+    convert_2to3_doctests=[
+        'tests/scenario_sale_extra.rst',
+        ],
     )
diff --git a/tests/__init__.py b/tests/__init__.py
index f5bc657..d997401 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_sale_extra import suite
+try:
+    from trytond.modules.sale_extra.tests.test_sale_extra import suite
+except ImportError:
+    from .test_sale_extra import suite
 
 __all__ = ['suite']
diff --git a/tests/scenario_sale_extra.rst b/tests/scenario_sale_extra.rst
index f864826..91f2315 100644
--- a/tests/scenario_sale_extra.rst
+++ b/tests/scenario_sale_extra.rst
@@ -65,7 +65,7 @@ Create product::
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.salable = True
-    >>> template.delivery_time = 0
+    >>> template.lead_time = datetime.timedelta(0)
     >>> template.list_price = Decimal('20')
     >>> template.cost_price = Decimal('8')
     >>> template.account_revenue = revenue
@@ -78,7 +78,7 @@ Create product::
     >>> extra_template.default_uom = unit
     >>> extra_template.type = 'service'
     >>> extra_template.salable = True
-    >>> extra_template.delivery_time = 0
+    >>> extra_template.lead_time = datetime.timedelta(0)
     >>> extra_template.list_price = Decimal('3')
     >>> extra_template.cost_price = Decimal('3')
     >>> extra_template.account_revenue = revenue
diff --git a/tests/test_sale_extra.py b/tests/test_sale_extra.py
index 8aa99fb..8ecff3e 100644
--- a/tests/test_sale_extra.py
+++ b/tests/test_sale_extra.py
@@ -5,6 +5,7 @@ import doctest
 import trytond.tests.test_tryton
 from trytond.tests.test_tryton import ModuleTestCase
 from trytond.tests.test_tryton import doctest_setup, doctest_teardown
+from trytond.tests.test_tryton import doctest_checker
 
 
 class SaleExtraTestCase(ModuleTestCase):
@@ -18,5 +19,6 @@ def suite():
             SaleExtraTestCase))
     suite.addTests(doctest.DocFileSuite('scenario_sale_extra.rst',
         setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+            checker=doctest_checker,
             optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
     return suite
diff --git a/tryton.cfg b/tryton.cfg
index c54b814..5a33608 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.8.0
+version=4.0.0
 depends:
     company
     ir
diff --git a/trytond_sale_extra.egg-info/PKG-INFO b/trytond_sale_extra.egg-info/PKG-INFO
index 9cd2596..c1411ca 100644
--- a/trytond_sale_extra.egg-info/PKG-INFO
+++ b/trytond_sale_extra.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-sale-extra
-Version: 3.8.0
+Version: 4.0.0
 Summary: Tryton module for sale extra
 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_sale_extra
         ==================
         
@@ -54,6 +54,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
@@ -67,6 +68,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_sale_extra.egg-info/SOURCES.txt b/trytond_sale_extra.egg-info/SOURCES.txt
index e97526c..da50e15 100644
--- a/trytond_sale_extra.egg-info/SOURCES.txt
+++ b/trytond_sale_extra.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
 tests/scenario_sale_extra.rst
 trytond_sale_extra.egg-info/PKG-INFO
 trytond_sale_extra.egg-info/SOURCES.txt
diff --git a/trytond_sale_extra.egg-info/requires.txt b/trytond_sale_extra.egg-info/requires.txt
index 5a3dafb..00351d0 100644
--- a/trytond_sale_extra.egg-info/requires.txt
+++ b/trytond_sale_extra.egg-info/requires.txt
@@ -1,7 +1,7 @@
 python-sql
-trytond_company >= 3.8, < 3.9
-trytond_product >= 3.8, < 3.9
-trytond_product_price_list >= 3.8, < 3.9
-trytond_sale >= 3.8, < 3.9
-trytond_sale_price_list >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_company >= 4.0, < 4.1
+trytond_product >= 4.0, < 4.1
+trytond_product_price_list >= 4.0, < 4.1
+trytond_sale >= 4.0, < 4.1
+trytond_sale_price_list >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
-- 
tryton-modules-sale-extra



More information about the tryton-debian-vcs mailing list