[tryton-debian-vcs] tryton-modules-product-price-list branch debian updated. debian/3.8.0-2-4-gd73663a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:22:55 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-product-price-list.git;a=commitdiff;h=debian/3.8.0-2-4-gd73663a
commit d73663aa745da53d93ba6b3cac35d93073aeb84b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:26 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 c3ad565..23622c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-product-price-list (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:30:14 +0200
+
tryton-modules-product-price-list (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit 8c3981f0dd63b87374eae2d763ca21df49fdacb7
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 d110be1..8e8fcaa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,15 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2009-2015 Cédric Krier
+Copyright: 2009-2016 Cédric Krier
2009-2013 Bertrand Chenal
- 2009-2015 B2CK SPRL
+ 2009-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 c0c0158035ff2c84d85372606eb33ace65a3f392
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:10 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 45c5774..7710629 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 87683b8..163ea53 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2015 Cédric Krier.
+Copyright (C) 2009-2016 Cédric Krier.
Copyright (C) 2009-2013 Bertrand Chenal.
-Copyright (C) 2009-2015 B2CK SPRL.
+Copyright (C) 2009-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 5faee4d..0867191 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product_price_list
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module with price list
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_product_price_list
==========================
@@ -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/de_DE.po b/locale/de_DE.po
index e54413d..37725ec 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -122,10 +122,6 @@ msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
msgstr "Preisliste Zeile"
-msgctxt "view:party.party:"
-msgid "Price List"
-msgstr "Preisliste"
-
msgctxt "view:product.price_list.line:"
msgid "Price List Line"
msgstr "Preisliste Zeile"
diff --git a/locale/es_MX.po b/locale/es_MX.po
index 22ab2fb..5ec31fb 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -122,18 +122,22 @@ msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
msgstr "Línea de tarifa"
+#, fuzzy
msgctxt "view:product.price_list.line:"
msgid "Price List Line"
-msgstr ""
+msgstr "Línea de tarifa"
+#, fuzzy
msgctxt "view:product.price_list.line:"
msgid "Price List Lines"
-msgstr ""
+msgstr "Línea de tarifa"
+#, fuzzy
msgctxt "view:product.price_list:"
msgid "Price List"
-msgstr ""
+msgstr "Tarifa"
+#, fuzzy
msgctxt "view:product.price_list:"
msgid "Price Lists"
-msgstr ""
+msgstr "Tarifas"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 41c3a86..001698b 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -124,16 +124,17 @@ msgstr "Árlista sor"
msgctxt "view:product.price_list.line:"
msgid "Price List Line"
-msgstr ""
+msgstr "Árlista sor"
+#, fuzzy
msgctxt "view:product.price_list.line:"
msgid "Price List Lines"
-msgstr ""
+msgstr "Árlista sor"
msgctxt "view:product.price_list:"
msgid "Price List"
-msgstr ""
+msgstr "Árlista"
msgctxt "view:product.price_list:"
msgid "Price Lists"
-msgstr ""
+msgstr "Árlista"
diff --git a/locale/hu_HU.po b/locale/lo_LA.po
similarity index 76%
copy from locale/hu_HU.po
copy to locale/lo_LA.po
index 41c3a86..1dab6e0 100644
--- a/locale/hu_HU.po
+++ b/locale/lo_LA.po
@@ -7,84 +7,82 @@ msgid ""
"Invalid formula \"%(formula)s\" in price list line \"%(line)s\" with "
"exception \"%(exception)s\"."
msgstr ""
-"Érvénytelen \"%(formula)s\" űrlap a \"%(line)s\" árlista sorban "
-"\"%(exception)s\" hibajelentéssel."
msgctxt "field:product.price_list,company:"
msgid "Company"
-msgstr "Társaság"
+msgstr ""
msgctxt "field:product.price_list,create_date:"
msgid "Create Date"
-msgstr "Létrehozás dátuma"
+msgstr ""
msgctxt "field:product.price_list,create_uid:"
msgid "Create User"
-msgstr "Által létrehozva"
+msgstr ""
msgctxt "field:product.price_list,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:product.price_list,lines:"
msgid "Lines"
-msgstr "Sor"
+msgstr ""
msgctxt "field:product.price_list,name:"
msgid "Name"
-msgstr "Név"
+msgstr ""
msgctxt "field:product.price_list,rec_name:"
msgid "Name"
-msgstr "Név"
+msgstr ""
msgctxt "field:product.price_list,tax_included:"
msgid "Tax Included"
-msgstr "ÁFÁ-val együtt"
+msgstr ""
msgctxt "field:product.price_list,write_date:"
msgid "Write Date"
-msgstr "Utolsó módosítás dátuma"
+msgstr ""
msgctxt "field:product.price_list,write_uid:"
msgid "Write User"
-msgstr "Által módosítva"
+msgstr ""
msgctxt "field:product.price_list.line,create_date:"
msgid "Create Date"
-msgstr "Létrehozás dátuma"
+msgstr ""
msgctxt "field:product.price_list.line,create_uid:"
msgid "Create User"
-msgstr "Által létrehozva"
+msgstr ""
msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
-msgstr "Űrlap"
+msgstr ""
msgctxt "field:product.price_list.line,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:product.price_list.line,price_list:"
msgid "Price List"
-msgstr "Árlista"
+msgstr ""
msgctxt "field:product.price_list.line,product:"
msgid "Product"
-msgstr "Termék"
+msgstr ""
msgctxt "field:product.price_list.line,quantity:"
msgid "Quantity"
-msgstr "Mennyiség"
+msgstr ""
msgctxt "field:product.price_list.line,rec_name:"
msgid "Name"
-msgstr "Név"
+msgstr ""
msgctxt "field:product.price_list.line,sequence:"
msgid "Sequence"
-msgstr "Sorrend"
+msgstr ""
msgctxt "field:product.price_list.line,unit_digits:"
msgid "Unit Digits"
@@ -92,35 +90,33 @@ msgstr ""
msgctxt "field:product.price_list.line,write_date:"
msgid "Write Date"
-msgstr "Utolsó módosítás dátuma"
+msgstr ""
msgctxt "field:product.price_list.line,write_uid:"
msgid "Write User"
-msgstr "Által módosítva"
+msgstr ""
msgctxt "help:product.price_list.line,formula:"
msgid ""
"Python expression that will be evaluated with:\n"
"- unit_price: the original unit_price"
msgstr ""
-"Python kifejezés, mely :\n"
-" unit_price: originaler unit_price, szerint van kiértékelve (ár/egység)"
msgctxt "model:ir.action,name:act_price_list_form"
msgid "Price Lists"
-msgstr "Árlista"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_price_list"
msgid "Price Lists"
-msgstr "Árlista"
+msgstr ""
msgctxt "model:product.price_list,name:"
msgid "Price List"
-msgstr "Árlista"
+msgstr ""
msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
-msgstr "Árlista sor"
+msgstr ""
msgctxt "view:product.price_list.line:"
msgid "Price List Line"
diff --git a/locale/hu_HU.po b/locale/zh_CN.po
similarity index 76%
copy from locale/hu_HU.po
copy to locale/zh_CN.po
index 41c3a86..1dab6e0 100644
--- a/locale/hu_HU.po
+++ b/locale/zh_CN.po
@@ -7,84 +7,82 @@ msgid ""
"Invalid formula \"%(formula)s\" in price list line \"%(line)s\" with "
"exception \"%(exception)s\"."
msgstr ""
-"Érvénytelen \"%(formula)s\" űrlap a \"%(line)s\" árlista sorban "
-"\"%(exception)s\" hibajelentéssel."
msgctxt "field:product.price_list,company:"
msgid "Company"
-msgstr "Társaság"
+msgstr ""
msgctxt "field:product.price_list,create_date:"
msgid "Create Date"
-msgstr "Létrehozás dátuma"
+msgstr ""
msgctxt "field:product.price_list,create_uid:"
msgid "Create User"
-msgstr "Által létrehozva"
+msgstr ""
msgctxt "field:product.price_list,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:product.price_list,lines:"
msgid "Lines"
-msgstr "Sor"
+msgstr ""
msgctxt "field:product.price_list,name:"
msgid "Name"
-msgstr "Név"
+msgstr ""
msgctxt "field:product.price_list,rec_name:"
msgid "Name"
-msgstr "Név"
+msgstr ""
msgctxt "field:product.price_list,tax_included:"
msgid "Tax Included"
-msgstr "ÁFÁ-val együtt"
+msgstr ""
msgctxt "field:product.price_list,write_date:"
msgid "Write Date"
-msgstr "Utolsó módosítás dátuma"
+msgstr ""
msgctxt "field:product.price_list,write_uid:"
msgid "Write User"
-msgstr "Által módosítva"
+msgstr ""
msgctxt "field:product.price_list.line,create_date:"
msgid "Create Date"
-msgstr "Létrehozás dátuma"
+msgstr ""
msgctxt "field:product.price_list.line,create_uid:"
msgid "Create User"
-msgstr "Által létrehozva"
+msgstr ""
msgctxt "field:product.price_list.line,formula:"
msgid "Formula"
-msgstr "Űrlap"
+msgstr ""
msgctxt "field:product.price_list.line,id:"
msgid "ID"
-msgstr "ID"
+msgstr ""
msgctxt "field:product.price_list.line,price_list:"
msgid "Price List"
-msgstr "Árlista"
+msgstr ""
msgctxt "field:product.price_list.line,product:"
msgid "Product"
-msgstr "Termék"
+msgstr ""
msgctxt "field:product.price_list.line,quantity:"
msgid "Quantity"
-msgstr "Mennyiség"
+msgstr ""
msgctxt "field:product.price_list.line,rec_name:"
msgid "Name"
-msgstr "Név"
+msgstr ""
msgctxt "field:product.price_list.line,sequence:"
msgid "Sequence"
-msgstr "Sorrend"
+msgstr ""
msgctxt "field:product.price_list.line,unit_digits:"
msgid "Unit Digits"
@@ -92,35 +90,33 @@ msgstr ""
msgctxt "field:product.price_list.line,write_date:"
msgid "Write Date"
-msgstr "Utolsó módosítás dátuma"
+msgstr ""
msgctxt "field:product.price_list.line,write_uid:"
msgid "Write User"
-msgstr "Által módosítva"
+msgstr ""
msgctxt "help:product.price_list.line,formula:"
msgid ""
"Python expression that will be evaluated with:\n"
"- unit_price: the original unit_price"
msgstr ""
-"Python kifejezés, mely :\n"
-" unit_price: originaler unit_price, szerint van kiértékelve (ár/egység)"
msgctxt "model:ir.action,name:act_price_list_form"
msgid "Price Lists"
-msgstr "Árlista"
+msgstr ""
msgctxt "model:ir.ui.menu,name:menu_price_list"
msgid "Price Lists"
-msgstr "Árlista"
+msgstr ""
msgctxt "model:product.price_list,name:"
msgid "Price List"
-msgstr "Árlista"
+msgstr ""
msgctxt "model:product.price_list.line,name:"
msgid "Price List Line"
-msgstr "Árlista sor"
+msgstr ""
msgctxt "view:product.price_list.line:"
msgid "Price List Line"
diff --git a/price_list.py b/price_list.py
index e257313..2e46702 100644
--- a/price_list.py
+++ b/price_list.py
@@ -95,8 +95,7 @@ class PriceListLine(ModelSQL, ModelView, MatchMixin):
@classmethod
def __register__(cls, module_name):
TableHandler = backend.get('TableHandler')
- cursor = Transaction().cursor
- table = TableHandler(cursor, cls, module_name)
+ table = TableHandler(cls, module_name)
super(PriceListLine, cls).__register__(module_name)
@@ -144,7 +143,8 @@ class PriceListLine(ModelSQL, ModelView, MatchMixin):
def match(self, pattern):
if 'quantity' in pattern:
pattern = pattern.copy()
- if self.quantity > pattern.pop('quantity'):
+ quantity = pattern.pop('quantity')
+ if self.quantity is not None and self.quantity > quantity:
return False
return super(PriceListLine, self).match(pattern)
diff --git a/setup.py b/setup.py
index 4425720..4b8a13a 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 = ['simpleeval', 'python-sql >= 0.4']
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',
@@ -101,4 +111,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 d4fff33..7f22aaf 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_product_price_list import suite
+try:
+ from trytond.modules.product_price_list.tests.test_product_price_list import suite
+except ImportError:
+ from .test_product_price_list import suite
__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 638998e..4606c7b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
company
ir
diff --git a/trytond_product_price_list.egg-info/PKG-INFO b/trytond_product_price_list.egg-info/PKG-INFO
index 0c1778a..2014152 100644
--- a/trytond_product_price_list.egg-info/PKG-INFO
+++ b/trytond_product_price_list.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-product-price-list
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module with price list
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_product_price_list
==========================
@@ -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_product_price_list.egg-info/SOURCES.txt b/trytond_product_price_list.egg-info/SOURCES.txt
index 41f55dd..bcc23e8 100644
--- a/trytond_product_price_list.egg-info/SOURCES.txt
+++ b/trytond_product_price_list.egg-info/SOURCES.txt
@@ -49,11 +49,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_product_price_list.egg-info/PKG-INFO
trytond_product_price_list.egg-info/SOURCES.txt
trytond_product_price_list.egg-info/dependency_links.txt
diff --git a/trytond_product_price_list.egg-info/requires.txt b/trytond_product_price_list.egg-info/requires.txt
index 0b97330..e2e93d2 100644
--- a/trytond_product_price_list.egg-info/requires.txt
+++ b/trytond_product_price_list.egg-info/requires.txt
@@ -1,5 +1,5 @@
simpleeval
python-sql >= 0.4
-trytond_company >= 3.8, < 3.9
-trytond_product >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_company >= 4.0, < 4.1
+trytond_product >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-product-price-list
More information about the tryton-debian-vcs
mailing list