[tryton-debian-vcs] tryton-modules-stock-location-sequence branch upstream updated. upstream/4.0.1-1-g2fd8df2
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Dec 6 16:08:58 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-location-sequence.git;a=commitdiff;h=upstream/4.0.1-1-g2fd8df2
commit 2fd8df2c741f275203433a80c9fd5921d007586f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 5 09:34:47 2016 +0100
Adding upstream version 4.2.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 5c3a0e3..62704a7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 4.0.1 - 2016-05-11
+Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
Version 4.0.0 - 2016-05-02
diff --git a/INSTALL b/INSTALL
index ddef05e..67da51a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -24,7 +24,7 @@ site-packages directory on your system.
For advanced options, please refer to the easy_install and/or the distutils
documentation:
- http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://setuptools.readthedocs.io/en/latest/easy_install.html
http://docs.python.org/inst/inst.html
To use without installation, extract the archive into ``trytond/modules`` with
diff --git a/PKG-INFO b/PKG-INFO
index a353bbe..4492d13 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_location_sequence
-Version: 4.0.1
+Version: 4.2.0
Summary: Tryton module to add sequence on location
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.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_stock_location_sequence
===============================
@@ -63,6 +63,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/locale/bg_BG.po b/locale/bg.po
similarity index 100%
rename from locale/bg_BG.po
rename to locale/bg.po
diff --git a/locale/ca_ES.po b/locale/ca.po
similarity index 100%
copy from locale/ca_ES.po
copy to locale/ca.po
diff --git a/locale/cs_CZ.po b/locale/cs.po
similarity index 100%
copy from locale/cs_CZ.po
copy to locale/cs.po
diff --git a/locale/de_DE.po b/locale/de.po
similarity index 100%
rename from locale/de_DE.po
rename to locale/de.po
diff --git a/locale/es_AR.po b/locale/es.po
similarity index 100%
rename from locale/es_AR.po
rename to locale/es.po
diff --git a/locale/lt_LT.po b/locale/es_419.po
similarity index 100%
rename from locale/lt_LT.po
rename to locale/es_419.po
diff --git a/locale/es_CO.po b/locale/es_CO.po
deleted file mode 100644
index 7f80503..0000000
--- a/locale/es_CO.po
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:stock.location,sequence:"
-msgid "Sequence"
-msgstr "Secuencia"
diff --git a/locale/es_EC.po b/locale/es_EC.po
deleted file mode 100644
index 7f80503..0000000
--- a/locale/es_EC.po
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:stock.location,sequence:"
-msgid "Sequence"
-msgstr "Secuencia"
diff --git a/locale/es_ES.po b/locale/es_ES.po
deleted file mode 100644
index 7f80503..0000000
--- a/locale/es_ES.po
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:stock.location,sequence:"
-msgid "Sequence"
-msgstr "Secuencia"
diff --git a/locale/es_MX.po b/locale/es_MX.po
deleted file mode 100644
index 7f80503..0000000
--- a/locale/es_MX.po
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:stock.location,sequence:"
-msgid "Sequence"
-msgstr "Secuencia"
diff --git a/locale/fr_FR.po b/locale/fr.po
similarity index 100%
rename from locale/fr_FR.po
rename to locale/fr.po
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 0d1c6ef..5b568e7 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -2,6 +2,7 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "field:stock.location,sequence:"
msgid "Sequence"
-msgstr ""
+msgstr "Sequenza"
diff --git a/locale/lo_LA.po b/locale/lo.po
similarity index 100%
rename from locale/lo_LA.po
rename to locale/lo.po
diff --git a/locale/cs_CZ.po b/locale/lt.po
similarity index 100%
rename from locale/cs_CZ.po
rename to locale/lt.po
diff --git a/locale/nl_NL.po b/locale/nl.po
similarity index 100%
rename from locale/nl_NL.po
rename to locale/nl.po
diff --git a/locale/ca_ES.po b/locale/pl.po
similarity index 85%
rename from locale/ca_ES.po
rename to locale/pl.po
index 5aa76c6..6f58453 100644
--- a/locale/ca_ES.po
+++ b/locale/pl.po
@@ -4,4 +4,4 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:stock.location,sequence:"
msgid "Sequence"
-msgstr "Seqüència"
+msgstr "Kolejność"
diff --git a/locale/ru_RU.po b/locale/ru.po
similarity index 100%
rename from locale/ru_RU.po
rename to locale/ru.po
diff --git a/locale/sl_SI.po b/locale/sl.po
similarity index 100%
rename from locale/sl_SI.po
rename to locale/sl.po
diff --git a/setup.py b/setup.py
index b642bdd..75e2a9a 100644
--- a/setup.py
+++ b/setup.py
@@ -90,6 +90,7 @@ setup(name=name,
'Natural Language :: German',
'Natural Language :: Hungarian',
'Natural Language :: Italian',
+ 'Natural Language :: Polish',
'Natural Language :: Portuguese (Brazilian)',
'Natural Language :: Russian',
'Natural Language :: Slovenian',
diff --git a/stock.py b/stock.py
index bdd68bd..a41f169 100644
--- a/stock.py
+++ b/stock.py
@@ -1,30 +1,24 @@
# 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 sql import Null
-from sql.conditionals import Case
-
-from trytond.model import fields
-from trytond.pyson import Not, Eval, Bool
+from trytond.model import sequence_ordered
+from trytond.pyson import Eval, Bool
from trytond import backend
from trytond.pool import PoolMeta
__all__ = ['Location']
-class Location:
+class Location(sequence_ordered()):
"Stock Location"
__metaclass__ = PoolMeta
__name__ = 'stock.location'
- sequence = fields.Integer('Sequence',
- states={
- 'readonly': Not(Bool(Eval('active'))),
- },
- depends=['active'])
@classmethod
def __setup__(cls):
super(Location, cls).__setup__()
- cls._order.insert(0, ('sequence', 'ASC'))
+ previous_readonly = cls.sequence.states.get('readonly', Bool(False))
+ cls.sequence.states['readonly'] = previous_readonly | ~Eval('active')
+ cls.sequence.depends = ['active']
@classmethod
def __register__(cls, module_name):
@@ -35,8 +29,3 @@ class Location:
# Migration from 2.4: drop required on sequence
table.not_null_action('sequence', action='remove')
-
- @staticmethod
- def order_sequence(tables):
- table, _ = tables[None]
- return [Case((table.sequence == Null, 0), else_=1), table.sequence]
diff --git a/tryton.cfg b/tryton.cfg
index af49fd1..32f46de 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.1
+version=4.2.0
depends:
ir
stock
diff --git a/trytond_stock_location_sequence.egg-info/PKG-INFO b/trytond_stock_location_sequence.egg-info/PKG-INFO
index 642a401..37eacf9 100644
--- a/trytond_stock_location_sequence.egg-info/PKG-INFO
+++ b/trytond_stock_location_sequence.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-location-sequence
-Version: 4.0.1
+Version: 4.2.0
Summary: Tryton module to add sequence on location
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.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_stock_location_sequence
===============================
@@ -63,6 +63,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/trytond_stock_location_sequence.egg-info/SOURCES.txt b/trytond_stock_location_sequence.egg-info/SOURCES.txt
index 5e1dda5..cd61da4 100644
--- a/trytond_stock_location_sequence.egg-info/SOURCES.txt
+++ b/trytond_stock_location_sequence.egg-info/SOURCES.txt
@@ -11,48 +11,44 @@ tryton.cfg
./stock.py
./stock.xml
./tryton.cfg
-./locale/bg_BG.po
-./locale/ca_ES.po
-./locale/cs_CZ.po
-./locale/de_DE.po
-./locale/es_AR.po
-./locale/es_CO.po
-./locale/es_EC.po
-./locale/es_ES.po
-./locale/es_MX.po
-./locale/fr_FR.po
+./locale/bg.po
+./locale/ca.po
+./locale/cs.po
+./locale/de.po
+./locale/es.po
+./locale/es_419.po
+./locale/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/lo.po
+./locale/lt.po
+./locale/nl.po
+./locale/pl.po
./locale/pt_BR.po
-./locale/ru_RU.po
-./locale/sl_SI.po
+./locale/ru.po
+./locale/sl.po
./locale/zh_CN.po
./tests/__init__.py
./tests/test_stock_location_sequence.py
./view/location_form.xml
-locale/bg_BG.po
-locale/ca_ES.po
-locale/cs_CZ.po
-locale/de_DE.po
-locale/es_AR.po
-locale/es_CO.po
-locale/es_EC.po
-locale/es_ES.po
-locale/es_MX.po
-locale/fr_FR.po
+locale/bg.po
+locale/ca.po
+locale/cs.po
+locale/de.po
+locale/es.po
+locale/es_419.po
+locale/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/lo.po
+locale/lt.po
+locale/nl.po
+locale/pl.po
locale/pt_BR.po
-locale/ru_RU.po
-locale/sl_SI.po
+locale/ru.po
+locale/sl.po
locale/zh_CN.po
trytond_stock_location_sequence.egg-info/PKG-INFO
trytond_stock_location_sequence.egg-info/SOURCES.txt
diff --git a/trytond_stock_location_sequence.egg-info/requires.txt b/trytond_stock_location_sequence.egg-info/requires.txt
index f920e4d..47a98c2 100644
--- a/trytond_stock_location_sequence.egg-info/requires.txt
+++ b/trytond_stock_location_sequence.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-sql >= 0.4
-trytond_stock >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
+trytond_stock >= 4.2, < 4.3
+trytond >= 4.2, < 4.3
--
tryton-modules-stock-location-sequence
More information about the tryton-debian-vcs
mailing list