[tryton-debian-vcs] tryton-modules-sale-supply branch upstream updated. upstream/4.0.1-1-g1e8a75a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Dec 6 16:07:22 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-supply.git;a=commitdiff;h=upstream/4.0.1-1-g1e8a75a
commit 1e8a75a8f334ab9183b26852ca6d8f7f527ac654
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 a8fe9a8..4436934 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 c41ff62..8077767 100644
--- a/INSTALL
+++ b/INSTALL
@@ -27,7 +27,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 3799bb5..25fec31 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_supply
-Version: 4.0.1
+Version: 4.2.0
Summary: Tryton module for sale supply
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: sale_supply
===========
@@ -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 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%
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 98%
rename from locale/de_DE.po
rename to locale/de.po
index e2a1833..88ed01f 100644
--- a/locale/de_DE.po
+++ b/locale/de.po
@@ -24,7 +24,7 @@ msgstr "Bestellvorschläge"
msgctxt "selection:sale.line,purchase_request_state:"
msgid ""
-msgstr " "
+msgstr ""
msgctxt "selection:sale.line,purchase_request_state:"
msgid "Cancel"
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/lo_LA.po b/locale/es_419.po
similarity index 100%
rename from locale/lo_LA.po
rename to locale/es_419.po
diff --git a/locale/es_AR.po b/locale/es_AR.po
deleted file mode 100644
index 7ca5545..0000000
--- a/locale/es_AR.po
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:product.product,supply_on_sale:"
-msgid "Supply On Sale"
-msgstr "Suministra en la venta"
-
-msgctxt "field:product.template,supply_on_sale:"
-msgid "Supply On Sale"
-msgstr "Suministra en la venta"
-
-msgctxt "field:sale.line,purchase_request:"
-msgid "Purchase Request"
-msgstr "Solicitud de compra"
-
-msgctxt "field:sale.line,purchase_request_state:"
-msgid "Purchase Request State"
-msgstr "Estado de solicitud de compra"
-
-msgctxt "model:ir.action,name:act_purchase_request_form"
-msgid "Purchase Requests"
-msgstr "Solicitudes de compra"
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid "Cancel"
-msgstr "Cancelado"
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid "Purchased"
-msgstr "Comprado"
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid "Requested"
-msgstr "Solicitado"
diff --git a/locale/es_CO.po b/locale/es_CO.po
deleted file mode 100644
index e7726d9..0000000
--- a/locale/es_CO.po
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:product.product,supply_on_sale:"
-msgid "Supply On Sale"
-msgstr "Provee en Venta"
-
-msgctxt "field:product.template,supply_on_sale:"
-msgid "Supply On Sale"
-msgstr "Provisión en Venta"
-
-msgctxt "field:sale.line,purchase_request:"
-msgid "Purchase Request"
-msgstr "Orden de Compra"
-
-msgctxt "field:sale.line,purchase_request_state:"
-msgid "Purchase Request State"
-msgstr "Estado de Orden de Compra"
-
-msgctxt "model:ir.action,name:act_purchase_request_form"
-msgid "Purchase Requests"
-msgstr "Ordenes de Compra"
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid ""
-msgstr " "
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid "Purchased"
-msgstr "Comprado"
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid "Requested"
-msgstr "Solicitado"
diff --git a/locale/es_EC.po b/locale/es_EC.po
deleted file mode 100644
index b602045..0000000
--- a/locale/es_EC.po
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:product.product,supply_on_sale:"
-msgid "Supply On Sale"
-msgstr "Provisión en venta"
-
-msgctxt "field:product.template,supply_on_sale:"
-msgid "Supply On Sale"
-msgstr "Provisión en venta"
-
-msgctxt "field:sale.line,purchase_request:"
-msgid "Purchase Request"
-msgstr "Solicitud de compra"
-
-msgctxt "field:sale.line,purchase_request_state:"
-msgid "Purchase Request State"
-msgstr "Estado de solicitud de compra"
-
-msgctxt "model:ir.action,name:act_purchase_request_form"
-msgid "Purchase Requests"
-msgstr "Solicitudes de compra"
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid "Cancel"
-msgstr "Cancelado"
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid "Purchased"
-msgstr "Comprado"
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid "Requested"
-msgstr "Solicitado"
diff --git a/locale/es_MX.po b/locale/es_MX.po
deleted file mode 100644
index 7e64499..0000000
--- a/locale/es_MX.po
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-#, fuzzy
-msgctxt "field:product.product,supply_on_sale:"
-msgid "Supply On Sale"
-msgstr "Suministra en la venta"
-
-msgctxt "field:product.template,supply_on_sale:"
-msgid "Supply On Sale"
-msgstr "Suministra en la venta"
-
-msgctxt "field:sale.line,purchase_request:"
-msgid "Purchase Request"
-msgstr "Solicitud de compra"
-
-msgctxt "field:sale.line,purchase_request_state:"
-msgid "Purchase Request State"
-msgstr "Estado de solicitud de compra"
-
-msgctxt "model:ir.action,name:act_purchase_request_form"
-msgid "Purchase Requests"
-msgstr "Solicitudes de compra"
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid ""
-msgstr ""
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid "Cancel"
-msgstr "Cancelado"
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid "Purchased"
-msgstr "Comprado"
-
-msgctxt "selection:sale.line,purchase_request_state:"
-msgid "Requested"
-msgstr "Solicitado"
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 96d4b90..f2d3ea7 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -26,9 +26,10 @@ msgctxt "selection:sale.line,purchase_request_state:"
msgid ""
msgstr ""
+#, fuzzy
msgctxt "selection:sale.line,purchase_request_state:"
msgid "Cancel"
-msgstr ""
+msgstr "Mégse"
msgctxt "selection:sale.line,purchase_request_state:"
msgid "Purchased"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 96d4b90..ff7d0ee 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -4,36 +4,37 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:product.product,supply_on_sale:"
msgid "Supply On Sale"
-msgstr ""
+msgstr "forniture in vendita"
msgctxt "field:product.template,supply_on_sale:"
msgid "Supply On Sale"
-msgstr ""
+msgstr "forniture in vendita"
msgctxt "field:sale.line,purchase_request:"
msgid "Purchase Request"
-msgstr ""
+msgstr "richiesta di acquisto"
msgctxt "field:sale.line,purchase_request_state:"
msgid "Purchase Request State"
-msgstr ""
+msgstr "stato della richiesta di acquisto"
msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
-msgstr ""
+msgstr "richieste di acquisto"
+#, fuzzy
msgctxt "selection:sale.line,purchase_request_state:"
msgid ""
-msgstr ""
+msgstr " "
msgctxt "selection:sale.line,purchase_request_state:"
msgid "Cancel"
-msgstr ""
+msgstr "annulla"
msgctxt "selection:sale.line,purchase_request_state:"
msgid "Purchased"
-msgstr ""
+msgstr "acquistato"
msgctxt "selection:sale.line,purchase_request_state:"
msgid "Requested"
-msgstr ""
+msgstr "Richiesto"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 96d4b90..896575f 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -10,9 +10,10 @@ msgctxt "field:product.template,supply_on_sale:"
msgid "Supply On Sale"
msgstr ""
+#, fuzzy
msgctxt "field:sale.line,purchase_request:"
msgid "Purchase Request"
-msgstr ""
+msgstr "Purchase Requests"
msgctxt "field:sale.line,purchase_request_state:"
msgid "Purchase Request State"
@@ -20,7 +21,7 @@ msgstr ""
msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
-msgstr ""
+msgstr "Purchase Requests"
msgctxt "selection:sale.line,purchase_request_state:"
msgid ""
diff --git a/locale/nl_NL.po b/locale/lo.po
similarity index 96%
copy from locale/nl_NL.po
copy to locale/lo.po
index 81391da..5a02036 100644
--- a/locale/nl_NL.po
+++ b/locale/lo.po
@@ -29,7 +29,7 @@ msgstr ""
#, fuzzy
msgctxt "selection:sale.line,purchase_request_state:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr "ຍົກເລີກ"
msgctxt "selection:sale.line,purchase_request_state:"
msgid "Purchased"
diff --git a/locale/lt_LT.po b/locale/lt.po
similarity index 100%
rename from locale/lt_LT.po
rename to locale/lt.po
diff --git a/locale/nl_NL.po b/locale/nl.po
similarity index 100%
copy from locale/nl_NL.po
copy to locale/nl.po
diff --git a/locale/nl_NL.po b/locale/pl.po
similarity index 93%
rename from locale/nl_NL.po
rename to locale/pl.po
index 81391da..896575f 100644
--- a/locale/nl_NL.po
+++ b/locale/pl.po
@@ -10,9 +10,10 @@ msgctxt "field:product.template,supply_on_sale:"
msgid "Supply On Sale"
msgstr ""
+#, fuzzy
msgctxt "field:sale.line,purchase_request:"
msgid "Purchase Request"
-msgstr ""
+msgstr "Purchase Requests"
msgctxt "field:sale.line,purchase_request_state:"
msgid "Purchase Request State"
@@ -20,16 +21,15 @@ msgstr ""
msgctxt "model:ir.action,name:act_purchase_request_form"
msgid "Purchase Requests"
-msgstr ""
+msgstr "Purchase Requests"
msgctxt "selection:sale.line,purchase_request_state:"
msgid ""
msgstr ""
-#, fuzzy
msgctxt "selection:sale.line,purchase_request_state:"
msgid "Cancel"
-msgstr "Annuleren"
+msgstr ""
msgctxt "selection:sale.line,purchase_request_state:"
msgid "Purchased"
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/locale/zh_CN.po b/locale/zh_CN.po
index 96d4b90..8d28400 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -26,9 +26,10 @@ msgctxt "selection:sale.line,purchase_request_state:"
msgid ""
msgstr ""
+#, fuzzy
msgctxt "selection:sale.line,purchase_request_state:"
msgid "Cancel"
-msgstr ""
+msgstr "取消"
msgctxt "selection:sale.line,purchase_request_state:"
msgid "Purchased"
diff --git a/setup.py b/setup.py
index 03ee35c..421b2ee 100644
--- a/setup.py
+++ b/setup.py
@@ -95,6 +95,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_supply.rst b/tests/scenario_sale_supply.rst
index b357323..fbe36f1 100644
--- a/tests/scenario_sale_supply.rst
+++ b/tests/scenario_sale_supply.rst
@@ -7,7 +7,8 @@ Imports::
>>> import datetime
>>> from dateutil.relativedelta import relativedelta
>>> from decimal import Decimal
- >>> 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, \
@@ -16,35 +17,20 @@ Imports::
... set_fiscalyear_invoice_sequences, create_payment_term
>>> today = datetime.date.today()
-Create database::
-
- >>> config = config.set_trytond()
- >>> config.pool.test = True
-
Install sale_supply, sale, purchase::
- >>> Module = Model.get('ir.module')
- >>> modules = Module.find([
- ... ('name', 'in', ('sale_supply', 'sale', 'purchase')),
- ... ])
- >>> for module in modules:
- ... module.click('install')
- >>> Wizard('ir.module.install_upgrade').execute('upgrade')
+ >>> config = activate_modules(['sale_supply', 'sale', 'purchase'])
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)
>>> admin_user, = User.find([('login', '=', 'admin')])
-
-Create sale user::
-
>>> sale_user = User()
>>> sale_user.name = 'Sale'
>>> sale_user.login = 'sale'
diff --git a/tests/test_sale_supply.py b/tests/test_sale_supply.py
index 5ecc782..0d9067f 100644
--- a/tests/test_sale_supply.py
+++ b/tests/test_sale_supply.py
@@ -4,7 +4,7 @@ import unittest
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_teardown
from trytond.tests.test_tryton import doctest_checker
@@ -18,7 +18,7 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
SaleSupplyTestCase))
suite.addTests(doctest.DocFileSuite('scenario_sale_supply.rst',
- setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ 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 b2ccf26..03fdcec 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.1
+version=4.2.0
depends:
ir
purchase
diff --git a/trytond_sale_supply.egg-info/PKG-INFO b/trytond_sale_supply.egg-info/PKG-INFO
index c57e9dd..7a103ae 100644
--- a/trytond_sale_supply.egg-info/PKG-INFO
+++ b/trytond_sale_supply.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-supply
-Version: 4.0.1
+Version: 4.2.0
Summary: Tryton module for sale supply
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: sale_supply
===========
@@ -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_supply.egg-info/SOURCES.txt b/trytond_sale_supply.egg-info/SOURCES.txt
index cc76b43..1d371e1 100644
--- a/trytond_sale_supply.egg-info/SOURCES.txt
+++ b/trytond_sale_supply.egg-info/SOURCES.txt
@@ -16,25 +16,23 @@ tryton.cfg
./sale.xml
./stock.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/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/scenario_sale_supply.rst
@@ -42,25 +40,23 @@ tryton.cfg
./view/sale_line_form.xml
./view/template_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_supply.rst
trytond_sale_supply.egg-info/PKG-INFO
diff --git a/trytond_sale_supply.egg-info/requires.txt b/trytond_sale_supply.egg-info/requires.txt
index 1695356..f3abd4c 100644
--- a/trytond_sale_supply.egg-info/requires.txt
+++ b/trytond_sale_supply.egg-info/requires.txt
@@ -1,5 +1,5 @@
-trytond_purchase >= 4.0, < 4.1
-trytond_purchase_request >= 4.0, < 4.1
-trytond_sale >= 4.0, < 4.1
-trytond_stock >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
+trytond_purchase >= 4.2, < 4.3
+trytond_purchase_request >= 4.2, < 4.3
+trytond_sale >= 4.2, < 4.3
+trytond_stock >= 4.2, < 4.3
+trytond >= 4.2, < 4.3
--
tryton-modules-sale-supply
More information about the tryton-debian-vcs
mailing list