[tryton-debian-vcs] tryton-modules-analytic-sale branch upstream updated. upstream/3.8.0-2-ge6cf141
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:10:08 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-analytic-sale.git;a=commitdiff;h=upstream/3.8.0-2-ge6cf141
commit e6cf1419d06285f5a8484748406a575ee8022711
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:14 2016 +0200
Adding upstream version 4.0.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
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 a4fbff8..644bd15 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_analytic_sale
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add analytic accounting on sale
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 0411492..f0da790 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,10 +2,9 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
msgctxt "error:sale.line:"
msgid "Some mandatory root account are missing on \"%(name)s\""
-msgstr "Alguna cuenta raíz obligatoria falta en \"%(name)s\""
+msgstr "Falta una cuenta raíz obligatoria en \"%(name)s\""
msgctxt "field:sale.line,analytic_accounts:"
msgid "Analytic Accounts"
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
index 5a5a737..fae7c6c 100644
--- a/locale/lo_LA.po
+++ b/locale/lo_LA.po
@@ -4,12 +4,12 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:sale.line:"
msgid "Some mandatory root account are missing on \"%(name)s\""
-msgstr ""
+msgstr "ບາງບັນຊີຫຼັກບັງຄັບບໍ່ມີໃນ \"%(name)s"
msgctxt "field:sale.line,analytic_accounts:"
msgid "Analytic Accounts"
-msgstr ""
+msgstr "ບັນຊີວິເຄາະ"
msgctxt "field:sale.line,analytic_accounts_size:"
msgid "Analytic Accounts Size"
-msgstr ""
+msgstr "ຂະໜາດບັນຊີວິເຄາະ"
diff --git a/tryton.cfg b/tryton.cfg
index be40ba1..a0a301f 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_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index 388703e..f098698 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-analytic-sale
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add analytic accounting on sale
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_analytic_sale.egg-info/SOURCES.txt b/trytond_analytic_sale.egg-info/SOURCES.txt
index 23eec36..d4a3941 100644
--- a/trytond_analytic_sale.egg-info/SOURCES.txt
+++ b/trytond_analytic_sale.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_sale.rst
./tests/test_analytic_sale.py
diff --git a/trytond_analytic_sale.egg-info/requires.txt b/trytond_analytic_sale.egg-info/requires.txt
index 725a96b..5c6d7a1 100644
--- a/trytond_analytic_sale.egg-info/requires.txt
+++ b/trytond_analytic_sale.egg-info/requires.txt
@@ -1,4 +1,4 @@
trytond_analytic_account >= 4.0, < 4.1
trytond_analytic_invoice >= 4.0, < 4.1
trytond_sale >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit 492227d99ef34d9655d7f7ab5860b6c82eac1a4c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:25:55 2016 +0200
Adding upstream version 4.0.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
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 558e658..0c8203b 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-2011 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 6d0a6fa..a4fbff8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_analytic_sale
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add analytic accounting on sale
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_sale
=====================
@@ -53,6 +53,8 @@ Classifier: Intended Audience :: Financial and Insurance Industry
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
@@ -66,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 debcf6b..931b05f 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -10,6 +10,7 @@ msgctxt "field:sale.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Аналитични сметки"
+#, fuzzy
msgctxt "field:sale.line,analytic_accounts_size:"
msgid "Analytic Accounts Size"
-msgstr ""
+msgstr "Аналитични сметки"
diff --git a/locale/ru_RU.po b/locale/lo_LA.po
similarity index 89%
copy from locale/ru_RU.po
copy to locale/lo_LA.po
index 89344cc..5a5a737 100644
--- a/locale/ru_RU.po
+++ b/locale/lo_LA.po
@@ -8,7 +8,7 @@ msgstr ""
msgctxt "field:sale.line,analytic_accounts:"
msgid "Analytic Accounts"
-msgstr "Счета аналитики"
+msgstr ""
msgctxt "field:sale.line,analytic_accounts_size:"
msgid "Analytic Accounts Size"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 89344cc..6f2db79 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -10,6 +10,7 @@ msgctxt "field:sale.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Счета аналитики"
+#, fuzzy
msgctxt "field:sale.line,analytic_accounts_size:"
msgid "Analytic Accounts Size"
-msgstr ""
+msgstr "Счета аналитики"
diff --git a/locale/ru_RU.po b/locale/zh_CN.po
similarity index 89%
copy from locale/ru_RU.po
copy to locale/zh_CN.po
index 89344cc..5a5a737 100644
--- a/locale/ru_RU.po
+++ b/locale/zh_CN.po
@@ -8,7 +8,7 @@ msgstr ""
msgctxt "field:sale.line,analytic_accounts:"
msgid "Analytic Accounts"
-msgstr "Счета аналитики"
+msgstr ""
msgctxt "field:sale.line,analytic_accounts_size:"
msgid "Analytic Accounts Size"
diff --git a/sale.py b/sale.py
index 1b67f09..08514c9 100644
--- a/sale.py
+++ b/sale.py
@@ -5,17 +5,16 @@ from trytond.pool import Pool, PoolMeta
from trytond.modules.analytic_account import AnalyticMixin
__all__ = ['SaleLine', 'AnalyticAccountEntry']
-__metaclass__ = PoolMeta
class SaleLine(AnalyticMixin):
__name__ = 'sale.line'
- def get_invoice_line(self, invoice_type):
+ def get_invoice_line(self):
pool = Pool()
AnalyticAccountEntry = pool.get('analytic.account.entry')
- invoice_lines = super(SaleLine, self).get_invoice_line(invoice_type)
+ invoice_lines = super(SaleLine, self).get_invoice_line()
for invoice_line in invoice_lines:
new_entries = AnalyticAccountEntry.copy(self.analytic_accounts,
default={
@@ -26,6 +25,7 @@ class SaleLine(AnalyticMixin):
class AnalyticAccountEntry:
+ __metaclass__ = PoolMeta
__name__ = 'analytic.account.entry'
@classmethod
diff --git a/setup.py b/setup.py
index 0fa831c..c0fec1b 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'))
@@ -80,6 +86,8 @@ setup(name=name,
'Intended Audience :: Legal Industry',
'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',
@@ -93,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',
@@ -109,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_sale.rst',
+ ],
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 7e53c85..ae83165 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_sale import suite
+try:
+ from trytond.modules.analytic_sale.tests.test_analytic_sale import suite
+except ImportError:
+ from .test_analytic_sale import suite
__all__ = ['suite']
diff --git a/tests/scenario_analytic_sale.rst b/tests/scenario_analytic_sale.rst
index b2d1b14..090de2a 100644
--- a/tests/scenario_analytic_sale.rst
+++ b/tests/scenario_analytic_sale.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()
diff --git a/tests/test_analytic_sale.py b/tests/test_analytic_sale.py
index b2f4be4..de03be7 100644
--- a/tests/test_analytic_sale.py
+++ b/tests/test_analytic_sale.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 AnalyticSaleTestCase(ModuleTestCase):
@@ -18,5 +19,6 @@ def suite():
AnalyticSaleTestCase))
suite.addTests(doctest.DocFileSuite('scenario_analytic_sale.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 7a7a450..be40ba1 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_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index 1c038f1..388703e 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-analytic-sale
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add analytic accounting on sale
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_sale
=====================
@@ -53,6 +53,8 @@ Classifier: Intended Audience :: Financial and Insurance Industry
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
@@ -66,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_sale.egg-info/SOURCES.txt b/trytond_analytic_sale.egg-info/SOURCES.txt
index 96c1a40..23eec36 100644
--- a/trytond_analytic_sale.egg-info/SOURCES.txt
+++ b/trytond_analytic_sale.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_sale.egg-info/PKG-INFO
trytond_analytic_sale.egg-info/SOURCES.txt
trytond_analytic_sale.egg-info/dependency_links.txt
diff --git a/trytond_analytic_sale.egg-info/requires.txt b/trytond_analytic_sale.egg-info/requires.txt
index bd0a9b4..725a96b 100644
--- a/trytond_analytic_sale.egg-info/requires.txt
+++ b/trytond_analytic_sale.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_analytic_account >= 3.8, < 3.9
-trytond_analytic_invoice >= 3.8, < 3.9
-trytond_sale >= 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_sale >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-analytic-sale
More information about the tryton-debian-vcs
mailing list