[tryton-debian-vcs] tryton-modules-sale-shipment-grouping branch upstream updated. upstream/4.0.0-1-g08fea9c
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Dec 6 16:06:48 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-sale-shipment-grouping.git;a=commitdiff;h=upstream/4.0.0-1-g08fea9c
commit 08fea9c5fce1383b54020490b8a9423febb26505
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 5 09:34:44 2016 +0100
Adding upstream version 4.2.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 68cbe07..01bf130 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.0 - 2016-11-28
+* 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/COPYRIGHT b/COPYRIGHT
index fdc0ecb..8f107e8 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright (C) 2014-2015 Nicolas Évrard.
+Copyright (C) 2014-2016 Nicolas Évrard.
Copyright (C) 2014-2016 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/INSTALL b/INSTALL
index 2799ffa..37eafc4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -25,7 +25,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 e862708..1247e66 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_shipment_grouping
-Version: 4.0.0
+Version: 4.2.0
Summary: Tryton module to group sale stock moves
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://dowloads.tryton.org/4.0/
+Download-URL: http://dowloads.tryton.org/4.2/
Description: sale_shipment_grouping
======================
@@ -62,6 +62,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 91%
rename from locale/bg_BG.po
rename to locale/bg.po
index e78eeb8..4dfb5ae 100644
--- a/locale/bg_BG.po
+++ b/locale/bg.po
@@ -16,6 +16,7 @@ msgctxt "selection:party.party,sale_shipment_grouping_method:"
msgid "Standard"
msgstr "Стандартен"
+#, fuzzy
msgctxt "view:party.party:"
msgid "Shipments"
-msgstr ""
+msgstr "Изпращания"
diff --git a/locale/ca_ES.po b/locale/ca.po
similarity index 100%
rename from locale/ca_ES.po
rename to locale/ca.po
diff --git a/locale/cs_CZ.po b/locale/cs.po
similarity index 100%
rename from locale/cs_CZ.po
rename 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_ES.po b/locale/es.po
similarity index 100%
rename from locale/es_ES.po
rename to locale/es.po
diff --git a/locale/it_IT.po b/locale/es_419.po
similarity index 80%
copy from locale/it_IT.po
copy to locale/es_419.po
index 9d6049a..deabeb2 100644
--- a/locale/it_IT.po
+++ b/locale/es_419.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:party.party,sale_shipment_grouping_method:"
msgid "Sale Shipment Grouping Method"
-msgstr ""
+msgstr "Método de agrupación de guías de remisión de venta"
msgctxt "selection:party.party,sale_shipment_grouping_method:"
msgid "None"
@@ -16,4 +16,4 @@ msgstr ""
msgctxt "view:party.party:"
msgid "Shipments"
-msgstr ""
+msgstr "Guías de remisión"
diff --git a/locale/es_AR.po b/locale/es_AR.po
deleted file mode 100644
index 49d1126..0000000
--- a/locale/es_AR.po
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:party.party,sale_shipment_grouping_method:"
-msgid "Sale Shipment Grouping Method"
-msgstr "Método de agrupación de los pedidos para enviar"
-
-msgctxt "selection:party.party,sale_shipment_grouping_method:"
-msgid "None"
-msgstr "Ninguno"
-
-msgctxt "selection:party.party,sale_shipment_grouping_method:"
-msgid "Standard"
-msgstr "Estándar"
-
-msgctxt "view:party.party:"
-msgid "Shipments"
-msgstr "Remitos"
diff --git a/locale/es_CO.po b/locale/es_CO.po
deleted file mode 100644
index 3e9dda1..0000000
--- a/locale/es_CO.po
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:party.party,sale_shipment_grouping_method:"
-msgid "Sale Shipment Grouping Method"
-msgstr "Método de Agrupación de Despacho de Venta"
-
-msgctxt "selection:party.party,sale_shipment_grouping_method:"
-msgid "None"
-msgstr "Ninguno"
-
-msgctxt "selection:party.party,sale_shipment_grouping_method:"
-msgid "Standard"
-msgstr "Estándar"
-
-msgctxt "view:party.party:"
-msgid "Shipments"
-msgstr "Envíos"
diff --git a/locale/es_EC.po b/locale/es_EC.po
deleted file mode 100644
index 7c56a54..0000000
--- a/locale/es_EC.po
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:party.party,sale_shipment_grouping_method:"
-msgid "Sale Shipment Grouping Method"
-msgstr "Método de agrupación de las guías de remisión de venta"
-
-msgctxt "selection:party.party,sale_shipment_grouping_method:"
-msgid "None"
-msgstr "Ninguno"
-
-msgctxt "selection:party.party,sale_shipment_grouping_method:"
-msgid "Standard"
-msgstr "Estándar"
-
-msgctxt "view:party.party:"
-msgid "Shipments"
-msgstr "Guías de remisión"
diff --git a/locale/es_MX.po b/locale/es_MX.po
deleted file mode 100644
index 8914a7b..0000000
--- a/locale/es_MX.po
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:party.party,sale_shipment_grouping_method:"
-msgid "Sale Shipment Grouping Method"
-msgstr "Método agrupación envíos de venta"
-
-msgctxt "selection:party.party,sale_shipment_grouping_method:"
-msgid "None"
-msgstr "Ninguno"
-
-msgctxt "selection:party.party,sale_shipment_grouping_method:"
-msgid "Standard"
-msgstr "Estándar"
-
-msgctxt "view:party.party:"
-msgid "Shipments"
-msgstr ""
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/hu_HU.po b/locale/hu_HU.po
index 9d6049a..c47d80a 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -6,9 +6,10 @@ msgctxt "field:party.party,sale_shipment_grouping_method:"
msgid "Sale Shipment Grouping Method"
msgstr ""
+#, fuzzy
msgctxt "selection:party.party,sale_shipment_grouping_method:"
msgid "None"
-msgstr ""
+msgstr "Nincs"
msgctxt "selection:party.party,sale_shipment_grouping_method:"
msgid "Standard"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 9d6049a..d1711cf 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -4,16 +4,16 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:party.party,sale_shipment_grouping_method:"
msgid "Sale Shipment Grouping Method"
-msgstr ""
+msgstr "metodo di raggruppamento della spedizione "
msgctxt "selection:party.party,sale_shipment_grouping_method:"
msgid "None"
-msgstr ""
+msgstr "Nessuno"
msgctxt "selection:party.party,sale_shipment_grouping_method:"
msgid "Standard"
-msgstr ""
+msgstr "Standard"
msgctxt "view:party.party:"
msgid "Shipments"
-msgstr ""
+msgstr "spedizioni"
diff --git a/locale/nl_NL.po b/locale/lo.po
similarity index 87%
copy from locale/nl_NL.po
copy to locale/lo.po
index dd9ce76..7b18264 100644
--- a/locale/nl_NL.po
+++ b/locale/lo.po
@@ -9,12 +9,12 @@ msgstr ""
#, fuzzy
msgctxt "selection:party.party,sale_shipment_grouping_method:"
msgid "None"
-msgstr "Geen"
+msgstr "ບໍ່ມີ"
#, fuzzy
msgctxt "selection:party.party,sale_shipment_grouping_method:"
msgid "Standard"
-msgstr "Standaard"
+msgstr "ມາດຕະຖານ"
msgctxt "view:party.party:"
msgid "Shipments"
diff --git a/locale/lo_LA.po b/locale/lt.po
similarity index 100%
rename from locale/lo_LA.po
rename to locale/lt.po
diff --git a/locale/nl_NL.po b/locale/nl.po
similarity index 93%
rename from locale/nl_NL.po
rename to locale/nl.po
index dd9ce76..68340ea 100644
--- a/locale/nl_NL.po
+++ b/locale/nl.po
@@ -16,6 +16,7 @@ msgctxt "selection:party.party,sale_shipment_grouping_method:"
msgid "Standard"
msgstr "Standaard"
+#, fuzzy
msgctxt "view:party.party:"
msgid "Shipments"
-msgstr ""
+msgstr "Leveringen"
diff --git a/locale/lt_LT.po b/locale/pl.po
similarity index 100%
rename from locale/lt_LT.po
rename to locale/pl.po
diff --git a/locale/ru_RU.po b/locale/ru.po
similarity index 92%
rename from locale/ru_RU.po
rename to locale/ru.po
index 977e65d..0544d13 100644
--- a/locale/ru_RU.po
+++ b/locale/ru.po
@@ -16,6 +16,7 @@ msgctxt "selection:party.party,sale_shipment_grouping_method:"
msgid "Standard"
msgstr "Стандартный"
+#, fuzzy
msgctxt "view:party.party:"
msgid "Shipments"
-msgstr ""
+msgstr "Доставка"
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 e8178ae..6ff6640 100644
--- a/setup.py
+++ b/setup.py
@@ -93,6 +93,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/tests/scenario_sale_shipment_grouping.rst b/tests/scenario_sale_shipment_grouping.rst
index f04cef9..0d4c652 100644
--- a/tests/scenario_sale_shipment_grouping.rst
+++ b/tests/scenario_sale_shipment_grouping.rst
@@ -8,7 +8,8 @@ Imports::
>>> from dateutil.relativedelta import relativedelta
>>> from decimal import Decimal
>>> from operator import attrgetter
- >>> from proteus import config, Model, Wizard
+ >>> from proteus import Model, Wizard
+ >>> from trytond.tests.tools import activate_modules
>>> from trytond.modules.company.tests.tools import create_company, \
... get_company
>>> from trytond.modules.account.tests.tools import create_fiscalyear, \
@@ -17,31 +18,19 @@ Imports::
... set_fiscalyear_invoice_sequences, create_payment_term
>>> today = datetime.date.today()
-Create database::
-
- >>> config = config.set_trytond()
- >>> config.pool.test = True
-
Install sale::
- >>> Module = Model.get('ir.module')
- >>> sale_module, = Module.find([('name', '=', 'sale_shipment_grouping')])
- >>> sale_module.click('install')
- >>> Wizard('ir.module.install_upgrade').execute('upgrade')
+ >>> config = activate_modules('sale_shipment_grouping')
Create company::
>>> _ = create_company()
>>> company = get_company()
-Reload the context::
+Create sale user::
>>> User = Model.get('res.user')
>>> Group = Model.get('res.group')
- >>> config._context = User.get_preferences(True, config.context)
-
-Create sale user::
-
>>> sale_user = User()
>>> sale_user.name = 'Sale'
>>> sale_user.login = 'sale'
diff --git a/tryton.cfg b/tryton.cfg
index 038d413..6397a8d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.2.0
depends:
ir
res
diff --git a/trytond_sale_shipment_grouping.egg-info/PKG-INFO b/trytond_sale_shipment_grouping.egg-info/PKG-INFO
index 0808d5b..dfe0a93 100644
--- a/trytond_sale_shipment_grouping.egg-info/PKG-INFO
+++ b/trytond_sale_shipment_grouping.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-shipment-grouping
-Version: 4.0.0
+Version: 4.2.0
Summary: Tryton module to group sale stock moves
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://dowloads.tryton.org/4.0/
+Download-URL: http://dowloads.tryton.org/4.2/
Description: sale_shipment_grouping
======================
@@ -62,6 +62,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_sale_shipment_grouping.egg-info/SOURCES.txt b/trytond_sale_shipment_grouping.egg-info/SOURCES.txt
index ecb793a..87bc4da 100644
--- a/trytond_sale_shipment_grouping.egg-info/SOURCES.txt
+++ b/trytond_sale_shipment_grouping.egg-info/SOURCES.txt
@@ -12,46 +12,44 @@ tryton.cfg
./party.xml
./sale.py
./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/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/scenario_sale_shipment_grouping.rst
./view/party_form.xml
doc/index.rst
-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/scenario_sale_shipment_grouping.rst
trytond_sale_shipment_grouping.egg-info/PKG-INFO
diff --git a/trytond_sale_shipment_grouping.egg-info/requires.txt b/trytond_sale_shipment_grouping.egg-info/requires.txt
index 36df08b..f028349 100644
--- a/trytond_sale_shipment_grouping.egg-info/requires.txt
+++ b/trytond_sale_shipment_grouping.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_party >= 4.0, < 4.1
-trytond_stock >= 4.0, < 4.1
-trytond_sale >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond_party >= 4.2, < 4.3
+trytond_stock >= 4.2, < 4.3
+trytond_sale >= 4.2, < 4.3
+trytond >= 4.2, < 4.3
--
tryton-modules-sale-shipment-grouping
More information about the tryton-debian-vcs
mailing list