[tryton-debian-vcs] tryton-modules-commission-waiting branch debian updated. debian/3.8.0-2-5-g9c523e0
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:11:57 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-commission-waiting.git;a=commitdiff;h=debian/3.8.0-2-5-g9c523e0
commit 9c523e0bb83d508cdbcc263eb6e91965fbc3d1ac
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:21 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 043ca4c..120275b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-commission-waiting (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:28:35 +0200
+
tryton-modules-commission-waiting (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit 7e6958f6692b7368809263b61c49876cc57a1419
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 b6a17d7..2b39f96 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2014-2015 Cédric Krier
- 2014-2015 B2CK SPRL
+Copyright: 2014-2016 Cédric Krier
+ 2014-2016 B2CK SPRL
License: GPL-3+
Files: debian/*
-Copyright: 2015 Mathias Behrle <mathiasb at m9s.biz>
+Copyright: 2015-2016 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit e0f7c5d8f7a8eb47b92e67b62e4797c4f0ebaf09
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:17 2016 +0200
Merging upstream version 4.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index b43a07b..f8e909e 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 8ab696d..3a06e16 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_commission_waiting
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module for commission waiting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
index de30362..100c152 100644
--- a/locale/lo_LA.po
+++ b/locale/lo_LA.po
@@ -4,8 +4,8 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:commission,waiting_move:"
msgid "Move"
-msgstr ""
+msgstr "ເຄື່ອນຍ້າຍ"
msgctxt "field:commission.agent,waiting_account:"
msgid "Waiting Account"
-msgstr ""
+msgstr "ບັນຊີລໍຖ້າ"
diff --git a/tryton.cfg b/tryton.cfg
index c89e539..41b3db0 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
account
account_invoice
diff --git a/trytond_commission_waiting.egg-info/PKG-INFO b/trytond_commission_waiting.egg-info/PKG-INFO
index 889292b..af891aa 100644
--- a/trytond_commission_waiting.egg-info/PKG-INFO
+++ b/trytond_commission_waiting.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-commission-waiting
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module for commission waiting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_commission_waiting.egg-info/SOURCES.txt b/trytond_commission_waiting.egg-info/SOURCES.txt
index 1221f5b..b7e0069 100644
--- a/trytond_commission_waiting.egg-info/SOURCES.txt
+++ b/trytond_commission_waiting.egg-info/SOURCES.txt
@@ -26,11 +26,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_commission_waiting.rst
./tests/test_commission_waiting.py
diff --git a/trytond_commission_waiting.egg-info/requires.txt b/trytond_commission_waiting.egg-info/requires.txt
index 9210b37..a5e767c 100644
--- a/trytond_commission_waiting.egg-info/requires.txt
+++ b/trytond_commission_waiting.egg-info/requires.txt
@@ -1,4 +1,4 @@
trytond_account >= 4.0, < 4.1
trytond_account_invoice >= 4.0, < 4.1
trytond_commission >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit 0e1fdb77f9eb75ab5598f7884b17246cc9e04c2e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:25:59 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index ef76b2a..b43a07b 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 a085246..a29b425 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2014-2015 Cédric Krier.
-Copyright (C) 2014-2015 B2CK SPRL.
+Copyright (C) 2014-2016 Cédric Krier.
+Copyright (C) 2014-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 b84df79..8ab696d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_commission_waiting
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module for commission waiting
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_commission_waiting
==========================
@@ -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/account.py b/account.py
index b6abe9f..1d935d8 100644
--- a/account.py
+++ b/account.py
@@ -6,10 +6,10 @@ from trytond.pool import PoolMeta
__all__ = ['Move']
-__metaclass__ = PoolMeta
class Move:
+ __metaclass__ = PoolMeta
__name__ = 'account.move'
@classmethod
diff --git a/commission.py b/commission.py
index 58f15ca..1508626 100644
--- a/commission.py
+++ b/commission.py
@@ -8,10 +8,10 @@ from trytond.pyson import Eval, Bool
__all__ = ['Agent', 'Commission']
-__metaclass__ = PoolMeta
class Agent:
+ __metaclass__ = PoolMeta
__name__ = 'commission.agent'
waiting_account = fields.Many2One('account.account', 'Waiting Account',
domain=[
@@ -22,6 +22,7 @@ class Agent:
class Commission:
+ __metaclass__ = PoolMeta
__name__ = 'commission'
waiting_move = fields.Many2One('account.move', 'Move', readonly=True)
diff --git a/invoice.py b/invoice.py
index 7ed13cd..b656a7b 100644
--- a/invoice.py
+++ b/invoice.py
@@ -8,10 +8,10 @@ from trytond.model import ModelView, Workflow
__all__ = ['Invoice', 'InvoiceLine']
-__metaclass__ = PoolMeta
class Invoice:
+ __metaclass__ = PoolMeta
__name__ = 'account.invoice'
@classmethod
@@ -48,6 +48,7 @@ class Invoice:
class InvoiceLine:
+ __metaclass__ = PoolMeta
__name__ = 'account.invoice.line'
def get_move_line(self):
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
new file mode 100644
index 0000000..de30362
--- /dev/null
+++ b/locale/lo_LA.po
@@ -0,0 +1,11 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:commission,waiting_move:"
+msgid "Move"
+msgstr ""
+
+msgctxt "field:commission.agent,waiting_account:"
+msgid "Waiting Account"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
new file mode 100644
index 0000000..de30362
--- /dev/null
+++ b/locale/zh_CN.po
@@ -0,0 +1,11 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:commission,waiting_move:"
+msgid "Move"
+msgstr ""
+
+msgctxt "field:commission.agent,waiting_account:"
+msgid "Waiting Account"
+msgstr ""
diff --git a/setup.py b/setup.py
index 14f643b..6961b46 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'))
@@ -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_commission_waiting.rst',
+ ],
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 4cf980a..be1ce2a 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,8 @@
# 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_commission_waiting import suite
+try:
+ from trytond.modules.commission_waiting.tests.test_commission_waiting import suite
+except ImportError:
+ from .test_commission_waiting import suite
__all__ = ['suite']
diff --git a/tests/scenario_commission_waiting.rst b/tests/scenario_commission_waiting.rst
index dd1d50d..e5c6a1e 100644
--- a/tests/scenario_commission_waiting.rst
+++ b/tests/scenario_commission_waiting.rst
@@ -12,7 +12,7 @@ Imports::
... get_company
>>> from trytond.modules.account.tests.tools import create_fiscalyear, \
... create_chart, get_accounts, create_tax, set_tax_code
- >>> from.trytond.modules.account_invoice.tests.tools import \
+ >>> from trytond.modules.account_invoice.tests.tools import \
... set_fiscalyear_invoice_sequences, create_payment_term
>>> today = datetime.date.today()
diff --git a/tests/test_commission_waiting.py b/tests/test_commission_waiting.py
index 74a85ae..c3eb328 100644
--- a/tests/test_commission_waiting.py
+++ b/tests/test_commission_waiting.py
@@ -8,6 +8,7 @@ import doctest
from trytond.tests.test_tryton import ModuleTestCase
from trytond.tests.test_tryton import suite as test_suite
from trytond.tests.test_tryton import doctest_setup, doctest_teardown
+from trytond.tests.test_tryton import doctest_checker
class CommissionWaitingTestCase(ModuleTestCase):
@@ -21,5 +22,6 @@ def suite():
CommissionWaitingTestCase))
suite.addTests(doctest.DocFileSuite('scenario_commission_waiting.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 2d390ff..c89e539 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
account
account_invoice
diff --git a/trytond_commission_waiting.egg-info/PKG-INFO b/trytond_commission_waiting.egg-info/PKG-INFO
index 90298f2..889292b 100644
--- a/trytond_commission_waiting.egg-info/PKG-INFO
+++ b/trytond_commission_waiting.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-commission-waiting
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module for commission waiting
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_commission_waiting
==========================
@@ -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_commission_waiting.egg-info/SOURCES.txt b/trytond_commission_waiting.egg-info/SOURCES.txt
index 9bc46e6..1221f5b 100644
--- a/trytond_commission_waiting.egg-info/SOURCES.txt
+++ b/trytond_commission_waiting.egg-info/SOURCES.txt
@@ -50,11 +50,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_commission_waiting.rst
trytond_commission_waiting.egg-info/PKG-INFO
trytond_commission_waiting.egg-info/SOURCES.txt
diff --git a/trytond_commission_waiting.egg-info/requires.txt b/trytond_commission_waiting.egg-info/requires.txt
index 83dc438..9210b37 100644
--- a/trytond_commission_waiting.egg-info/requires.txt
+++ b/trytond_commission_waiting.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account >= 3.8, < 3.9
-trytond_account_invoice >= 3.8, < 3.9
-trytond_commission >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_account >= 4.0, < 4.1
+trytond_account_invoice >= 4.0, < 4.1
+trytond_commission >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-commission-waiting
More information about the tryton-debian-vcs
mailing list