[tryton-debian-vcs] tryton-modules-sale-stock-quantity branch upstream updated. upstream/4.4.0-1-g49ab78a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:19:08 UTC 2017
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-stock-quantity.git;a=commitdiff;h=upstream/4.4.0-1-g49ab78a
commit 49ab78a7d7bff28ceb95f7e6180bb388706d69c5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 6 14:41:18 2017 +0100
Adding upstream version 4.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..e0bc2f7
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,51 @@
+clone:
+ hg:
+ image: plugins/hg
+
+pipeline:
+ tox:
+ image: ${IMAGE}
+ environment:
+ - CFLAGS=-O0
+ - DB_CACHE=/cache
+ - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE
+ - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
+ commands:
+ - pip install tox
+ - tox -e "${TOXENV}-${DATABASE}"
+ volumes:
+ - cache:/root/.cache
+
+services:
+ postgresql:
+ image: postgres
+ when:
+ matrix:
+ DATABASE: postgresql
+
+matrix:
+ include:
+ - IMAGE: python:2.7
+ TOXENV: py27
+ DATABASE: sqlite
+ - IMAGE: python:2.7
+ TOXENV: py27
+ DATABASE: postgresql
+ - IMAGE: python:3.4
+ TOXENV: py34
+ DATABASE: sqlite
+ - IMAGE: python:3.4
+ TOXENV: py34
+ DATABASE: postgresql
+ - IMAGE: python:3.5
+ TOXENV: py35
+ DATABASE: sqlite
+ - IMAGE: python:3.5
+ TOXENV: py35
+ DATABASE: postgresql
+ - IMAGE: python:3.6
+ TOXENV: py36
+ DATABASE: sqlite
+ - IMAGE: python:3.6
+ TOXENV: py36
+ DATABASE: postgresql
diff --git a/CHANGELOG b/CHANGELOG
index 06cff4e..9e86263 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.6.0 - 2017-10-30
+* Bug fixes (see mercurial logs for details)
+* Do not check consumable
+
Version 4.4.0 - 2017-05-01
* Bug fixes (see mercurial logs for details)
@@ -9,4 +13,4 @@ Version 4.0.0 - 2016-05-02
* Add Python3 support
Version 3.8.0 - 2015-11-02
-* Initial release
\ No newline at end of file
+* Initial release
diff --git a/MANIFEST.in b/MANIFEST.in
index 05c3f79..71b68f1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,7 +6,7 @@ include LICENSE
include tryton.cfg
include *.xml
include view/*.xml
-include *.odt
+include *.fodt
include locale/*.po
include doc/*
include tests/*.rst
diff --git a/PKG-INFO b/PKG-INFO
index 407c951..951eca6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_stock_quantity
-Version: 4.4.0
+Version: 4.6.0
Summary: Tryton module to add stock warning 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/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
Description: trytond_sale_stock_quantity
===========================
@@ -70,9 +70,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 :: 3.6
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/locale/bg.po b/locale/bg.po
index d78115f..39a58e3 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/ca.po b/locale/ca.po
index 1fac73f..292b8e5 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/cs.po b/locale/cs.po
index d78115f..39a58e3 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/de.po b/locale/de.po
index 0b932e9..64015c9 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/es.po b/locale/es.po
index 4d78764..7285ce0 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/es_419.po b/locale/es_419.po
index cdff8b1..6aecd19 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/fr.po b/locale/fr.po
index 4fc00b6..653a6b4 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index d78115f..39a58e3 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index a193ce1..be84f98 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index d14f648..c8071eb 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/lo.po b/locale/lo.po
index 4124a42..1bd3654 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/lt.po b/locale/lt.po
index d78115f..39a58e3 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/nl.po b/locale/nl.po
index d78115f..39a58e3 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/pl.po b/locale/pl.po
index d14f648..39a58e3 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
@@ -10,4 +10,4 @@ msgstr ""
msgctxt "model:res.group,name:group_sale_stock_quantity"
msgid "Sale Stock Quantity"
-msgstr "Sale Stock Quantity"
+msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index d6b901f..dc754c5 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/ru.po b/locale/ru.po
index d78115f..39a58e3 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/sl.po b/locale/sl.po
index 58e98d3..fce9985 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index d78115f..39a58e3 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,4 +1,4 @@
-#
+#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/sale.py b/sale.py
index c74cffc..7adb938 100644
--- a/sale.py
+++ b/sale.py
@@ -90,6 +90,7 @@ class Sale:
def filter_line(line):
return (line.product
and line.product.type == 'goods'
+ and not line.product.consumable
and line.quantity > 0
# Use getattr as supply_on_sale comes from sale_supply module
and not getattr(line, 'supply_on_sale', False))
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff --git a/setup.py b/setup.py
index 1da15c4..d70fadf 100644
--- a/setup.py
+++ b/setup.py
@@ -78,7 +78,8 @@ setup(name=name,
],
package_data={
'trytond.modules.sale_stock_quantity': (info.get('xml', [])
- + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst']),
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst',
+ '*.fodt']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -106,9 +107,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 :: 3.6',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
diff --git a/tests/scenario_sale_stock_quantity.rst b/tests/scenario_sale_stock_quantity.rst
index 5d0940d..bd6f550 100644
--- a/tests/scenario_sale_stock_quantity.rst
+++ b/tests/scenario_sale_stock_quantity.rst
@@ -51,8 +51,7 @@ Create product::
>>> ProductUom = Model.get('product.uom')
>>> unit, = ProductUom.find([('name', '=', 'Unit')])
>>> ProductTemplate = Model.get('product.template')
- >>> Product = Model.get('product.product')
- >>> product = Product()
+
>>> template = ProductTemplate()
>>> template.name = 'product'
>>> template.default_uom = unit
@@ -60,13 +59,10 @@ Create product::
>>> template.purchasable = True
>>> template.salable = True
>>> template.list_price = Decimal('10')
- >>> template.cost_price = Decimal('5')
- >>> template.cost_price_method = 'fixed'
>>> template.account_expense = expense
>>> template.account_revenue = revenue
>>> template.save()
- >>> product.template = template
- >>> product.save()
+ >>> product, = template.products
>>> ProductSupplier = Model.get('purchase.product_supplier')
>>> product_supplier = ProductSupplier()
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..527d859
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,18 @@
+[tox]
+envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+ {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
+ pypy-postgresql: psycopg2cffi >= 2.5
+ mysql: MySQL-python
+ sqlite: sqlitebck
+setenv =
+ sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
+ postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
+ mysql: TRYTOND_DATABASE_URI={env:MYSQL_URI:mysql://}
+ sqlite: DB_NAME={env:SQLITE_NAME::memory:}
+ postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
+ mysql: DB_NAME={env:MYSQL_NAME:test}
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}
diff --git a/tryton.cfg b/tryton.cfg
index 8bfb99b..da40ed8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.0
+version=4.6.0
depends:
product
sale
diff --git a/trytond_sale_stock_quantity.egg-info/PKG-INFO b/trytond_sale_stock_quantity.egg-info/PKG-INFO
index 7663d96..2bf6e85 100644
--- a/trytond_sale_stock_quantity.egg-info/PKG-INFO
+++ b/trytond_sale_stock_quantity.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-stock-quantity
-Version: 4.4.0
+Version: 4.6.0
Summary: Tryton module to add stock warning 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/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
Description: trytond_sale_stock_quantity
===========================
@@ -70,9 +70,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 :: 3.6
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_sale_stock_quantity.egg-info/SOURCES.txt b/trytond_sale_stock_quantity.egg-info/SOURCES.txt
index d1d0ecd..0369ea3 100644
--- a/trytond_sale_stock_quantity.egg-info/SOURCES.txt
+++ b/trytond_sale_stock_quantity.egg-info/SOURCES.txt
@@ -1,11 +1,16 @@
+.drone.yml
+.hgtags
CHANGELOG
COPYRIGHT
INSTALL
LICENSE
MANIFEST.in
README
+__init__.py
+sale.py
sale.xml
setup.py
+tox.ini
tryton.cfg
./__init__.py
./sale.py
@@ -51,7 +56,9 @@ locale/pt_BR.po
locale/ru.po
locale/sl.po
locale/zh_CN.po
+tests/__init__.py
tests/scenario_sale_stock_quantity.rst
+tests/test_sale_stock_quantity.py
trytond_sale_stock_quantity.egg-info/PKG-INFO
trytond_sale_stock_quantity.egg-info/SOURCES.txt
trytond_sale_stock_quantity.egg-info/dependency_links.txt
diff --git a/trytond_sale_stock_quantity.egg-info/requires.txt b/trytond_sale_stock_quantity.egg-info/requires.txt
index 52ecc88..2333b75 100644
--- a/trytond_sale_stock_quantity.egg-info/requires.txt
+++ b/trytond_sale_stock_quantity.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_product >= 4.4, < 4.5
-trytond_sale >= 4.4, < 4.5
-trytond_stock >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_product >= 4.6, < 4.7
+trytond_sale >= 4.6, < 4.7
+trytond_stock >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
--
tryton-modules-sale-stock-quantity
More information about the tryton-debian-vcs
mailing list