[tryton-debian-vcs] tryton-modules-sale-invoice-grouping branch upstream updated. upstream/3.8.0-2-ga174cc6
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:25:56 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-sale-invoice-grouping.git;a=commitdiff;h=upstream/3.8.0-2-ga174cc6
commit a174cc62e886dae1bd17e68b731eaba6767b087c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:29 2016 +0200
Adding upstream version 4.0.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index d271f63..9dacc70 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 5615587..74d6d5a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale_invoice_grouping
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to group sale invoices
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
index 3bc68e7..de6eeec 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:party.party,sale_invoice_grouping_method:"
msgid "Sale Invoice Grouping Method"
-msgstr ""
+msgstr "ວິທີຮວມກຸ່ມໃບເກັບເງິນ"
msgctxt "selection:party.party,sale_invoice_grouping_method:"
msgid "None"
-msgstr ""
+msgstr "ບໍ່ມີ"
msgctxt "selection:party.party,sale_invoice_grouping_method:"
msgid "Standard"
-msgstr ""
+msgstr "ມາດຕະຖານ"
msgctxt "view:party.party:"
msgid "Invoicing"
-msgstr ""
+msgstr "ການສ້າງໃບເກັບເງິນ"
diff --git a/tryton.cfg b/tryton.cfg
index 6ac84d7..d3182ed 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
ir
res
diff --git a/trytond_sale_invoice_grouping.egg-info/PKG-INFO b/trytond_sale_invoice_grouping.egg-info/PKG-INFO
index a4051f4..8210e82 100644
--- a/trytond_sale_invoice_grouping.egg-info/PKG-INFO
+++ b/trytond_sale_invoice_grouping.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-sale-invoice-grouping
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to group sale invoices
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_sale_invoice_grouping.egg-info/SOURCES.txt b/trytond_sale_invoice_grouping.egg-info/SOURCES.txt
index 3e5941c..4f7e21c 100644
--- a/trytond_sale_invoice_grouping.egg-info/SOURCES.txt
+++ b/trytond_sale_invoice_grouping.egg-info/SOURCES.txt
@@ -25,11 +25,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/scenario_sale_invoice_grouping.rst
./view/party_form.xml
doc/index.rst
diff --git a/trytond_sale_invoice_grouping.egg-info/requires.txt b/trytond_sale_invoice_grouping.egg-info/requires.txt
index 446c5f1..bf0b46d 100644
--- a/trytond_sale_invoice_grouping.egg-info/requires.txt
+++ b/trytond_sale_invoice_grouping.egg-info/requires.txt
@@ -1,4 +1,4 @@
trytond_party >= 4.0, < 4.1
trytond_account_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 eb609609975da9d8a2376de8f4a42753fc7a44a6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:15 2016 +0200
Adding upstream version 4.0.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 1f11dda..d271f63 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 d0ca1bf..fd7fb19 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
Copyright (C) 2013-2015 Nicolas Évrard.
-Copyright (C) 2013-2015 B2CK SPRL.
+Copyright (C) 2013-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 b295d6f..5615587 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_invoice_grouping
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to group sale invoices
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: sale_invoice_grouping
=====================
@@ -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/lo_LA.po b/locale/lo_LA.po
new file mode 100644
index 0000000..3bc68e7
--- /dev/null
+++ b/locale/lo_LA.po
@@ -0,0 +1,19 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:party.party,sale_invoice_grouping_method:"
+msgid "Sale Invoice Grouping Method"
+msgstr ""
+
+msgctxt "selection:party.party,sale_invoice_grouping_method:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:party.party,sale_invoice_grouping_method:"
+msgid "Standard"
+msgstr ""
+
+msgctxt "view:party.party:"
+msgid "Invoicing"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
new file mode 100644
index 0000000..3bc68e7
--- /dev/null
+++ b/locale/zh_CN.po
@@ -0,0 +1,19 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:party.party,sale_invoice_grouping_method:"
+msgid "Sale Invoice Grouping Method"
+msgstr ""
+
+msgctxt "selection:party.party,sale_invoice_grouping_method:"
+msgid "None"
+msgstr ""
+
+msgctxt "selection:party.party,sale_invoice_grouping_method:"
+msgid "Standard"
+msgstr ""
+
+msgctxt "view:party.party:"
+msgid "Invoicing"
+msgstr ""
diff --git a/party.py b/party.py
index 5eeb8eb..864fd30 100644
--- a/party.py
+++ b/party.py
@@ -4,11 +4,11 @@
from trytond.model import fields
from trytond.pool import PoolMeta
-__metaclass__ = PoolMeta
__all__ = ['Party']
class Party:
+ __metaclass__ = PoolMeta
__name__ = 'party.party'
sale_invoice_grouping_method = fields.Property(fields.Selection([
diff --git a/sale.py b/sale.py
index c1a11fa..82c84d9 100644
--- a/sale.py
+++ b/sale.py
@@ -3,11 +3,11 @@
from trytond.pool import Pool, PoolMeta
-__metaclass__ = PoolMeta
__all__ = ['Sale']
class Sale:
+ __metaclass__ = PoolMeta
__name__ = 'sale.sale'
@property
@@ -37,9 +37,9 @@ class Sale:
)
return invoice_domain
- def _get_invoice_sale(self, invoice_type):
+ def _get_invoice_sale(self):
Invoice = Pool().get('account.invoice')
- invoice = super(Sale, self)._get_invoice_sale(invoice_type)
+ invoice = super(Sale, self)._get_invoice_sale()
if self.invoice_grouping_method:
domain = self._get_grouped_invoice_domain(invoice)
order = self._get_grouped_invoice_order()
diff --git a/setup.py b/setup.py
index 4eff865..43e55bb 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,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',
@@ -93,6 +100,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 +119,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_sale_invoice_grouping.rst',
+ ],
)
diff --git a/tests/scenario_sale_invoice_grouping.rst b/tests/scenario_sale_invoice_grouping.rst
index 3e19653..ee89562 100644
--- a/tests/scenario_sale_invoice_grouping.rst
+++ b/tests/scenario_sale_invoice_grouping.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()
@@ -144,7 +144,7 @@ Check the invoices::
2
>>> invoice = invoices[0]
>>> invoice.type
- u'out_invoice'
+ u'out'
>>> invoice.click('post')
>>> invoice.state
u'posted'
diff --git a/tryton.cfg b/tryton.cfg
index e8d16d7..6ac84d7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
ir
res
diff --git a/trytond_sale_invoice_grouping.egg-info/PKG-INFO b/trytond_sale_invoice_grouping.egg-info/PKG-INFO
index c2bfb53..a4051f4 100644
--- a/trytond_sale_invoice_grouping.egg-info/PKG-INFO
+++ b/trytond_sale_invoice_grouping.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-invoice-grouping
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to group sale invoices
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: sale_invoice_grouping
=====================
@@ -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_sale_invoice_grouping.egg-info/SOURCES.txt b/trytond_sale_invoice_grouping.egg-info/SOURCES.txt
index ae130c5..3e5941c 100644
--- a/trytond_sale_invoice_grouping.egg-info/SOURCES.txt
+++ b/trytond_sale_invoice_grouping.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
tests/scenario_sale_invoice_grouping.rst
trytond_sale_invoice_grouping.egg-info/PKG-INFO
trytond_sale_invoice_grouping.egg-info/SOURCES.txt
diff --git a/trytond_sale_invoice_grouping.egg-info/requires.txt b/trytond_sale_invoice_grouping.egg-info/requires.txt
index abd199b..446c5f1 100644
--- a/trytond_sale_invoice_grouping.egg-info/requires.txt
+++ b/trytond_sale_invoice_grouping.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_party >= 3.8, < 3.9
-trytond_account_invoice >= 3.8, < 3.9
-trytond_sale >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_party >= 4.0, < 4.1
+trytond_account_invoice >= 4.0, < 4.1
+trytond_sale >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-sale-invoice-grouping
More information about the tryton-debian-vcs
mailing list