[tryton-debian-vcs] tryton-modules-product-cost-fifo branch upstream updated. upstream/3.8.0-2-g19ca107
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:22:09 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-product-cost-fifo.git;a=commitdiff;h=upstream/3.8.0-2-g19ca107
commit 19ca1071f9a1d2b194698ae9e1f28485510d3899
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:24 2016 +0200
Adding upstream version 4.0.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index a27d8bb..34afde2 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 ba4458a..8e5b8d2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_product_cost_fifo
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add FIFO cost method
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 6182154..7289fbd 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -19,3 +19,7 @@ msgstr "Anzahl FIFO"
msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
msgstr "FIFO"
+
+msgctxt "selection:product.product,cost_price_method:"
+msgid "FIFO"
+msgstr "FIFO"
diff --git a/tryton.cfg b/tryton.cfg
index 6a8563b..4fda338 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
ir
product
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index 7f1363b..6ba7b00 100644
--- a/trytond_product_cost_fifo.egg-info/PKG-INFO
+++ b/trytond_product_cost_fifo.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-product-cost-fifo
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to add FIFO cost method
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_product_cost_fifo.egg-info/SOURCES.txt b/trytond_product_cost_fifo.egg-info/SOURCES.txt
index b49d9eb..4ea2d75 100644
--- a/trytond_product_cost_fifo.egg-info/SOURCES.txt
+++ b/trytond_product_cost_fifo.egg-info/SOURCES.txt
@@ -23,11 +23,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
doc/index.rst
locale/bg_BG.po
locale/ca_ES.po
diff --git a/trytond_product_cost_fifo.egg-info/requires.txt b/trytond_product_cost_fifo.egg-info/requires.txt
index 4aca753..e0484ff 100644
--- a/trytond_product_cost_fifo.egg-info/requires.txt
+++ b/trytond_product_cost_fifo.egg-info/requires.txt
@@ -1,3 +1,3 @@
trytond_product >= 4.0, < 4.1
trytond_stock >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit cdedfc792fa74b253192cf7dfb6fd100ef9a721e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:08 2016 +0200
Adding upstream version 4.0.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index ebd31c1..a27d8bb 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 4c7ddcd..fcc5eeb 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-2013 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 aae21a3..ba4458a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_product_cost_fifo
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add FIFO cost method
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_cost_fifo
=========================
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
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
@@ -68,6 +69,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/es_EC.po b/locale/es_EC.po
index 2c99d4b..889e705 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -4,18 +4,18 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
msgid "FIFO quantity can not be greater than quantity."
-msgstr "Cantidad PEPS no puede ser mayor que la cantidad."
+msgstr "Cantidad FIFO no puede ser mayor que la cantidad."
msgctxt "error:stock.move:"
msgid "You can not delete move \"%s\" that is used for FIFO cost price."
msgstr ""
"No puede eliminar el movimiento \"%s\" que está siendo utilizado por el "
-"precio de costo PEPS."
+"precio de costo FIFO."
msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
-msgstr "Cantidad PEPS"
+msgstr "Cantidad FIFO"
msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
-msgstr "PEPS"
+msgstr "FIFO"
diff --git a/locale/es_EC.po b/locale/lo_LA.po
similarity index 66%
copy from locale/es_EC.po
copy to locale/lo_LA.po
index 2c99d4b..d9d8199 100644
--- a/locale/es_EC.po
+++ b/locale/lo_LA.po
@@ -4,18 +4,16 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
msgid "FIFO quantity can not be greater than quantity."
-msgstr "Cantidad PEPS no puede ser mayor que la cantidad."
+msgstr ""
msgctxt "error:stock.move:"
msgid "You can not delete move \"%s\" that is used for FIFO cost price."
msgstr ""
-"No puede eliminar el movimiento \"%s\" que está siendo utilizado por el "
-"precio de costo PEPS."
msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
-msgstr "Cantidad PEPS"
+msgstr ""
msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
-msgstr "PEPS"
+msgstr ""
diff --git a/locale/es_EC.po b/locale/zh_CN.po
similarity index 66%
copy from locale/es_EC.po
copy to locale/zh_CN.po
index 2c99d4b..d9d8199 100644
--- a/locale/es_EC.po
+++ b/locale/zh_CN.po
@@ -4,18 +4,16 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.move:"
msgid "FIFO quantity can not be greater than quantity."
-msgstr "Cantidad PEPS no puede ser mayor que la cantidad."
+msgstr ""
msgctxt "error:stock.move:"
msgid "You can not delete move \"%s\" that is used for FIFO cost price."
msgstr ""
-"No puede eliminar el movimiento \"%s\" que está siendo utilizado por el "
-"precio de costo PEPS."
msgctxt "field:stock.move,fifo_quantity:"
msgid "FIFO Quantity"
-msgstr "Cantidad PEPS"
+msgstr ""
msgctxt "selection:product.template,cost_price_method:"
msgid "FIFO"
-msgstr "PEPS"
+msgstr ""
diff --git a/move.py b/move.py
index 8ae7918..0e9c4ee 100644
--- a/move.py
+++ b/move.py
@@ -6,10 +6,10 @@ from trytond.pool import Pool, PoolMeta
from trytond.transaction import Transaction
__all__ = ['Move']
-__metaclass__ = PoolMeta
class Move:
+ __metaclass__ = PoolMeta
__name__ = 'stock.move'
fifo_quantity = fields.Float('FIFO Quantity')
diff --git a/product.py b/product.py
index b2f15ad..4ef19e8 100644
--- a/product.py
+++ b/product.py
@@ -5,10 +5,10 @@ from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
__all__ = ['Template', 'Product']
-__metaclass__ = PoolMeta
class Template:
+ __metaclass__ = PoolMeta
__name__ = 'product.template'
@classmethod
@@ -40,7 +40,7 @@ class Template:
stock_date_end=stock_date_end):
template = Template(self.id)
offset = 0
- limit = Transaction().cursor.IN_MAX
+ limit = Transaction().database.IN_MAX
avail_qty = template.quantity
fifo_moves = []
@@ -75,6 +75,7 @@ class Template:
class Product:
+ __metaclass__ = PoolMeta
__name__ = 'product.product'
def recompute_cost_price_fifo(self):
diff --git a/setup.py b/setup.py
index ae597f5..a2f3d9b 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'))
@@ -81,6 +87,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',
@@ -94,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 +119,6 @@ setup(name=name,
test_suite='tests',
test_loader='trytond.test_loader:Loader',
tests_require=tests_require,
+ use_2to3=True,
+ convert_2to3_doctests=['tests/scenario_product_cost_fifo.rst'],
)
diff --git a/tryton.cfg b/tryton.cfg
index b152f5e..6a8563b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
ir
product
diff --git a/trytond_product_cost_fifo.egg-info/PKG-INFO b/trytond_product_cost_fifo.egg-info/PKG-INFO
index a4e1971..7f1363b 100644
--- a/trytond_product_cost_fifo.egg-info/PKG-INFO
+++ b/trytond_product_cost_fifo.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-product-cost-fifo
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to add FIFO cost method
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_cost_fifo
=========================
@@ -55,6 +55,7 @@ Classifier: Intended Audience :: Manufacturing
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
@@ -68,6 +69,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_cost_fifo.egg-info/SOURCES.txt b/trytond_product_cost_fifo.egg-info/SOURCES.txt
index d7f40e9..b49d9eb 100644
--- a/trytond_product_cost_fifo.egg-info/SOURCES.txt
+++ b/trytond_product_cost_fifo.egg-info/SOURCES.txt
@@ -42,11 +42,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_cost_fifo.egg-info/PKG-INFO
trytond_product_cost_fifo.egg-info/SOURCES.txt
trytond_product_cost_fifo.egg-info/dependency_links.txt
diff --git a/trytond_product_cost_fifo.egg-info/requires.txt b/trytond_product_cost_fifo.egg-info/requires.txt
index 193d062..4aca753 100644
--- a/trytond_product_cost_fifo.egg-info/requires.txt
+++ b/trytond_product_cost_fifo.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_product >= 3.8, < 3.9
-trytond_stock >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_product >= 4.0, < 4.1
+trytond_stock >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-product-cost-fifo
More information about the tryton-debian-vcs
mailing list