[tryton-debian-vcs] tryton-modules-stock-location-sequence branch debian updated. debian/3.8.0-2-5-gd973ea4
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:28:05 UTC 2016
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-location-sequence.git;a=commitdiff;h=debian/3.8.0-2-5-gd973ea4
commit d973ea4c1923add56cd223b7ef89f4faf91edb60
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:33 2016 +0200
Releasing debian version 4.0.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 7885ad9..cefbb84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-stock-location-sequence (4.0.1-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 4.0.0.
+ * Merging upstream version 4.0.1.
+ * Updating the copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 30 May 2016 19:31:58 +0200
+
tryton-modules-stock-location-sequence (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit 74140829ea57a22ed95ead05be0241bfa264e2ce
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 19:01:03 2016 +0200
Updating the copyright file.
diff --git a/debian/copyright b/debian/copyright
index 83cfe48..fcc6749 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,15 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2015 Cédric Krier
+Copyright: 2008-2016 Cédric Krier
2008-2012 Bertrand Chenal
- 2008-2015 B2CK SPRL
+ 2008-2016 B2CK SPRL
License: GPL-3+
Files: debian/*
Copyright:
2009-2012 Daniel Baumann <daniel at debian.org>
- 2012-2015 Mathias Behrle <mathiasb at m9s.biz>
+ 2012-2016 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 5b73452d32066f283b8faa8666c19996d10617c0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:33 2016 +0200
Merging upstream version 4.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index ff1dd2b..5c3a0e3 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 7875583..a353bbe 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock_location_sequence
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add sequence on location
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
index 0d1c6ef..af63d1d 100644
--- a/locale/lo_LA.po
+++ b/locale/lo_LA.po
@@ -4,4 +4,4 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:stock.location,sequence:"
msgid "Sequence"
-msgstr ""
+msgstr "ລໍາດັບ"
diff --git a/tryton.cfg b/tryton.cfg
index e71167f..af49fd1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
ir
stock
diff --git a/trytond_stock_location_sequence.egg-info/PKG-INFO b/trytond_stock_location_sequence.egg-info/PKG-INFO
index aaab78c..642a401 100644
--- a/trytond_stock_location_sequence.egg-info/PKG-INFO
+++ b/trytond_stock_location_sequence.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-stock-location-sequence
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add sequence on location
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_stock_location_sequence.egg-info/SOURCES.txt b/trytond_stock_location_sequence.egg-info/SOURCES.txt
index 02942c0..5e1dda5 100644
--- a/trytond_stock_location_sequence.egg-info/SOURCES.txt
+++ b/trytond_stock_location_sequence.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/test_stock_location_sequence.py
./view/location_form.xml
diff --git a/trytond_stock_location_sequence.egg-info/requires.txt b/trytond_stock_location_sequence.egg-info/requires.txt
index 5c07076..f920e4d 100644
--- a/trytond_stock_location_sequence.egg-info/requires.txt
+++ b/trytond_stock_location_sequence.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-sql >= 0.4
trytond_stock >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit 4b8c581d76a743c76b601c98db7dc288feae3d71
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:20 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index c404062..ff1dd2b 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 34d4187..808b71b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2015 Cédric Krier.
+Copyright (C) 2008-2016 Cédric Krier.
Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-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 bf4cb14..7875583 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_location_sequence
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add sequence on location
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_stock_location_sequence
===============================
@@ -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/locale/hu_HU.po b/locale/hu_HU.po
index 0d1c6ef..c97c7b9 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -4,4 +4,4 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:stock.location,sequence:"
msgid "Sequence"
-msgstr ""
+msgstr "Sorrend"
diff --git a/locale/hu_HU.po b/locale/lo_LA.po
similarity index 100%
copy from locale/hu_HU.po
copy to locale/lo_LA.po
diff --git a/locale/hu_HU.po b/locale/zh_CN.po
similarity index 88%
copy from locale/hu_HU.po
copy to locale/zh_CN.po
index 0d1c6ef..a8cde99 100644
--- a/locale/hu_HU.po
+++ b/locale/zh_CN.po
@@ -4,4 +4,4 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:stock.location,sequence:"
msgid "Sequence"
-msgstr ""
+msgstr "序列"
diff --git a/setup.py b/setup.py
index c6a7040..b642bdd 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 >= 0.4']
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/stock.py b/stock.py
index 3200232..bdd68bd 100644
--- a/stock.py
+++ b/stock.py
@@ -5,16 +5,15 @@ from sql.conditionals import Case
from trytond.model import fields
from trytond.pyson import Not, Eval, Bool
-from trytond.transaction import Transaction
from trytond import backend
from trytond.pool import PoolMeta
__all__ = ['Location']
-__metaclass__ = PoolMeta
class Location:
"Stock Location"
+ __metaclass__ = PoolMeta
__name__ = 'stock.location'
sequence = fields.Integer('Sequence',
states={
@@ -30,8 +29,7 @@ class Location:
@classmethod
def __register__(cls, module_name):
TableHandler = backend.get('TableHandler')
- cursor = Transaction().cursor
- table = TableHandler(cursor, cls, module_name)
+ table = TableHandler(cls, module_name)
super(Location, cls).__register__(module_name)
diff --git a/stock.xml b/stock.xml
index 903856d..3cea584 100644
--- a/stock.xml
+++ b/stock.xml
@@ -5,7 +5,7 @@ this repository contains the full copyright notices and license terms. -->
<data>
<record model="ir.ui.view" id="location_view_form">
<field name="model">stock.location</field>
- <field name="type">form</field>
+ <field name="type" eval="None"/>
<field name="inherit" ref="stock.location_view_form"/>
<field name="name">location_form</field>
</record>
diff --git a/tests/__init__.py b/tests/__init__.py
index 89f1d31..3450a53 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_stock_location_sequence import suite
+try:
+ from trytond.modules.stock_location_sequence.tests.test_stock_location_sequence import suite
+except ImportError:
+ from .test_stock_location_sequence import suite
__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index dd07ff1..e71167f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
ir
stock
diff --git a/trytond_stock_location_sequence.egg-info/PKG-INFO b/trytond_stock_location_sequence.egg-info/PKG-INFO
index 12b76b6..aaab78c 100644
--- a/trytond_stock_location_sequence.egg-info/PKG-INFO
+++ b/trytond_stock_location_sequence.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-location-sequence
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add sequence on location
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_stock_location_sequence
===============================
@@ -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_stock_location_sequence.egg-info/SOURCES.txt b/trytond_stock_location_sequence.egg-info/SOURCES.txt
index 69e5c7f..02942c0 100644
--- a/trytond_stock_location_sequence.egg-info/SOURCES.txt
+++ b/trytond_stock_location_sequence.egg-info/SOURCES.txt
@@ -45,11 +45,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_stock_location_sequence.egg-info/PKG-INFO
trytond_stock_location_sequence.egg-info/SOURCES.txt
trytond_stock_location_sequence.egg-info/dependency_links.txt
diff --git a/trytond_stock_location_sequence.egg-info/requires.txt b/trytond_stock_location_sequence.egg-info/requires.txt
index 9d03785..5c07076 100644
--- a/trytond_stock_location_sequence.egg-info/requires.txt
+++ b/trytond_stock_location_sequence.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-sql >= 0.4
-trytond_stock >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_stock >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-stock-location-sequence
More information about the tryton-debian-vcs
mailing list