[tryton-debian-vcs] tryton-modules-stock-product-location branch upstream updated. upstream/3.6.0-1-g60f1185
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 11 11:29:50 UTC 2015
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-product-location.git;a=commitdiff;h=upstream/3.6.0-1-g60f1185
commit 60f11853d6548eed7c32d94980e44e7032fb1661
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 11 12:11:20 2015 +0100
Adding upstream version 3.8.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index e38e72c..889f4ff 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.0 - 2015-11-02
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
* Add support for PyPy
diff --git a/PKG-INFO b/PKG-INFO
index 01a3ca6..8435426 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_product_location
-Version: 3.6.0
+Version: 3.8.0
Summary: Tryton module to add default location on product
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.6/
+Download-URL: http://downloads.tryton.org/3.8/
Description: trytond_stock_product_location
==============================
@@ -59,6 +59,9 @@ Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Hungarian
+Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 6f4a263..85649be 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -50,18 +50,6 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr "Местонахождение на продукт"
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr "Местонахождения по подразбиране"
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr "Местонахождение на продукт"
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr "Местонахождения на продукт"
-
msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr "Местонахождение на продукт"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 9a3fca3..bfdedfd 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -50,18 +50,6 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr "Ubicació de producte"
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr "Ubicacions predeterminades"
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr "Ubicació de producte"
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr "Ubicacions de producte"
-
msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr "Ubicació de producte"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index a9ced2e..1bc6794 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -50,18 +50,6 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr ""
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr ""
-
msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 0513510..3e1febf 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -24,7 +24,7 @@ msgstr "Lagerort"
msgctxt "field:stock.product.location,product:"
msgid "Product"
-msgstr "Artikel"
+msgstr "Variante"
msgctxt "field:stock.product.location,rec_name:"
msgid "Name"
@@ -48,7 +48,7 @@ msgstr "Letzte Änderung durch"
msgctxt "model:stock.product.location,name:"
msgid "Product Location"
-msgstr "Artikel Lagerort"
+msgstr "Variante Lagerort"
msgctxt "view:product.product:"
msgid "Default Locations"
@@ -56,16 +56,12 @@ msgstr "Standardlagerorte"
msgctxt "view:product.product:"
msgid "Product Location"
-msgstr "Artikel Lagerort"
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr "Artikel Lagerorte"
+msgstr "Variante Lagerort"
msgctxt "view:stock.product.location:"
msgid "Product Location"
-msgstr "Artikel Lagerort"
+msgstr "Variante Lagerort"
msgctxt "view:stock.product.location:"
msgid "Product Locations"
-msgstr "Artikel Lagerorte"
+msgstr "Variante Lagerorte"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 6d1d122..9f0c960 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -50,18 +50,6 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr "Ubicación de producto"
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr "Ubicaciones por defecto"
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr "Ubicación de producto"
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr "Ubicaciones de producto"
-
msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr "Ubicación de producto"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index ebc3ac7..b3efe20 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -50,18 +50,6 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr "Bodega de Producto"
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr "Bodegas por Defecto"
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr "Bodega de Producto"
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr "Bodegas de Producto"
-
msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr "Bodega de Producto"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index ebc3ac7..3cb07ba 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -4,15 +4,15 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.product,locations:"
msgid "Default Locations"
-msgstr "Bodegas por Defecto"
+msgstr "Ubicaciones por defecto"
msgctxt "field:stock.product.location,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:stock.product.location,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:stock.product.location,id:"
msgid "ID"
@@ -20,7 +20,7 @@ msgstr "ID"
msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
-msgstr "Bodega de Almacenamiento"
+msgstr "Ubicación de almacenamiento"
msgctxt "field:stock.product.location,product:"
msgid "Product"
@@ -36,36 +36,24 @@ msgstr "Secuencia"
msgctxt "field:stock.product.location,warehouse:"
msgid "Warehouse"
-msgstr "Depósito"
+msgstr "Bodega"
msgctxt "field:stock.product.location,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:stock.product.location,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "model:stock.product.location,name:"
msgid "Product Location"
-msgstr "Bodega de Producto"
-
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr "Bodegas por Defecto"
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr "Bodega de Producto"
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr "Bodegas de Producto"
+msgstr "Ubicación de producto"
msgctxt "view:stock.product.location:"
msgid "Product Location"
-msgstr "Bodega de Producto"
+msgstr "Ubicación de producto"
msgctxt "view:stock.product.location:"
msgid "Product Locations"
-msgstr "Bodegas de Producto"
+msgstr "Ubicaciones de producto"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index a9a7847..c2cd1f6 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -50,18 +50,6 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr "Ubicación de producto"
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr "Ubicaciones por defecto"
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr "Ubicación de producto"
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr "Ubicaciones de producto"
-
msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr "Ubicación de producto"
diff --git a/locale/es_ES.po b/locale/es_MX.po
similarity index 77%
copy from locale/es_ES.po
copy to locale/es_MX.po
index a9a7847..eab10da 100644
--- a/locale/es_ES.po
+++ b/locale/es_MX.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.product,locations:"
msgid "Default Locations"
-msgstr "Ubicaciones por defecto"
+msgstr "Ubicaciones predefinidas"
msgctxt "field:stock.product.location,create_date:"
msgid "Create Date"
@@ -50,22 +50,10 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr "Ubicación de producto"
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr "Ubicaciones por defecto"
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr "Ubicación de producto"
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr "Ubicaciones de producto"
-
msgctxt "view:stock.product.location:"
msgid "Product Location"
-msgstr "Ubicación de producto"
+msgstr ""
msgctxt "view:stock.product.location:"
msgid "Product Locations"
-msgstr "Ubicaciones de producto"
+msgstr ""
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 43fd213..05e25a0 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -50,18 +50,6 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr "Emplacement produit"
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr "Emplacements par défaut"
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr "Emplacement de produit"
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr "Emplacements de produit"
-
msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr "Emplacement de produit"
diff --git a/locale/cs_CZ.po b/locale/hu_HU.po
similarity index 84%
copy from locale/cs_CZ.po
copy to locale/hu_HU.po
index a9ced2e..1bc6794 100644
--- a/locale/cs_CZ.po
+++ b/locale/hu_HU.po
@@ -50,18 +50,6 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr ""
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr ""
-
msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr ""
diff --git a/locale/cs_CZ.po b/locale/it_IT.po
similarity index 84%
copy from locale/cs_CZ.po
copy to locale/it_IT.po
index a9ced2e..1bc6794 100644
--- a/locale/cs_CZ.po
+++ b/locale/it_IT.po
@@ -50,18 +50,6 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr ""
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr ""
-
msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr ""
diff --git a/locale/cs_CZ.po b/locale/ja_JP.po
similarity index 84%
copy from locale/cs_CZ.po
copy to locale/ja_JP.po
index a9ced2e..1bc6794 100644
--- a/locale/cs_CZ.po
+++ b/locale/ja_JP.po
@@ -50,18 +50,6 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr ""
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr ""
-
msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr ""
diff --git a/locale/cs_CZ.po b/locale/lt_LT.po
similarity index 84%
copy from locale/cs_CZ.po
copy to locale/lt_LT.po
index a9ced2e..1bc6794 100644
--- a/locale/cs_CZ.po
+++ b/locale/lt_LT.po
@@ -50,18 +50,6 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr ""
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr ""
-
msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 31233c0..a0ac832 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -54,18 +54,6 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr ""
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr ""
-
msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr ""
diff --git a/locale/cs_CZ.po b/locale/pt_BR.po
similarity index 74%
copy from locale/cs_CZ.po
copy to locale/pt_BR.po
index a9ced2e..d3e6c75 100644
--- a/locale/cs_CZ.po
+++ b/locale/pt_BR.po
@@ -4,68 +4,56 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.product,locations:"
msgid "Default Locations"
-msgstr ""
+msgstr "Localizações padrão"
msgctxt "field:stock.product.location,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Data de criação"
msgctxt "field:stock.product.location,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Criado por"
msgctxt "field:stock.product.location,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:stock.product.location,location:"
msgid "Storage Location"
-msgstr ""
+msgstr "Localização de armazenamento"
msgctxt "field:stock.product.location,product:"
msgid "Product"
-msgstr ""
+msgstr "Produto"
msgctxt "field:stock.product.location,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Nome"
msgctxt "field:stock.product.location,sequence:"
msgid "Sequence"
-msgstr ""
+msgstr "Sequência"
msgctxt "field:stock.product.location,warehouse:"
msgid "Warehouse"
-msgstr ""
+msgstr "Armazém"
msgctxt "field:stock.product.location,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Data de gravação"
msgctxt "field:stock.product.location,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Editado por"
msgctxt "model:stock.product.location,name:"
msgid "Product Location"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr ""
+msgstr "Localização do produto"
msgctxt "view:stock.product.location:"
msgid "Product Location"
-msgstr ""
+msgstr "Localização do produto"
msgctxt "view:stock.product.location:"
msgid "Product Locations"
-msgstr ""
+msgstr "Localizações do Produto"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 7f9232f..8903a85 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -60,18 +60,6 @@ msgctxt "model:stock.product.location,name:"
msgid "Product Location"
msgstr ""
-msgctxt "view:product.product:"
-msgid "Default Locations"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Location"
-msgstr ""
-
-msgctxt "view:product.product:"
-msgid "Product Locations"
-msgstr ""
-
msgctxt "view:stock.product.location:"
msgid "Product Location"
msgstr ""
diff --git a/location.py b/location.py
index 172494d..3c42a4d 100644
--- a/location.py
+++ b/location.py
@@ -1,6 +1,7 @@
# 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 ModelView, ModelSQL, fields
from trytond.pyson import If, Eval, Bool
@@ -50,7 +51,7 @@ class ProductLocation(ModelSQL, ModelView):
@staticmethod
def order_sequence(tables):
table, _ = tables[None]
- return [table.sequence == Null, table.sequence]
+ return [Case((table.sequence == Null, 0), else_=1), table.sequence]
class ShipmentIn:
diff --git a/setup.py b/setup.py
index e894bf1..7c743a4 100644
--- a/setup.py
+++ b/setup.py
@@ -80,6 +80,9 @@ setup(name=name,
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Hungarian',
+ 'Natural Language :: Italian',
+ 'Natural Language :: Portuguese (Brazilian)',
'Natural Language :: Russian',
'Natural Language :: Slovenian',
'Natural Language :: Spanish',
diff --git a/tryton.cfg b/tryton.cfg
index 78d1710..df6941d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.0
+version=3.8.0
depends:
ir
product
diff --git a/trytond_stock_product_location.egg-info/PKG-INFO b/trytond_stock_product_location.egg-info/PKG-INFO
index e8ca18f..3453b1e 100644
--- a/trytond_stock_product_location.egg-info/PKG-INFO
+++ b/trytond_stock_product_location.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-product-location
-Version: 3.6.0
+Version: 3.8.0
Summary: Tryton module to add default location on product
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.6/
+Download-URL: http://downloads.tryton.org/3.8/
Description: trytond_stock_product_location
==============================
@@ -59,6 +59,9 @@ Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Hungarian
+Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
diff --git a/trytond_stock_product_location.egg-info/SOURCES.txt b/trytond_stock_product_location.egg-info/SOURCES.txt
index d9858bc..e3ae7ae 100644
--- a/trytond_stock_product_location.egg-info/SOURCES.txt
+++ b/trytond_stock_product_location.egg-info/SOURCES.txt
@@ -22,8 +22,14 @@ tryton.cfg
./locale/es_CO.po
./locale/es_EC.po
./locale/es_ES.po
+./locale/es_MX.po
./locale/fr_FR.po
+./locale/hu_HU.po
+./locale/it_IT.po
+./locale/ja_JP.po
+./locale/lt_LT.po
./locale/nl_NL.po
+./locale/pt_BR.po
./locale/ru_RU.po
./locale/sl_SI.po
./tests/__init__.py
@@ -40,8 +46,14 @@ 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/hu_HU.po
+locale/it_IT.po
+locale/ja_JP.po
+locale/lt_LT.po
locale/nl_NL.po
+locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
trytond_stock_product_location.egg-info/PKG-INFO
diff --git a/trytond_stock_product_location.egg-info/requires.txt b/trytond_stock_product_location.egg-info/requires.txt
index 8d0c0fe..4670e4b 100644
--- a/trytond_stock_product_location.egg-info/requires.txt
+++ b/trytond_stock_product_location.egg-info/requires.txt
@@ -1,4 +1,4 @@
python-sql >= 0.4
-trytond_product >= 3.6, < 3.7
-trytond_stock >= 3.6, < 3.7
-trytond >= 3.6, < 3.7
\ No newline at end of file
+trytond_product >= 3.8, < 3.9
+trytond_stock >= 3.8, < 3.9
+trytond >= 3.8, < 3.9
\ No newline at end of file
--
tryton-modules-stock-product-location
More information about the tryton-debian-vcs
mailing list