[tryton-debian-vcs] tryton-modules-analytic-purchase branch debian updated. debian/3.8.0-2-5-g4542dc7
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:09:29 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-analytic-purchase.git;a=commitdiff;h=debian/3.8.0-2-5-g4542dc7
commit 4542dc786e8deb04eb15026db0a7a425ae0765bc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:18 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 9c03c77..7587e08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-analytic-purchase (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:27:46 +0200
+
tryton-modules-analytic-purchase (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit 9f4a122fa82c991b2cdccd3bc4cbb0fa82299608
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 114a120..745be47 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,14 @@
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-2013 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 b9b694044a81401ea44445ff00faf678b2b96fe9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:14 2016 +0200
Merging upstream version 4.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index 98668f8..b6ab8b6 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 fcd1d7e..35e0463 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_analytic_purchase
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add analytic accounting on purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 5f7116a..8cb2a97 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -8,13 +8,12 @@ msgstr "Alguna cuenta raíz obligatoria falta en \"%(name)s\""
msgctxt "error:purchase.purchase:"
msgid "Analytic account is required for \"%(roots)s\" on line \"%(line)s\"."
-msgstr ""
+msgstr "La cuenta analítica es requerida para \"%(root)s\" en la línea \"(line)s\"."
msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Cuentas Analíticas"
-#, fuzzy
msgctxt "field:purchase.line,analytic_accounts_size:"
msgid "Analytic Accounts Size"
msgstr "Tamaño de Centro de Costos"
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
index 76fa821..df28a58 100644
--- a/locale/lo_LA.po
+++ b/locale/lo_LA.po
@@ -4,16 +4,16 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.line:"
msgid "Some mandatory root account are missing on \"%(name)s\""
-msgstr ""
+msgstr "ບາງບັນຊີຫຼັກບັງຄັບ ບໍາມີໃນ \"%(name)s\""
msgctxt "error:purchase.purchase:"
msgid "Analytic account is required for \"%(roots)s\" on line \"%(line)s\"."
-msgstr ""
+msgstr "ຕ້ອງການໃຫ້ມີ ບັນຊີວິເຄາະ ສຳລັບ \"%(roots)s\" ໃນລາຍການ \"%(line)s\"."
msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
-msgstr ""
+msgstr "ບັນຊີວິເຄາະ"
msgctxt "field:purchase.line,analytic_accounts_size:"
msgid "Analytic Accounts Size"
-msgstr ""
+msgstr "ຂະໜາດບັນຊີວິເຄາະ"
diff --git a/tryton.cfg b/tryton.cfg
index 1b63a78..1736ff7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
analytic_account
analytic_invoice
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index 199182f..4a00b28 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-analytic-purchase
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add analytic accounting on purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_analytic_purchase.egg-info/SOURCES.txt b/trytond_analytic_purchase.egg-info/SOURCES.txt
index 94227af..5bc07ac 100644
--- a/trytond_analytic_purchase.egg-info/SOURCES.txt
+++ b/trytond_analytic_purchase.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_analytic_purchase.rst
./tests/test_analytic_purchase.py
diff --git a/trytond_analytic_purchase.egg-info/requires.txt b/trytond_analytic_purchase.egg-info/requires.txt
index 3434912..eba776b 100644
--- a/trytond_analytic_purchase.egg-info/requires.txt
+++ b/trytond_analytic_purchase.egg-info/requires.txt
@@ -1,4 +1,4 @@
trytond_analytic_account >= 4.0, < 4.1
trytond_analytic_invoice >= 4.0, < 4.1
trytond_purchase >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit 6305c0134257cc20d80c4f7db8189f3bbe6bf31f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:25:55 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index e3e8bf7..98668f8 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 4c7ddcd..fcc5eeb 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-2013 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 afea3fe..fcd1d7e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_analytic_purchase
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add analytic accounting on purchase
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_analytic_purchase
=========================
@@ -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/bg_BG.po b/locale/bg_BG.po
index 581fd35..ae2acb5 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -14,6 +14,7 @@ msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Аналитични сметки"
+#, fuzzy
msgctxt "field:purchase.line,analytic_accounts_size:"
msgid "Analytic Accounts Size"
-msgstr ""
+msgstr "Аналитични сметки"
diff --git a/locale/ru_RU.po b/locale/lo_LA.po
similarity index 92%
copy from locale/ru_RU.po
copy to locale/lo_LA.po
index d123138..76fa821 100644
--- a/locale/ru_RU.po
+++ b/locale/lo_LA.po
@@ -12,7 +12,7 @@ msgstr ""
msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
-msgstr "Счета аналитики"
+msgstr ""
msgctxt "field:purchase.line,analytic_accounts_size:"
msgid "Analytic Accounts Size"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index d123138..be9c6f1 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -14,6 +14,7 @@ msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Счета аналитики"
+#, fuzzy
msgctxt "field:purchase.line,analytic_accounts_size:"
msgid "Analytic Accounts Size"
-msgstr ""
+msgstr "Счета аналитики"
diff --git a/locale/ru_RU.po b/locale/zh_CN.po
similarity index 92%
copy from locale/ru_RU.po
copy to locale/zh_CN.po
index d123138..76fa821 100644
--- a/locale/ru_RU.po
+++ b/locale/zh_CN.po
@@ -12,7 +12,7 @@ msgstr ""
msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
-msgstr "Счета аналитики"
+msgstr ""
msgctxt "field:purchase.line,analytic_accounts_size:"
msgid "Analytic Accounts Size"
diff --git a/purchase.py b/purchase.py
index 99c75cb..9cfd893 100644
--- a/purchase.py
+++ b/purchase.py
@@ -6,10 +6,10 @@ from trytond.pool import Pool, PoolMeta
from trytond.modules.analytic_account import AnalyticMixin
__all__ = ['Purchase', 'PurchaseLine', 'AnalyticAccountEntry']
-__metaclass__ = PoolMeta
class Purchase:
+ __metaclass__ = PoolMeta
__name__ = "purchase.purchase"
@classmethod
@@ -46,12 +46,11 @@ class Purchase:
class PurchaseLine(AnalyticMixin):
__name__ = 'purchase.line'
- def get_invoice_line(self, invoice_type):
+ def get_invoice_line(self):
pool = Pool()
AnalyticAccountEntry = pool.get('analytic.account.entry')
- invoice_lines = super(PurchaseLine, self).get_invoice_line(
- invoice_type)
+ invoice_lines = super(PurchaseLine, self).get_invoice_line()
for invoice_line in invoice_lines:
new_entries = AnalyticAccountEntry.copy(self.analytic_accounts,
default={
@@ -62,6 +61,7 @@ class PurchaseLine(AnalyticMixin):
class AnalyticAccountEntry:
+ __metaclass__ = PoolMeta
__name__ = 'analytic.account.entry'
@classmethod
diff --git a/setup.py b/setup.py
index 4647d51..5263711 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_analytic_purchase.rst',
+ ],
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 15f1d94..1946c2e 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_analytic_purchase import suite
+try:
+ from trytond.modules.analytic_purchase.tests.test_analytic_purchase import suite
+except ImportError:
+ from .test_analytic_purchase import suite
__all__ = ['suite']
diff --git a/tests/scenario_analytic_purchase.rst b/tests/scenario_analytic_purchase.rst
index ff8d106..ee25882 100644
--- a/tests/scenario_analytic_purchase.rst
+++ b/tests/scenario_analytic_purchase.rst
@@ -13,7 +13,7 @@ Imports::
... get_company
>>> from trytond.modules.account.tests.tools import create_fiscalyear, \
... create_chart, get_accounts
- >>> 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()
@@ -185,10 +185,10 @@ Analytic entries are not required until quotation::
>>> purchase_line.product = product
>>> purchase_line.quantity = 5
>>> purchase.save()
- >>> purchase.click('quote')
+ >>> purchase.click('quote') # doctest: +IGNORE_EXCEPTION_DETAIL
Traceback (most recent call last):
...
- UserError: ('UserError', (u'Analytic account is required for "Root" on line "product".', ''))
+ UserError: ...
>>> purchase_line, = purchase.lines
>>> entry, mandatory_entry = purchase_line.analytic_accounts
>>> mandatory_entry.account = mandatory_analytic_account
diff --git a/tests/test_analytic_purchase.py b/tests/test_analytic_purchase.py
index e72a1b5..a75eb25 100644
--- a/tests/test_analytic_purchase.py
+++ b/tests/test_analytic_purchase.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 AnalyticPurchaseTestCase(ModuleTestCase):
@@ -18,5 +19,6 @@ def suite():
AnalyticPurchaseTestCase))
suite.addTests(doctest.DocFileSuite('scenario_analytic_purchase.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 3499805..1b63a78 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
analytic_account
analytic_invoice
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index 56b81ca..199182f 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-analytic-purchase
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add analytic accounting on purchase
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_analytic_purchase
=========================
@@ -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_analytic_purchase.egg-info/SOURCES.txt b/trytond_analytic_purchase.egg-info/SOURCES.txt
index 485210e..94227af 100644
--- a/trytond_analytic_purchase.egg-info/SOURCES.txt
+++ b/trytond_analytic_purchase.egg-info/SOURCES.txt
@@ -46,11 +46,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_analytic_purchase.egg-info/PKG-INFO
trytond_analytic_purchase.egg-info/SOURCES.txt
trytond_analytic_purchase.egg-info/dependency_links.txt
diff --git a/trytond_analytic_purchase.egg-info/requires.txt b/trytond_analytic_purchase.egg-info/requires.txt
index 2ab991a..3434912 100644
--- a/trytond_analytic_purchase.egg-info/requires.txt
+++ b/trytond_analytic_purchase.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_analytic_account >= 3.8, < 3.9
-trytond_analytic_invoice >= 3.8, < 3.9
-trytond_purchase >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_analytic_account >= 4.0, < 4.1
+trytond_analytic_invoice >= 4.0, < 4.1
+trytond_purchase >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-analytic-purchase
More information about the tryton-debian-vcs
mailing list