[tryton-debian-vcs] tryton-modules-stock-split branch upstream updated. upstream/3.8.0-2-g7696e20
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:28:49 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-stock-split.git;a=commitdiff;h=upstream/3.8.0-2-g7696e20
commit 7696e20d8b5e29b60336b36f02e3477953b8c3c9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:34 2016 +0200
Adding upstream version 4.0.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 8f6f584..b70f02a 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 eea016b..f80bacf 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock_split
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to split stock move
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
index 2ca5d98..258b2b8 100644
--- a/locale/lo_LA.po
+++ b/locale/lo_LA.po
@@ -4,52 +4,52 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:stock.move.split.start,count:"
msgid "Counts"
-msgstr ""
+msgstr "ນັບ"
msgctxt "field:stock.move.split.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ເລກລໍາດັບ"
msgctxt "field:stock.move.split.start,quantity:"
msgid "Quantity"
-msgstr ""
+msgstr "ຈຳນວນ"
msgctxt "field:stock.move.split.start,unit_digits:"
msgid "Unit Digits"
-msgstr ""
+msgstr "ສະກຸນເງິນ"
msgctxt "field:stock.move.split.start,uom:"
msgid "Uom"
-msgstr ""
+msgstr "ຫົວໜ່ວຍ"
msgctxt "field:stock.move.split.start,uom_category:"
msgid "Uom Category"
-msgstr ""
+msgstr "ໝວດຫົວໜ່ວຍ"
msgctxt "help:stock.move.split.start,count:"
msgid "The limit number of moves"
-msgstr ""
+msgstr "ຕົວເລກຈຳກັດຂອງການເຄື່ອນຍ້າຍ"
msgctxt "model:ir.action,name:wizard_split_move"
msgid "Split Move"
-msgstr ""
+msgstr "ແຍກການເຄື່ອນຍ້າຍ"
msgctxt "model:stock.move.split.start,name:"
msgid "Split Move"
-msgstr ""
+msgstr "ແຍກການເຄື່ອນຍ້າຍ"
msgctxt "view:stock.move.split.start:"
msgid "Split Move"
-msgstr ""
+msgstr "ແຍກການເຄື່ອນຍ້າຍ"
msgctxt "view:stock.move:"
msgid "Split"
-msgstr ""
+msgstr "ແຍກ"
msgctxt "wizard_button:stock.move.split,start,end:"
msgid "Cancel"
-msgstr ""
+msgstr "ຍົກເລີກ"
msgctxt "wizard_button:stock.move.split,start,split:"
msgid "Split"
-msgstr ""
+msgstr "ແຍກ"
diff --git a/tryton.cfg b/tryton.cfg
index e71167f..af49fd1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
ir
stock
diff --git a/trytond_stock_split.egg-info/PKG-INFO b/trytond_stock_split.egg-info/PKG-INFO
index 968d722..da071d8 100644
--- a/trytond_stock_split.egg-info/PKG-INFO
+++ b/trytond_stock_split.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-stock-split
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module to split stock move
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_stock_split.egg-info/SOURCES.txt b/trytond_stock_split.egg-info/SOURCES.txt
index 15d5311..b86c6eb 100644
--- a/trytond_stock_split.egg-info/SOURCES.txt
+++ b/trytond_stock_split.egg-info/SOURCES.txt
@@ -24,11 +24,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_stock_split.py
./view/move_form.xml
diff --git a/trytond_stock_split.egg-info/requires.txt b/trytond_stock_split.egg-info/requires.txt
index 9643ad2..f403bab 100644
--- a/trytond_stock_split.egg-info/requires.txt
+++ b/trytond_stock_split.egg-info/requires.txt
@@ -1,2 +1,2 @@
trytond_stock >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit 0fb7e943656d599b3bbc14d97dd9ac9b535b8c68
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:22 2016 +0200
Adding upstream version 4.0.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 092bca0..8f6f584 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 776aee6..442fb2d 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2012-2015 Cédric Krier.
-Copyright (C) 2012-2015 B2CK SPRL.
+Copyright (C) 2012-2016 Cédric Krier.
+Copyright (C) 2012-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 b83f8f8..eea016b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_split
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to split stock move
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_stock_split
===================
@@ -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_MX.po b/locale/es_MX.po
index e74739d..ac230d6 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -38,13 +38,15 @@ msgctxt "model:stock.move.split.start,name:"
msgid "Split Move"
msgstr "Dividir movimiento"
+#, fuzzy
msgctxt "view:stock.move.split.start:"
msgid "Split Move"
-msgstr ""
+msgstr "Dividir movimiento"
+#, fuzzy
msgctxt "view:stock.move:"
msgid "Split"
-msgstr ""
+msgstr "Dividir"
msgctxt "wizard_button:stock.move.split,start,end:"
msgid "Cancel"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 39a549a..85b75d4 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -44,7 +44,7 @@ msgstr "Diviser le mouvement"
msgctxt "view:stock.move:"
msgid "Split"
-msgstr ""
+msgstr "Diviser"
msgctxt "wizard_button:stock.move.split,start,end:"
msgid "Cancel"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 2ca5d98..b2fe37e 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -4,52 +4,52 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:stock.move.split.start,count:"
msgid "Counts"
-msgstr ""
+msgstr "Mennyiség"
msgctxt "field:stock.move.split.start,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:stock.move.split.start,quantity:"
msgid "Quantity"
-msgstr ""
+msgstr "Mennyiség"
msgctxt "field:stock.move.split.start,unit_digits:"
msgid "Unit Digits"
-msgstr ""
+msgstr "Tizedes vessző utáni számhelyek"
msgctxt "field:stock.move.split.start,uom:"
msgid "Uom"
-msgstr ""
+msgstr "Egység"
msgctxt "field:stock.move.split.start,uom_category:"
msgid "Uom Category"
-msgstr ""
+msgstr "Egység kategória"
msgctxt "help:stock.move.split.start,count:"
msgid "The limit number of moves"
-msgstr ""
+msgstr "Raktár mozgatás max. mennyisége"
msgctxt "model:ir.action,name:wizard_split_move"
msgid "Split Move"
-msgstr ""
+msgstr "Raktár mozgatás beosztása"
msgctxt "model:stock.move.split.start,name:"
msgid "Split Move"
-msgstr ""
+msgstr "Raktár mozgatás beosztása"
msgctxt "view:stock.move.split.start:"
msgid "Split Move"
-msgstr ""
+msgstr "Raktár mozgatás beosztása"
msgctxt "view:stock.move:"
msgid "Split"
-msgstr ""
+msgstr "Beosztás"
msgctxt "wizard_button:stock.move.split,start,end:"
msgid "Cancel"
-msgstr ""
+msgstr "Mégse"
msgctxt "wizard_button:stock.move.split,start,split:"
msgid "Split"
-msgstr ""
+msgstr "Beosztás"
diff --git a/locale/hu_HU.po b/locale/lo_LA.po
similarity index 100%
copy from locale/hu_HU.po
copy to locale/lo_LA.po
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 3021f1c..9239f86 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -40,11 +40,11 @@ msgstr "Dividir movimento"
msgctxt "view:stock.move.split.start:"
msgid "Split Move"
-msgstr ""
+msgstr "Dividir movimentação"
msgctxt "view:stock.move:"
msgid "Split"
-msgstr ""
+msgstr "Dividir"
msgctxt "wizard_button:stock.move.split,start,end:"
msgid "Cancel"
diff --git a/locale/hu_HU.po b/locale/zh_CN.po
similarity index 100%
copy from locale/hu_HU.po
copy to locale/zh_CN.po
diff --git a/setup.py b/setup.py
index 07b1b32..b84a729 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'))
tests_require = []
@@ -77,6 +83,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',
@@ -90,6 +97,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',
@@ -104,4 +114,5 @@ setup(name=name,
test_suite='tests',
test_loader='trytond.test_loader:Loader',
tests_require=tests_require,
+ use_2to3=True,
)
diff --git a/stock.py b/stock.py
index 7a34a7e..95baa59 100644
--- a/stock.py
+++ b/stock.py
@@ -7,10 +7,10 @@ from trytond.pool import Pool, PoolMeta
from trytond.transaction import Transaction
__all__ = ['Move', 'SplitMoveStart', 'SplitMove']
-__metaclass__ = PoolMeta
class Move:
+ __metaclass__ = PoolMeta
__name__ = 'stock.move'
@classmethod
@@ -59,7 +59,7 @@ class Move:
'uom': uom.id,
}))
remainder -= quantity
- remainder = Uom.round(remainder, uom.rounding)
+ remainder = uom.round(remainder)
if count:
count -= 1
assert remainder >= 0
diff --git a/tests/__init__.py b/tests/__init__.py
index f0994ec..2572861 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_stock_split import suite
+try:
+ from trytond.modules.stock_split.tests.test_stock_split import suite
+except ImportError:
+ from .test_stock_split import suite
__all__ = ['suite']
diff --git a/tests/test_stock_split.py b/tests/test_stock_split.py
index abacffd..38dd883 100644
--- a/tests/test_stock_split.py
+++ b/tests/test_stock_split.py
@@ -1,55 +1,47 @@
# This file is part of Tryton. The COPYRIGHT file at the top level of
# this repository contains the full copyright notices and license terms.
import unittest
-import doctest
from decimal import Decimal
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
-from trytond.transaction import Transaction
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
+from trytond.pool import Pool
+
+from trytond.modules.company.tests import create_company, set_company
class StockSplitTestCase(ModuleTestCase):
'Test Stock Lot module'
module = 'stock_split'
- def setUp(self):
- super(StockSplitTestCase, self).setUp()
- self.uom = POOL.get('product.uom')
- self.template = POOL.get('product.template')
- self.product = POOL.get('product.product')
- self.location = POOL.get('stock.location')
- self.company = POOL.get('company.company')
- self.user = POOL.get('res.user')
- self.move = POOL.get('stock.move')
-
- def test0010split(self):
+ @with_transaction()
+ def test_split(self):
'Test split'
- with Transaction().start(DB_NAME, USER, context=CONTEXT):
- unit, = self.uom.search([('name', '=', 'Unit')])
- template, = self.template.create([{
- 'name': 'Test Split',
- 'type': 'goods',
- 'cost_price_method': 'fixed',
- 'default_uom': unit.id,
- 'list_price': Decimal(0),
- 'cost_price': Decimal(0),
- }])
- product, = self.product.create([{
- 'template': template.id,
- }])
- input_, = self.location.search([('code', '=', 'IN')])
- storage, = self.location.search([('code', '=', 'STO')])
- company, = self.company.search([
- ('rec_name', '=', 'Dunder Mifflin'),
- ])
- self.user.write([self.user(USER)], {
- 'main_company': company.id,
- 'company': company.id,
- })
+ pool = Pool()
+ Uom = pool.get('product.uom')
+ Template = pool.get('product.template')
+ Product = pool.get('product.product')
+ Location = pool.get('stock.location')
+ Move = pool.get('stock.move')
+
+ unit, = Uom.search([('name', '=', 'Unit')])
+ template, = Template.create([{
+ 'name': 'Test Split',
+ 'type': 'goods',
+ 'cost_price_method': 'fixed',
+ 'default_uom': unit.id,
+ 'list_price': Decimal(0),
+ 'cost_price': Decimal(0),
+ }])
+ product, = Product.create([{
+ 'template': template.id,
+ }])
+ input_, = Location.search([('code', '=', 'IN')])
+ storage, = Location.search([('code', '=', 'STO')])
+ company = create_company()
+ with set_company(company):
def create_move(quantity):
- move, = self.move.create([{
+ move, = Move.create([{
'product': product.id,
'uom': unit.id,
'quantity': quantity,
@@ -90,7 +82,7 @@ class StockSplitTestCase(ModuleTestCase):
self.assertEqual([m.quantity for m in moves], [5, 5])
move = create_move(10)
- self.move.write([move], {
+ Move.write([move], {
'state': 'assigned',
})
moves = move.split(5, unit)
@@ -102,10 +94,6 @@ class StockSplitTestCase(ModuleTestCase):
def suite():
suite = trytond.tests.test_tryton.suite()
- from trytond.modules.company.tests import test_company
- for test in test_company.suite():
- if test not in suite and not isinstance(test, doctest.DocTestCase):
- suite.addTest(test)
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
StockSplitTestCase))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index dd07ff1..e71167f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
ir
stock
diff --git a/trytond_stock_split.egg-info/PKG-INFO b/trytond_stock_split.egg-info/PKG-INFO
index 8130da7..968d722 100644
--- a/trytond_stock_split.egg-info/PKG-INFO
+++ b/trytond_stock_split.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-split
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module to split stock move
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_stock_split
===================
@@ -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_stock_split.egg-info/SOURCES.txt b/trytond_stock_split.egg-info/SOURCES.txt
index 256a95c..15d5311 100644
--- a/trytond_stock_split.egg-info/SOURCES.txt
+++ b/trytond_stock_split.egg-info/SOURCES.txt
@@ -48,11 +48,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_stock_split.egg-info/PKG-INFO
trytond_stock_split.egg-info/SOURCES.txt
trytond_stock_split.egg-info/dependency_links.txt
diff --git a/trytond_stock_split.egg-info/requires.txt b/trytond_stock_split.egg-info/requires.txt
index 45ba76b..9643ad2 100644
--- a/trytond_stock_split.egg-info/requires.txt
+++ b/trytond_stock_split.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_stock >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_stock >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
--
tryton-modules-stock-split
More information about the tryton-debian-vcs
mailing list