[tryton-debian-vcs] tryton-modules-product-cost-history branch upstream updated. upstream/3.8.0-1-g68a6c2f
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:22:22 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-cost-history.git;a=commitdiff;h=upstream/3.8.0-1-g68a6c2f
commit 68a6c2fdfa4ec1683a562b84b8761a2174a615ba
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:08 2016 +0200
Adding upstream version 4.0.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 8ddd131..5b86adb 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 718e584..6f27a5e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2015 Cédric Krier.
+Copyright (C) 2009-2016 Cédric Krier.
Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2015 B2CK SPRL.
+Copyright (C) 2009-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 671e502..18b9804 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product_cost_history
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to historize product cost
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_cost_history
============================
@@ -54,6 +54,8 @@ Classifier: Intended Audience :: Legal Industry
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
@@ -67,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/ir.py b/ir.py
index c22efca..8cdaabe 100644
--- a/ir.py
+++ b/ir.py
@@ -3,9 +3,9 @@
from trytond.pool import PoolMeta
__all__ = ['Property']
-__metaclass__ = PoolMeta
class Property:
+ __metaclass__ = PoolMeta
__name__ = 'ir.property'
_history = True
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index cf05bf5..01dbb41 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -56,4 +56,4 @@ msgstr "Historial de costos de producte"
msgctxt "view:product.product.cost_history:"
msgid "Time"
-msgstr "Temps"
+msgstr "Hora"
diff --git a/locale/es_MX.po b/locale/es_MX.po
index 63858db..1393fd9 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -50,9 +50,10 @@ msgctxt "model:product.product.cost_history,name:"
msgid "History of Product Cost"
msgstr "Historial de costos de producto"
+#, fuzzy
msgctxt "view:product.product.cost_history:"
msgid "Product Cost History"
-msgstr ""
+msgstr "Historial de costos de producto"
msgctxt "view:product.product.cost_history:"
msgid "Time"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index f6a59ba..d5fcc0d 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -52,7 +52,7 @@ msgstr "Cikk költségelőzményei"
msgctxt "view:product.product.cost_history:"
msgid "Product Cost History"
-msgstr ""
+msgstr "Beszerzési ár Termék előzmény"
msgctxt "view:product.product.cost_history:"
msgid "Time"
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 63858db..1927214 100644
--- a/locale/es_MX.po
+++ b/locale/lo_LA.po
@@ -4,51 +4,51 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.product.cost_history,cost_price:"
msgid "Cost Price"
-msgstr "Precio de costo"
+msgstr ""
msgctxt "field:product.product.cost_history,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
msgctxt "field:product.product.cost_history,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
msgctxt "field:product.product.cost_history,date:"
msgid "Date"
-msgstr "Fecha"
+msgstr ""
msgctxt "field:product.product.cost_history,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:product.product.cost_history,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr ""
msgctxt "field:product.product.cost_history,template:"
msgid "Product"
-msgstr "Producto"
+msgstr ""
msgctxt "field:product.product.cost_history,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
msgctxt "field:product.product.cost_history,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
msgctxt "model:ir.action,name:act_product_cost_history_form"
msgid "Product Cost History"
-msgstr "Historial de costos de producto"
+msgstr ""
msgctxt "model:ir.action,name:wizard_product_cost_history_open"
msgid "Cost History"
-msgstr "Historial de costos"
+msgstr ""
msgctxt "model:product.product.cost_history,name:"
msgid "History of Product Cost"
-msgstr "Historial de costos de producto"
+msgstr ""
msgctxt "view:product.product.cost_history:"
msgid "Product Cost History"
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 63858db..1927214 100644
--- a/locale/es_MX.po
+++ b/locale/zh_CN.po
@@ -4,51 +4,51 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.product.cost_history,cost_price:"
msgid "Cost Price"
-msgstr "Precio de costo"
+msgstr ""
msgctxt "field:product.product.cost_history,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
msgctxt "field:product.product.cost_history,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
msgctxt "field:product.product.cost_history,date:"
msgid "Date"
-msgstr "Fecha"
+msgstr ""
msgctxt "field:product.product.cost_history,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:product.product.cost_history,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr ""
msgctxt "field:product.product.cost_history,template:"
msgid "Product"
-msgstr "Producto"
+msgstr ""
msgctxt "field:product.product.cost_history,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
msgctxt "field:product.product.cost_history,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
msgctxt "model:ir.action,name:act_product_cost_history_form"
msgid "Product Cost History"
-msgstr "Historial de costos de producto"
+msgstr ""
msgctxt "model:ir.action,name:wizard_product_cost_history_open"
msgid "Cost History"
-msgstr "Historial de costos"
+msgstr ""
msgctxt "model:product.product.cost_history,name:"
msgid "History of Product Cost"
-msgstr "Historial de costos de producto"
+msgstr ""
msgctxt "view:product.product.cost_history:"
msgid "Product Cost History"
diff --git a/setup.py b/setup.py
index 5901596..da23770 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'))
@@ -75,6 +81,8 @@ setup(name=name,
'Intended Audience :: Manufacturing',
'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',
@@ -88,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',
@@ -101,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 cc4c289..6298d51 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_cost_history import suite
+try:
+ from trytond.modules.product_cost_history.tests.test_product_cost_history import suite
+except ImportError:
+ from .test_product_cost_history 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_cost_history.egg-info/PKG-INFO b/trytond_product_cost_history.egg-info/PKG-INFO
index 083694b..aca4c53 100644
--- a/trytond_product_cost_history.egg-info/PKG-INFO
+++ b/trytond_product_cost_history.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-product-cost-history
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to historize product cost
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_cost_history
============================
@@ -54,6 +54,8 @@ Classifier: Intended Audience :: Legal Industry
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
@@ -67,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_cost_history.egg-info/SOURCES.txt b/trytond_product_cost_history.egg-info/SOURCES.txt
index 6583b3e..b11ffa1 100644
--- a/trytond_product_cost_history.egg-info/SOURCES.txt
+++ b/trytond_product_cost_history.egg-info/SOURCES.txt
@@ -48,11 +48,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_cost_history.egg-info/PKG-INFO
trytond_product_cost_history.egg-info/SOURCES.txt
trytond_product_cost_history.egg-info/dependency_links.txt
diff --git a/trytond_product_cost_history.egg-info/requires.txt b/trytond_product_cost_history.egg-info/requires.txt
index 0a14516..f862de9 100644
--- a/trytond_product_cost_history.egg-info/requires.txt
+++ b/trytond_product_cost_history.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-sql
-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
--
tryton-modules-product-cost-history
More information about the tryton-debian-vcs
mailing list