[tryton-debian-vcs] tryton-modules-account-credit-limit branch debian updated. debian/3.8.0-2-4-gbb8c99a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:05:00 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-account-credit-limit.git;a=commitdiff;h=debian/3.8.0-2-4-gbb8c99a
commit bb8c99abf382da8e31190866952def728b0dd107
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:10 2016 +0200
Releasing debian version 4.0.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 165c466..2abdb65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account-credit-limit (4.0.0-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 4.0.0.
+ * Updating the copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 30 May 2016 19:26:18 +0200
+
tryton-modules-account-credit-limit (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit bddf0bebfaefae0d6ea27b986cfdcc4e1a38b738
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 1c9ddf9..aca1b98 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: 2011-2015 Cédric Krier
- 2011-2015 B2CK SPRL
+Copyright: 2011-2016 Cédric Krier
+ 2011-2016 B2CK SPRL
License: GPL-3+
Files: debian/*
-Copyright: 2014-2015 Mathias Behrle <mathiasb at m9s.biz>
+Copyright: 2014-2016 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 8fa72ec51b8ae1a3ca70db5a892c4cc015c9f9b4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:25:45 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 8d80dcb..68cbe07 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 196a420..93ef5be 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2011-2015 Cédric Krier.
-Copyright (C) 2011-2015 B2CK SPRL.
+Copyright (C) 2011-2016 Cédric Krier.
+Copyright (C) 2011-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 a964be1..bc9d476 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_credit_limit
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module for account credit limit
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_account_credit_limit
============================
@@ -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 952ee74..631a2f8 100644
--- a/account.py
+++ b/account.py
@@ -8,10 +8,10 @@ from trytond.transaction import Transaction
from trytond.pyson import Eval
__all__ = ['Configuration', 'Level']
-__metaclass__ = PoolMeta
class Configuration:
+ __metaclass__ = PoolMeta
__name__ = 'account.configuration'
default_credit_limit_amount = fields.Function(fields.Numeric(
@@ -76,6 +76,7 @@ class Configuration:
class Level:
+ __metaclass__ = PoolMeta
__name__ = 'account.dunning.level'
credit_limit = fields.Boolean('Credit Limit',
help='Has reached the credit limit')
diff --git a/locale/es_MX.po b/locale/es_MX.po
index fdd6e68..602d12b 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -42,10 +42,12 @@ msgctxt "model:res.group,name:group_credit_limit"
msgid "Account Credit Limit"
msgstr "Límite de crédito contable"
+#, fuzzy
msgctxt "view:account.configuration:"
msgid "Credit Limit"
-msgstr ""
+msgstr "Límite de crédito"
+#, fuzzy
msgctxt "view:party.party:"
msgid "Credit Limit"
-msgstr ""
+msgstr "Límite de crédito"
diff --git a/locale/es_MX.po b/locale/lo_LA.po
similarity index 70%
copy from locale/es_MX.po
copy to locale/lo_LA.po
index fdd6e68..7e664e0 100644
--- a/locale/es_MX.po
+++ b/locale/lo_LA.po
@@ -4,43 +4,43 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:party.party:"
msgid "\"%s\" has reached the credit limit amount (%s)"
-msgstr "\"%s\" ha alcanzado el límite del importe de crédito (%s)."
+msgstr ""
msgctxt "error:party.party:"
msgid "\"%s\" has reached the dunning credit limit (%s)"
-msgstr "\"%s\" ha alcanzado el límite del crédito reclamado (%s)."
+msgstr ""
msgctxt "field:account.configuration,default_credit_limit_amount:"
msgid "Default Credit Limit Amount"
-msgstr "Importe límite de crédito predefinido"
+msgstr ""
msgctxt "field:account.configuration,default_credit_limit_amount_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la moneda"
+msgstr ""
msgctxt "field:account.dunning.level,credit_limit:"
msgid "Credit Limit"
-msgstr "Límite de crédito"
+msgstr ""
msgctxt "field:party.party,credit_amount:"
msgid "Credit Amount"
-msgstr "Importe de crédito"
+msgstr ""
msgctxt "field:party.party,credit_limit_amount:"
msgid "Credit Limit Amount"
-msgstr "Importe límite de crédito"
+msgstr ""
msgctxt "field:party.party,credit_limit_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la moneda"
+msgstr ""
msgctxt "help:account.dunning.level,credit_limit:"
msgid "Has reached the credit limit"
-msgstr "Ha alcanzado el límite de crédito."
+msgstr ""
msgctxt "model:res.group,name:group_credit_limit"
msgid "Account Credit Limit"
-msgstr "Límite de crédito contable"
+msgstr ""
msgctxt "view:account.configuration:"
msgid "Credit Limit"
diff --git a/locale/es_MX.po b/locale/zh_CN.po
similarity index 70%
copy from locale/es_MX.po
copy to locale/zh_CN.po
index fdd6e68..7e664e0 100644
--- a/locale/es_MX.po
+++ b/locale/zh_CN.po
@@ -4,43 +4,43 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:party.party:"
msgid "\"%s\" has reached the credit limit amount (%s)"
-msgstr "\"%s\" ha alcanzado el límite del importe de crédito (%s)."
+msgstr ""
msgctxt "error:party.party:"
msgid "\"%s\" has reached the dunning credit limit (%s)"
-msgstr "\"%s\" ha alcanzado el límite del crédito reclamado (%s)."
+msgstr ""
msgctxt "field:account.configuration,default_credit_limit_amount:"
msgid "Default Credit Limit Amount"
-msgstr "Importe límite de crédito predefinido"
+msgstr ""
msgctxt "field:account.configuration,default_credit_limit_amount_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la moneda"
+msgstr ""
msgctxt "field:account.dunning.level,credit_limit:"
msgid "Credit Limit"
-msgstr "Límite de crédito"
+msgstr ""
msgctxt "field:party.party,credit_amount:"
msgid "Credit Amount"
-msgstr "Importe de crédito"
+msgstr ""
msgctxt "field:party.party,credit_limit_amount:"
msgid "Credit Limit Amount"
-msgstr "Importe límite de crédito"
+msgstr ""
msgctxt "field:party.party,credit_limit_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la moneda"
+msgstr ""
msgctxt "help:account.dunning.level,credit_limit:"
msgid "Has reached the credit limit"
-msgstr "Ha alcanzado el límite de crédito."
+msgstr ""
msgctxt "model:res.group,name:group_credit_limit"
msgid "Account Credit Limit"
-msgstr "Límite de crédito contable"
+msgstr ""
msgctxt "view:account.configuration:"
msgid "Credit Limit"
diff --git a/party.py b/party.py
index b11e227..c27eebf 100644
--- a/party.py
+++ b/party.py
@@ -6,10 +6,10 @@ from trytond.transaction import Transaction
from trytond.pyson import Eval
__all__ = ['Party']
-__metaclass__ = PoolMeta
class Party:
+ __metaclass__ = PoolMeta
__name__ = 'party.party'
credit_amount = fields.Function(fields.Numeric('Credit Amount',
@@ -74,7 +74,7 @@ class Party:
for model in self._credit_limit_to_lock():
Model = pool.get(model)
- Transaction().cursor.lock(Model._table)
+ Transaction().database.lock(Transaction().connection, Model._table)
if self.credit_limit_amount < self.credit_amount + amount:
if not in_group():
self.raise_user_error('credit_limit_amount',
diff --git a/setup.py b/setup.py
index e9e45f6..9bee088 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'))
@@ -75,6 +81,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',
@@ -88,6 +95,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 6ec40fd..8c26e6e 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_account_credit_limit import suite
+try:
+ from trytond.modules.account_credit_limit.tests.test_account_credit_limit import suite
+except ImportError:
+ from .test_account_credit_limit import suite
__all__ = ['suite']
diff --git a/tests/test_account_credit_limit.py b/tests/test_account_credit_limit.py
index 3dab966..0b6a5fd 100644
--- a/tests/test_account_credit_limit.py
+++ b/tests/test_account_credit_limit.py
@@ -1,43 +1,49 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
import unittest
-import doctest
from decimal import Decimal
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
-from trytond.transaction import Transaction
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
+from trytond.pool import Pool
from trytond.exceptions import UserError, UserWarning
+from trytond.modules.company.tests import create_company, set_company
+from trytond.modules.account.tests import create_chart, get_fiscalyear
+
class AccountCreditLimitTestCase(ModuleTestCase):
'Test AccountCreditLimit module'
module = 'account_credit_limit'
- def setUp(self):
- super(AccountCreditLimitTestCase, self).setUp()
- self.account = POOL.get('account.account')
- self.move = POOL.get('account.move')
- self.period = POOL.get('account.period')
- self.journal = POOL.get('account.journal')
- self.party = POOL.get('party.party')
-
- def test0010check_credit_limit(self):
+ @with_transaction()
+ def test_check_credit_limit(self):
'Test check_credit_limit'
- with Transaction().start(DB_NAME, USER, context=CONTEXT):
- receivable, = self.account.search([
+ pool = Pool()
+ Account = pool.get('account.account')
+ Move = pool.get('account.move')
+ Journal = pool.get('account.journal')
+ Party = pool.get('party.party')
+
+ company = create_company()
+ with set_company(company):
+ create_chart(company)
+ fiscalyear = get_fiscalyear(company)
+ fiscalyear.save()
+ fiscalyear.create_period([fiscalyear])
+ period = fiscalyear.periods[0]
+
+ receivable, = Account.search([
('kind', '=', 'receivable'),
])
- revenue, = self.account.search([
+ revenue, = Account.search([
('kind', '=', 'revenue'),
])
- journal, = self.journal.search([], limit=1)
- period, = self.period.search([], limit=1)
- party, = self.party.create([{
+ journal, = Journal.search([], limit=1)
+ party, = Party.create([{
'name': 'Party',
}])
- self.move.create([{
+ Move.create([{
'journal': journal.id,
'period': period.id,
'date': period.start_date,
@@ -76,10 +82,6 @@ class AccountCreditLimitTestCase(ModuleTestCase):
def suite():
suite = trytond.tests.test_tryton.suite()
- from trytond.modules.account.tests import test_account
- for test in test_account.suite():
- if test not in suite and not isinstance(test, doctest.DocTestCase):
- suite.addTest(test)
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
AccountCreditLimitTestCase))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 7e33b4f..dec0846 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
account
company
diff --git a/trytond_account_credit_limit.egg-info/PKG-INFO b/trytond_account_credit_limit.egg-info/PKG-INFO
index 0f68c56..60ca856 100644
--- a/trytond_account_credit_limit.egg-info/PKG-INFO
+++ b/trytond_account_credit_limit.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-credit-limit
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module for account credit limit
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_account_credit_limit
============================
@@ -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_account_credit_limit.egg-info/SOURCES.txt b/trytond_account_credit_limit.egg-info/SOURCES.txt
index d473386..365e4a0 100644
--- a/trytond_account_credit_limit.egg-info/SOURCES.txt
+++ b/trytond_account_credit_limit.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_account_credit_limit.egg-info/PKG-INFO
trytond_account_credit_limit.egg-info/SOURCES.txt
trytond_account_credit_limit.egg-info/dependency_links.txt
diff --git a/trytond_account_credit_limit.egg-info/requires.txt b/trytond_account_credit_limit.egg-info/requires.txt
index 3e4967e..a41c40c 100644
--- a/trytond_account_credit_limit.egg-info/requires.txt
+++ b/trytond_account_credit_limit.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account >= 3.8, < 3.9
-trytond_company >= 3.8, < 3.9
-trytond_party >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_account >= 4.0, < 4.1
+trytond_company >= 4.0, < 4.1
+trytond_party >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-account-credit-limit
More information about the tryton-debian-vcs
mailing list