[tryton-debian-vcs] tryton-modules-stock-package branch debian updated. debian/3.8.0-2-5-g9e73e3b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:28:29 UTC 2016
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-package.git;a=commitdiff;h=debian/3.8.0-2-5-g9e73e3b
commit 9e73e3bd05ac6fa5c6b391cce30aa2776d9c2bbd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:47:34 2016 +0200
Releasing debian version 4.0.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 4966050..9d31fe8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-stock-package (4.0.1-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 4.0.0.
+ * Merging upstream version 4.0.1.
+ * Updating the copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 30 May 2016 19:32:03 +0200
+
tryton-modules-stock-package (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit ed6c4bd26b117231c571459e887076c07da5d146
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 19:01:03 2016 +0200
Updating the copyright file.
diff --git a/debian/copyright b/debian/copyright
index 9df6336..36feed7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2013-2015 Cédric Krier
- 2013-2015 B2CK SPRL
+Copyright: 2013-2016 Cédric Krier
+ 2013-2016 B2CK SPRL
License: GPL-3+
Files: debian/*
-Copyright: 2014-2015 Mathias Behrle <mathiasb at m9s.biz>
+Copyright: 2014-2016 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit e4a0c36d756968e5bfc911ad19c43e2b514109fb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:34 2016 +0200
Merging upstream version 4.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index 68cbe07..269fc46 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 22166df..db1e739 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock_package
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module for stock packaging
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index dc18116..0338961 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -12,7 +12,7 @@ msgstr "L'albarà de client \"%s\" no està completament empaquetat."
msgctxt "field:stock.configuration,package_sequence:"
msgid "Package Sequence"
-msgstr "Seqüència de paquets"
+msgstr "Seqüència de paquet"
msgctxt "field:stock.move,package:"
msgid "Package"
diff --git a/tryton.cfg b/tryton.cfg
index e20a883..d8ad5f4 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
ir
res
diff --git a/trytond_stock_package.egg-info/PKG-INFO b/trytond_stock_package.egg-info/PKG-INFO
index d05e4d5..607fedb 100644
--- a/trytond_stock_package.egg-info/PKG-INFO
+++ b/trytond_stock_package.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-stock-package
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module for stock packaging
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_stock_package.egg-info/SOURCES.txt b/trytond_stock_package.egg-info/SOURCES.txt
index 9e309df..bd505c6 100644
--- a/trytond_stock_package.egg-info/SOURCES.txt
+++ b/trytond_stock_package.egg-info/SOURCES.txt
@@ -26,11 +26,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/scenario_stock_package.rst
./tests/test_stock_package.py
diff --git a/trytond_stock_package.egg-info/requires.txt b/trytond_stock_package.egg-info/requires.txt
index 9643ad2..f403bab 100644
--- a/trytond_stock_package.egg-info/requires.txt
+++ b/trytond_stock_package.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 bc62024b142d79cd93300da305341a694e4b67a2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:22 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 8d80dcb..68cbe07 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 1ab21bc..20bd036 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2013-2015 Cédric Krier.
-Copyright (C) 2013-2015 B2CK SPRL.
+Copyright (C) 2013-2016 Cédric Krier.
+Copyright (C) 2013-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 7771e70..22166df 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_package
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module for stock packaging
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_package
=====================
@@ -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
@@ -67,6 +68,9 @@ Classifier: Natural Language :: Russian
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/bg_BG.po b/locale/bg_BG.po
index 10fded0..a951ac8 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -156,11 +156,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr ""
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 8a2e5f8..dc18116 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -138,11 +138,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr "Tipus de paquet"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr "Paquet:"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr "Albarà:"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index de9fa29..56f786c 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -138,11 +138,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 0da9aed..fbfb75c 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -142,11 +142,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr "Lager Pakettyp"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr "Paket:"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr "Lieferposten:"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 5ac6b98..9c5ed1f 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -142,11 +142,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr "Tipo de existencias de paquete"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr "Paquete:"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr "Remito:"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index b84014a..f1232b0 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -142,11 +142,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr "Tipo de Inventario de Empaque"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr "Empaque:"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr "Envío:"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index c250c50..afbf29b 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -142,11 +142,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr "Tipo de empaquetado de stock"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr "Paquete:"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr "Envío:"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 5d5803c..2c7c958 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -140,11 +140,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr "Tipo de paquete"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr "Paquete:"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr "Albarán:"
diff --git a/locale/es_MX.po b/locale/es_MX.po
index c8ab416..19190f2 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -138,26 +138,32 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr "Tipo de empaque"
-msgctxt "odt:stock.package.label:"
+#, fuzzy
+msgctxt "report:stock.package.label:"
msgid "Package:"
-msgstr ""
+msgstr "Empaque"
-msgctxt "odt:stock.package.label:"
+#, fuzzy
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
-msgstr ""
+msgstr "Envío"
+#, fuzzy
msgctxt "view:stock.package.type:"
msgid "Package Type"
-msgstr ""
+msgstr "Tipos de empaque"
+#, fuzzy
msgctxt "view:stock.package.type:"
msgid "Package Types"
-msgstr ""
+msgstr "Tipos de empaque"
+#, fuzzy
msgctxt "view:stock.package:"
msgid "Package"
-msgstr ""
+msgstr "Empaque"
+#, fuzzy
msgctxt "view:stock.package:"
msgid "Packages"
-msgstr ""
+msgstr "Empaques"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 8d0c70d..a697a2b 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -142,11 +142,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr "Type d'emballage de stock"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr "Emballage :"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr "Expédition :"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index de9fa29..40af0de 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -4,160 +4,160 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.in.return:"
msgid "Not all Outgoing Moves of Supplier Return Shipment \"%s\" are packaged."
-msgstr ""
+msgstr "Nem lehetett az összes elfogyó visszárut \"%s\" elcsomagolni"
msgctxt "error:stock.shipment.out:"
msgid "Not all Outgoing Moves of Customer Shipment \"%s\" are packaged."
-msgstr ""
+msgstr "Nem lehetett az összes elfogyó beszállítói tételt \"%s\" elcsomagolni."
msgctxt "field:stock.configuration,package_sequence:"
msgid "Package Sequence"
-msgstr ""
+msgstr "Csomag számkör"
msgctxt "field:stock.move,package:"
msgid "Package"
-msgstr ""
+msgstr "Csomag"
msgctxt "field:stock.package,children:"
msgid "Children"
-msgstr ""
+msgstr "Gyermek (csomag)"
msgctxt "field:stock.package,code:"
msgid "Code"
-msgstr ""
+msgstr "Kód"
msgctxt "field:stock.package,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Létrehozás dátuma"
msgctxt "field:stock.package,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Által létrehozva"
msgctxt "field:stock.package,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:stock.package,moves:"
msgid "Moves"
-msgstr ""
+msgstr "Raktár mozgatás"
msgctxt "field:stock.package,parent:"
msgid "Parent"
-msgstr ""
+msgstr "Szülő (csomag)"
msgctxt "field:stock.package,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Név"
msgctxt "field:stock.package,shipment:"
msgid "Shipment"
-msgstr ""
+msgstr "Szállítási tétel"
msgctxt "field:stock.package,type:"
msgid "Type"
-msgstr ""
+msgstr "Típus"
msgctxt "field:stock.package,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Utolsó módosítás dátuma"
msgctxt "field:stock.package,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Által módosítva"
msgctxt "field:stock.package.type,create_date:"
msgid "Create Date"
-msgstr ""
+msgstr "Létrehozás dátuma"
msgctxt "field:stock.package.type,create_uid:"
msgid "Create User"
-msgstr ""
+msgstr "Által létrehozva"
msgctxt "field:stock.package.type,id:"
msgid "ID"
-msgstr ""
+msgstr "ID"
msgctxt "field:stock.package.type,name:"
msgid "Name"
-msgstr ""
+msgstr "Név"
msgctxt "field:stock.package.type,rec_name:"
msgid "Name"
-msgstr ""
+msgstr "Név"
msgctxt "field:stock.package.type,write_date:"
msgid "Write Date"
-msgstr ""
+msgstr "Utolsó módosítás dátuma"
msgctxt "field:stock.package.type,write_uid:"
msgid "Write User"
-msgstr ""
+msgstr "Által módosítva"
msgctxt "field:stock.shipment.in.return,packages:"
msgid "Packages"
-msgstr ""
+msgstr "Csomagok"
msgctxt "field:stock.shipment.in.return,root_packages:"
msgid "Packages"
-msgstr ""
+msgstr "Csomagok"
msgctxt "field:stock.shipment.out,packages:"
msgid "Packages"
-msgstr ""
+msgstr "Csomagok"
msgctxt "field:stock.shipment.out,root_packages:"
msgid "Packages"
-msgstr ""
+msgstr "Csomagok"
msgctxt "model:ir.action,name:act_package_type_form"
msgid "Package Types"
-msgstr ""
+msgstr "Csomag típus"
msgctxt "model:ir.action,name:report_package_label"
msgid "Package Labels"
-msgstr ""
+msgstr "Csomag matrica"
msgctxt "model:ir.sequence,name:sequence_package"
msgid "Stock Package"
-msgstr ""
+msgstr "Csomag"
msgctxt "model:ir.sequence.type,name:sequence_type_package"
msgid "Stock Package"
-msgstr ""
+msgstr "Csomag"
msgctxt "model:ir.ui.menu,name:menu_package_form"
msgid "Package Types"
-msgstr ""
+msgstr "Csomag típus"
msgctxt "model:stock.package,name:"
msgid "Stock Package"
-msgstr ""
+msgstr "Raktár csomag"
msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
-msgstr ""
+msgstr "Raktár csomag típus"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
-msgstr ""
+msgstr "Csomag:"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
-msgstr ""
+msgstr "Szállítási pont:"
msgctxt "view:stock.package.type:"
msgid "Package Type"
-msgstr ""
+msgstr "Csomag típus"
msgctxt "view:stock.package.type:"
msgid "Package Types"
-msgstr ""
+msgstr "Csomag típus"
msgctxt "view:stock.package:"
msgid "Package"
-msgstr ""
+msgstr "Csomag"
msgctxt "view:stock.package:"
msgid "Packages"
-msgstr ""
+msgstr "Csomagok"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index de9fa29..56f786c 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -138,11 +138,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr ""
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index de9fa29..56f786c 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -138,11 +138,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr ""
diff --git a/locale/hu_HU.po b/locale/lo_LA.po
similarity index 97%
copy from locale/hu_HU.po
copy to locale/lo_LA.po
index de9fa29..56f786c 100644
--- a/locale/hu_HU.po
+++ b/locale/lo_LA.po
@@ -138,11 +138,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr ""
diff --git a/locale/lt_LT.po b/locale/lt_LT.po
index de9fa29..56f786c 100644
--- a/locale/lt_LT.po
+++ b/locale/lt_LT.po
@@ -138,11 +138,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index cdeb1eb..02810e4 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -146,11 +146,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 8e7246a..3e7cb87 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -142,11 +142,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr "Tipo de Pacote de Estoque"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr "Embalagem:"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr "Remessa:"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 9ab4bdd..32f0691 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -157,13 +157,14 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr ""
-msgctxt "odt:stock.package.label:"
+#, fuzzy
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
-msgstr ""
+msgstr "Доставка"
msgctxt "view:stock.package.type:"
msgid "Package Type"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 57f8a73..9e5d5b5 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -138,11 +138,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr "Vrsta paketa"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr "Paket:"
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr "Pošiljka:"
diff --git a/locale/hu_HU.po b/locale/zh_CN.po
similarity index 97%
copy from locale/hu_HU.po
copy to locale/zh_CN.po
index de9fa29..56f786c 100644
--- a/locale/hu_HU.po
+++ b/locale/zh_CN.po
@@ -138,11 +138,11 @@ msgctxt "model:stock.package.type,name:"
msgid "Stock Package Type"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Package:"
msgstr ""
-msgctxt "odt:stock.package.label:"
+msgctxt "report:stock.package.label:"
msgid "Shipment:"
msgstr ""
diff --git a/setup.py b/setup.py
index e055e7d..665a77d 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'))
@@ -83,6 +89,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',
@@ -95,6 +102,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',
@@ -110,4 +120,8 @@ setup(name=name,
test_suite='tests',
test_loader='trytond.test_loader:Loader',
tests_require=tests_require,
+ use_2to3=True,
+ convert_2to3_doctests=[
+ 'tests/scenario_stock_package.rst',
+ ],
)
diff --git a/stock.py b/stock.py
index 1b8df7f..4ebd5ae 100644
--- a/stock.py
+++ b/stock.py
@@ -92,7 +92,7 @@ class Move:
package = fields.Many2One('stock.package', 'Package', select=True)
-class PackageMixin:
+class PackageMixin(object):
packages = fields.One2Many('stock.package', 'shipment', 'Packages',
states={
'readonly': Eval('state').in_(['done', 'cancel']),
@@ -116,7 +116,7 @@ class PackageMixin:
})
-class ShipmentOut(object, PackageMixin):
+class ShipmentOut(PackageMixin, object):
__metaclass__ = PoolMeta
__name__ = 'stock.shipment.out'
@@ -141,7 +141,7 @@ class ShipmentOut(object, PackageMixin):
cls.raise_user_error('package_mismatch', shipment.rec_name)
-class ShipmentInReturn(object, PackageMixin):
+class ShipmentInReturn(PackageMixin, object):
__metaclass__ = PoolMeta
__name__ = 'stock.shipment.in.return'
diff --git a/tests/__init__.py b/tests/__init__.py
index 648f60e..88b836f 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_package import suite
+try:
+ from trytond.modules.stock_package.tests.test_stock_package import suite
+except ImportError:
+ from .test_stock_package import suite
__all__ = ['suite']
diff --git a/tests/test_stock_package.py b/tests/test_stock_package.py
index 0cf8297..0744761 100644
--- a/tests/test_stock_package.py
+++ b/tests/test_stock_package.py
@@ -5,6 +5,7 @@ import doctest
import trytond.tests.test_tryton
from trytond.tests.test_tryton import ModuleTestCase
from trytond.tests.test_tryton import doctest_setup, doctest_teardown
+from trytond.tests.test_tryton import doctest_checker
class StockPackageTestCase(ModuleTestCase):
@@ -18,5 +19,6 @@ def suite():
StockPackageTestCase))
suite.addTests(doctest.DocFileSuite('scenario_stock_package.rst',
setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ checker=doctest_checker,
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 1ce303c..e20a883 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
ir
res
diff --git a/trytond_stock_package.egg-info/PKG-INFO b/trytond_stock_package.egg-info/PKG-INFO
index 3a182ca..d05e4d5 100644
--- a/trytond_stock_package.egg-info/PKG-INFO
+++ b/trytond_stock_package.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-package
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module for stock packaging
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_package
=====================
@@ -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
@@ -67,6 +68,9 @@ Classifier: Natural Language :: Russian
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_package.egg-info/SOURCES.txt b/trytond_stock_package.egg-info/SOURCES.txt
index b891917..9e309df 100644
--- a/trytond_stock_package.egg-info/SOURCES.txt
+++ b/trytond_stock_package.egg-info/SOURCES.txt
@@ -56,11 +56,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
tests/scenario_stock_package.rst
trytond_stock_package.egg-info/PKG-INFO
trytond_stock_package.egg-info/SOURCES.txt
diff --git a/trytond_stock_package.egg-info/requires.txt b/trytond_stock_package.egg-info/requires.txt
index 45ba76b..9643ad2 100644
--- a/trytond_stock_package.egg-info/requires.txt
+++ b/trytond_stock_package.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-package
More information about the tryton-debian-vcs
mailing list