[tryton-debian-vcs] tryton-modules-account-tax-rule-country branch debian updated. debian/3.8.0-2-5-g2de74c4
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:08:46 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-tax-rule-country.git;a=commitdiff;h=debian/3.8.0-2-5-g2de74c4
commit 2de74c40dcc64ad779f2db0c276c6145c134d933
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:17 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 27c4061..3eeaca6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-account-tax-rule-country (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:42 +0200
+
tryton-modules-account-tax-rule-country (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit 5fa7cdc83b2f3c476365618ec3d27d58a6dd8e11
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 31d75bd16ace70953ab5786ce08f7cfc43d08708
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:13 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 a722e12..89a1ea4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_tax_rule_country
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add countries on tax rules
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 0faa71c..0158d20 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,19 +2,17 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
msgctxt "field:account.tax.rule.line,from_country:"
msgid "From Country"
-msgstr "Al País"
+msgstr "Del País"
msgctxt "field:account.tax.rule.line,to_country:"
msgid "To Country"
msgstr "Al País"
-#, fuzzy
msgctxt "field:account.tax.rule.line.template,from_country:"
msgid "From Country"
-msgstr "Al País"
+msgstr "Del País"
msgctxt "field:account.tax.rule.line.template,to_country:"
msgid "To Country"
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
index ede2b7a..c92d0aa 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 "field:account.tax.rule.line,from_country:"
msgid "From Country"
-msgstr ""
+msgstr "ຈາກປະເທດ"
msgctxt "field:account.tax.rule.line,to_country:"
msgid "To Country"
-msgstr ""
+msgstr "ເຖິງປະເທດ"
msgctxt "field:account.tax.rule.line.template,from_country:"
msgid "From Country"
-msgstr ""
+msgstr "ຈາກປະເທດ"
msgctxt "field:account.tax.rule.line.template,to_country:"
msgid "To Country"
-msgstr ""
+msgstr "ເຖິງປະເທດ"
diff --git a/tryton.cfg b/tryton.cfg
index f0f74b5..bad4ca8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
account
country
diff --git a/trytond_account_tax_rule_country.egg-info/PKG-INFO b/trytond_account_tax_rule_country.egg-info/PKG-INFO
index f936311..76a8225 100644
--- a/trytond_account_tax_rule_country.egg-info/PKG-INFO
+++ b/trytond_account_tax_rule_country.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account-tax-rule-country
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add countries on tax rules
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_account_tax_rule_country.egg-info/SOURCES.txt b/trytond_account_tax_rule_country.egg-info/SOURCES.txt
index 9161ff5..6d960da 100644
--- a/trytond_account_tax_rule_country.egg-info/SOURCES.txt
+++ b/trytond_account_tax_rule_country.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/test_account_tax_rule_country.py
./view/tax_rule_line_form.xml
diff --git a/trytond_account_tax_rule_country.egg-info/requires.txt b/trytond_account_tax_rule_country.egg-info/requires.txt
index c500adf..14e438c 100644
--- a/trytond_account_tax_rule_country.egg-info/requires.txt
+++ b/trytond_account_tax_rule_country.egg-info/requires.txt
@@ -1,3 +1,3 @@
trytond_account >= 4.0, < 4.1
trytond_country >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit 962e659ce7321098bf95cb63b232147d4ef72653
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:25:54 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 c0e2ccf..a722e12 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_tax_rule_country
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add countries on tax rules
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_tax_rule_country
================================
@@ -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 3be9f12..3553891 100644
--- a/account.py
+++ b/account.py
@@ -5,18 +5,30 @@ from trytond.pool import Pool, PoolMeta
from trytond.model import fields
__all__ = ['TaxRuleLineTemplate', 'TaxRuleLine', 'InvoiceLine']
-__metaclass__ = PoolMeta
class TaxRuleLineTemplate:
+ __metaclass__ = PoolMeta
__name__ = 'account.tax.rule.line.template'
from_country = fields.Many2One('country.country', 'From Country',
ondelete='RESTRICT')
to_country = fields.Many2One('country.country', 'To Country',
ondelete='RESTRICT')
+ def _get_tax_rule_line_value(self, rule_line=None):
+ value = super(TaxRuleLineTemplate, self)._get_tax_rule_line_value(
+ rule_line=rule_line)
+ if not rule_line or rule_line.from_country != self.from_country:
+ value['from_country'] = (
+ self.from_country.id if self.from_country else None)
+ if not rule_line or rule_line.to_country != self.to_country:
+ value['to_country'] = (
+ self.to_country.id if self.to_country else None)
+ return value
+
class TaxRuleLine:
+ __metaclass__ = PoolMeta
__name__ = 'account.tax.rule.line'
from_country = fields.Many2One('country.country', 'From Country',
ondelete='RESTRICT')
@@ -25,6 +37,7 @@ class TaxRuleLine:
class InvoiceLine:
+ __metaclass__ = PoolMeta
__name__ = 'account.invoice.line'
def _get_tax_rule_pattern(self):
diff --git a/locale/es_CO.po b/locale/es_CO.po
index fbf235a..0faa71c 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,17 +2,19 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "field:account.tax.rule.line,from_country:"
msgid "From Country"
-msgstr ""
+msgstr "Al País"
msgctxt "field:account.tax.rule.line,to_country:"
msgid "To Country"
msgstr "Al País"
+#, fuzzy
msgctxt "field:account.tax.rule.line.template,from_country:"
msgid "From Country"
-msgstr ""
+msgstr "Al País"
msgctxt "field:account.tax.rule.line.template,to_country:"
msgid "To Country"
diff --git a/locale/es_CO.po b/locale/lo_LA.po
similarity index 91%
copy from locale/es_CO.po
copy to locale/lo_LA.po
index fbf235a..ede2b7a 100644
--- a/locale/es_CO.po
+++ b/locale/lo_LA.po
@@ -8,7 +8,7 @@ msgstr ""
msgctxt "field:account.tax.rule.line,to_country:"
msgid "To Country"
-msgstr "Al País"
+msgstr ""
msgctxt "field:account.tax.rule.line.template,from_country:"
msgid "From Country"
@@ -16,4 +16,4 @@ msgstr ""
msgctxt "field:account.tax.rule.line.template,to_country:"
msgid "To Country"
-msgstr "A País"
+msgstr ""
diff --git a/locale/es_CO.po b/locale/zh_CN.po
similarity index 91%
copy from locale/es_CO.po
copy to locale/zh_CN.po
index fbf235a..ede2b7a 100644
--- a/locale/es_CO.po
+++ b/locale/zh_CN.po
@@ -8,7 +8,7 @@ msgstr ""
msgctxt "field:account.tax.rule.line,to_country:"
msgid "To Country"
-msgstr "Al País"
+msgstr ""
msgctxt "field:account.tax.rule.line.template,from_country:"
msgid "From Country"
@@ -16,4 +16,4 @@ msgstr ""
msgctxt "field:account.tax.rule.line.template,to_country:"
msgid "To Country"
-msgstr "A País"
+msgstr ""
diff --git a/purchase.py b/purchase.py
index 928a5fb..4edfd32 100644
--- a/purchase.py
+++ b/purchase.py
@@ -6,10 +6,10 @@ from trytond.model import fields
from trytond.pyson import Eval
__all__ = ['Purchase', 'PurchaseLine']
-__metaclass__ = PoolMeta
class Purchase:
+ __metaclass__ = PoolMeta
__name__ = 'purchase.purchase'
@classmethod
@@ -22,6 +22,7 @@ class Purchase:
class PurchaseLine:
+ __metaclass__ = PoolMeta
__name__ = 'purchase.line'
def _get_tax_rule_pattern(self):
diff --git a/sale.py b/sale.py
index d154b05..f1328b4 100644
--- a/sale.py
+++ b/sale.py
@@ -6,10 +6,10 @@ from trytond.model import fields
from trytond.pyson import Eval
__all__ = ['Sale', 'SaleLine']
-__metaclass__ = PoolMeta
class Sale:
+ __metaclass__ = PoolMeta
__name__ = 'sale.sale'
@classmethod
@@ -22,6 +22,7 @@ class Sale:
class SaleLine:
+ __metaclass__ = PoolMeta
__name__ = 'sale.line'
def _get_tax_rule_pattern(self):
diff --git a/setup.py b/setup.py
index 30d087b..41fbacf 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 b796794..172d859 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_tax_rule_country import suite
+try:
+ from trytond.modules.account_tax_rule_country.tests.test_account_tax_rule_country import suite
+except ImportError:
+ from .test_account_tax_rule_country import suite
__all__ = ['suite']
diff --git a/tests/test_account_tax_rule_country.py b/tests/test_account_tax_rule_country.py
index 35d8cf1..8b7f9cd 100644
--- a/tests/test_account_tax_rule_country.py
+++ b/tests/test_account_tax_rule_country.py
@@ -2,14 +2,35 @@
# this repository contains the full copyright notices and license terms.
import unittest
+from trytond.pool import Pool
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
+
+from trytond.modules.company.tests import create_company, set_company
+from trytond.modules.account.tests import create_chart
class AccountTaxRuleCountryTestCase(ModuleTestCase):
'Test Account Tax Rule Country module'
module = 'account_tax_rule_country'
+ @with_transaction()
+ def test_account_chart(self):
+ 'Test creation and update of minimal chart of accounts'
+ pool = Pool()
+ Account = pool.get('account.account')
+ UpdateChart = pool.get('account.update_chart', type='wizard')
+
+ company = create_company()
+ with set_company(company):
+ create_chart(company, tax=True)
+ root, = Account.search([('parent', '=', None)])
+
+ session_id, _, _ = UpdateChart.create()
+ update_chart = UpdateChart(session_id)
+ update_chart.start.account = root
+ update_chart.transition_update()
+
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/tryton.cfg b/tryton.cfg
index 9fdab35..f0f74b5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
account
country
diff --git a/trytond_account_tax_rule_country.egg-info/PKG-INFO b/trytond_account_tax_rule_country.egg-info/PKG-INFO
index 5cfb896..f936311 100644
--- a/trytond_account_tax_rule_country.egg-info/PKG-INFO
+++ b/trytond_account_tax_rule_country.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-tax-rule-country
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add countries on tax rules
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_tax_rule_country
================================
@@ -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_tax_rule_country.egg-info/SOURCES.txt b/trytond_account_tax_rule_country.egg-info/SOURCES.txt
index bf270f9..9161ff5 100644
--- a/trytond_account_tax_rule_country.egg-info/SOURCES.txt
+++ b/trytond_account_tax_rule_country.egg-info/SOURCES.txt
@@ -52,11 +52,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_tax_rule_country.egg-info/PKG-INFO
trytond_account_tax_rule_country.egg-info/SOURCES.txt
trytond_account_tax_rule_country.egg-info/dependency_links.txt
diff --git a/trytond_account_tax_rule_country.egg-info/requires.txt b/trytond_account_tax_rule_country.egg-info/requires.txt
index 929d969..c500adf 100644
--- a/trytond_account_tax_rule_country.egg-info/requires.txt
+++ b/trytond_account_tax_rule_country.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_account >= 3.8, < 3.9
-trytond_country >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_account >= 4.0, < 4.1
+trytond_country >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-account-tax-rule-country
More information about the tryton-debian-vcs
mailing list