[tryton-debian-vcs] tryton-modules-stock-split branch upstream updated. upstream/3.0.0-1-gdff7920
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:11:14 UTC 2014
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.0.0-1-gdff7920
commit dff7920eebc4c9c553d79a312de81fc8dfbc3918
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:23:54 2014 +0200
Adding upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index a162b66..e995c51 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.0 - 2014-04-21
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 7668cfa..5695e54 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2012-2013 Cédric Krier.
-Copyright (C) 2012-2013 B2CK SPRL.
+Copyright (C) 2012-2014 Cédric Krier.
+Copyright (C) 2012-2014 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/INSTALL b/INSTALL
index 121366e..335edc3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_stock_split
Prerequisites
-------------
- * Python 2.6 or later (http://www.python.org/)
+ * Python 2.7 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_stock (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 732a76e..8db8a3e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,13 +1,11 @@
include INSTALL
include README
-include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
include view/*.xml
-include *.odt
include locale/*.po
include doc/*
include icons/*
diff --git a/PKG-INFO b/PKG-INFO
index 9066628..6aef548 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_split
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to split stock move
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_stock_split
===================
@@ -43,6 +43,7 @@ Description: trytond_stock_split
http://www.tryton.org/
+Keywords: tryton stock split
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -63,6 +64,5 @@ Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index b76c5e1..f854027 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -28,7 +28,7 @@ msgstr "Categoria de la UdM"
msgctxt "help:stock.move.split.start,count:"
msgid "The limit number of moves"
-msgstr "El número màxim de moviments"
+msgstr "El número màxim de moviments."
msgctxt "model:ir.action,name:wizard_split_move"
msgid "Split Move"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 39b2206..02e6d1d 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -16,7 +16,7 @@ msgstr "Menge"
msgctxt "field:stock.move.split.start,unit_digits:"
msgid "Unit Digits"
-msgstr "Anzahl Stellen"
+msgstr "Nachkommastellen"
msgctxt "field:stock.move.split.start,uom:"
msgid "Uom"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index d4d36c0..85b75d4 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -28,7 +28,7 @@ msgstr "Catégorie d'unité de mesure"
msgctxt "help:stock.move.split.start,count:"
msgid "The limit number of moves"
-msgstr "Le nombre limit de mouvements"
+msgstr "Le nombre limite de mouvements"
msgctxt "model:ir.action,name:wizard_split_move"
msgid "Split Move"
diff --git a/setup.py b/setup.py
index d68d09c..b597027 100644
--- a/setup.py
+++ b/setup.py
@@ -11,35 +11,52 @@ import ConfigParser
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+def get_require_version(name):
+ if minor_version % 2:
+ require = '%s >= %s.%s.dev0, < %s.%s'
+ else:
+ require = '%s >= %s.%s, < %s.%s'
+ require %= (name, major_version, minor_version,
+ major_version, minor_version + 1)
+ return require
+
config = ConfigParser.ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
if key in info:
info[key] = info[key].strip().splitlines()
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+version = info.get('version', '0.0.1')
+major_version, minor_version, _ = version.split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
+name = 'trytond_stock_split'
+
+download_url = 'http://downloads.tryton.org/%s.%s/' % (
+ major_version, minor_version)
+if minor_version % 2:
+ version = '%s.%s.dev0' % (major_version, minor_version)
+ download_url = (
+ 'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
+ name[8:], name, version))
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
- requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
-requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
-tests_require = ['proteus >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1)]
+ requires.append(get_require_version('trytond_%s' % dep))
+requires.append(get_require_version('trytond'))
+tests_require = [get_require_version('proteus')]
-setup(name='trytond_stock_split',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module to split stock move',
long_description=read('README'),
author='Tryton',
+ author_email='issue_tracker at tryton.org',
url='http://www.tryton.org/',
- download_url=("http://downloads.tryton.org/" +
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
+ download_url=download_url,
+ keywords='tryton stock split',
package_dir={'trytond.modules.stock_split': '.'},
packages=[
'trytond.modules.stock_split',
@@ -69,7 +86,6 @@ setup(name='trytond_stock_split',
'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
],
diff --git a/stock.py b/stock.py
index 32fe863..d1deed3 100644
--- a/stock.py
+++ b/stock.py
@@ -85,11 +85,11 @@ class SplitMoveStart(ModelView):
('category', '=', Eval('uom_category')),
],
depends=['uom_category'])
- unit_digits = fields.Integer('Unit Digits', on_change_with=['uom'],
- readonly=True)
+ unit_digits = fields.Integer('Unit Digits', readonly=True)
uom_category = fields.Many2One('product.uom.category', 'Uom Category',
readonly=True)
+ @fields.depends('uom')
def on_change_with_unit_digits(self):
if self.uom:
return self.uom.digits
diff --git a/tests/test_stock_split.py b/tests/test_stock_split.py
index 6ae0750..86b2557 100644
--- a/tests/test_stock_split.py
+++ b/tests/test_stock_split.py
@@ -1,17 +1,7 @@
-#!/usr/bin/env python
#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 sys
-import os
-DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
- '..', '..', '..', '..', '..', 'trytond')))
-if os.path.isdir(DIR):
- sys.path.insert(0, os.path.dirname(DIR))
-
import unittest
from decimal import Decimal
-
import trytond.tests.test_tryton
from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT, test_view,\
test_depends
@@ -19,9 +9,7 @@ from trytond.transaction import Transaction
class StockSplitTestCase(unittest.TestCase):
- '''
- Test Stock Lot module.
- '''
+ 'Test Stock Lot module'
def setUp(self):
trytond.tests.test_tryton.install_module('stock_split')
@@ -34,21 +22,15 @@ class StockSplitTestCase(unittest.TestCase):
self.move = POOL.get('stock.move')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('stock_split')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
def test0010split(self):
- '''
- Test split.
- '''
+ 'Test split'
with Transaction().start(DB_NAME, USER, context=CONTEXT):
unit, = self.uom.search([('name', '=', 'Unit')])
template, = self.template.create([{
@@ -64,7 +46,9 @@ class StockSplitTestCase(unittest.TestCase):
}])
input_, = self.location.search([('code', '=', 'IN')])
storage, = self.location.search([('code', '=', 'STO')])
- company, = self.company.search([('rec_name', '=', 'B2CK')])
+ company, = self.company.search([
+ ('rec_name', '=', 'Dunder Mifflin'),
+ ])
self.user.write([self.user(USER)], {
'main_company': company.id,
'company': company.id,
@@ -131,6 +115,3 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
StockSplitTestCase))
return suite
-
-if __name__ == '__main__':
- unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index fb9279e..54e4818 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.0
+version=3.2.0
depends:
ir
stock
diff --git a/trytond_stock_split.egg-info/PKG-INFO b/trytond_stock_split.egg-info/PKG-INFO
index 7262d35..f303934 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.0.0
+Version: 3.2.0
Summary: Tryton module to split stock move
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_stock_split
===================
@@ -43,6 +43,7 @@ Description: trytond_stock_split
http://www.tryton.org/
+Keywords: tryton stock split
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -63,6 +64,5 @@ Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_stock_split.egg-info/requires.txt b/trytond_stock_split.egg-info/requires.txt
index bfa8717..fc8467d 100644
--- a/trytond_stock_split.egg-info/requires.txt
+++ b/trytond_stock_split.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_stock >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_stock >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
--
tryton-modules-stock-split
More information about the tryton-debian-vcs
mailing list