[tryton-debian-vcs] tryton-modules-carrier-percentage branch upstream updated. upstream/4.0.1-1-g93b4f9d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Dec 6 15:56:51 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-carrier-percentage.git;a=commitdiff;h=upstream/4.0.1-1-g93b4f9d
commit 93b4f9dfb6e5b4f67907e4182ff6c1efef89ed49
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 5 09:34:22 2016 +0100
Adding upstream version 4.2.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 5d86ed0..0f962c8 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/COPYRIGHT b/COPYRIGHT
index ad1b821..08226b5 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
Copyright (C) 2011-2016 Cédric Krier.
Copyright (C) 2011-2012 Bertrand Chenal.
-Copyright (C) 2011-2015 Nicolas Évrard.
+Copyright (C) 2011-2016 Nicolas Évrard.
Copyright (C) 2011-2016 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/INSTALL b/INSTALL
index e4fdd6b..2152713 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 f501c2d..9d1c07b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_carrier_percentage
-Version: 4.0.1
+Version: 4.2.0
Summary: Tryton module to add cost method "on percentage" on carrier
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_carrier_percentage
==========================
@@ -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%
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%
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 fdc83cf..0000000
--- a/locale/es_CO.po
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:carrier,percentage:"
-msgid "Percentage"
-msgstr "Porcentaje"
-
-msgctxt "selection:carrier,carrier_cost_method:"
-msgid "Percentage"
-msgstr "Porcentaje"
diff --git a/locale/es_EC.po b/locale/es_EC.po
deleted file mode 100644
index fdc83cf..0000000
--- a/locale/es_EC.po
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:carrier,percentage:"
-msgid "Percentage"
-msgstr "Porcentaje"
-
-msgctxt "selection:carrier,carrier_cost_method:"
-msgid "Percentage"
-msgstr "Porcentaje"
diff --git a/locale/es_ES.po b/locale/es_ES.po
deleted file mode 100644
index fdc83cf..0000000
--- a/locale/es_ES.po
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:carrier,percentage:"
-msgid "Percentage"
-msgstr "Porcentaje"
-
-msgctxt "selection:carrier,carrier_cost_method:"
-msgid "Percentage"
-msgstr "Porcentaje"
diff --git a/locale/es_MX.po b/locale/es_MX.po
deleted file mode 100644
index fdc83cf..0000000
--- a/locale/es_MX.po
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "field:carrier,percentage:"
-msgid "Percentage"
-msgstr "Porcentaje"
-
-msgctxt "selection:carrier,carrier_cost_method:"
-msgid "Percentage"
-msgstr "Porcentaje"
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 821caba..dd90b48 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -2,10 +2,12 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "field:carrier,percentage:"
msgid "Percentage"
-msgstr ""
+msgstr "Százalék:"
+#, fuzzy
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Percentage"
-msgstr ""
+msgstr "Százalék:"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 821caba..951f8e9 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -4,8 +4,8 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,percentage:"
msgid "Percentage"
-msgstr ""
+msgstr "Percentuale"
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Percentage"
-msgstr ""
+msgstr "Percentuale"
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/hu_HU.po b/locale/pl.po
similarity index 84%
copy from locale/hu_HU.po
copy to locale/pl.po
index 821caba..d8f295c 100644
--- a/locale/hu_HU.po
+++ b/locale/pl.po
@@ -4,8 +4,8 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,percentage:"
msgid "Percentage"
-msgstr ""
+msgstr "Procent"
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Percentage"
-msgstr ""
+msgstr "Procent"
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 821caba..1997359 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -2,10 +2,12 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+#, fuzzy
msgctxt "field:carrier,percentage:"
msgid "Percentage"
-msgstr ""
+msgstr "百分比"
+#, fuzzy
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Percentage"
-msgstr ""
+msgstr "百分比"
diff --git a/setup.py b/setup.py
index f9adbd5..fd9cfe3 100644
--- a/setup.py
+++ b/setup.py
@@ -98,6 +98,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_carrier_percentage_with_purchase_shipment_cost.rst b/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
index 9f5f7b3..697cb3e 100644
--- a/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
+++ b/tests/scenario_carrier_percentage_with_purchase_shipment_cost.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,32 +17,19 @@ Imports::
... set_fiscalyear_invoice_sequences, create_payment_term
>>> today = datetime.date.today()
-Create database::
-
- >>> config = config.set_trytond()
- >>> config.pool.test = True
-
Install carrier_percentage, purchase_shipment_cost and sale_shipment_cost::
- >>> Module = Model.get('ir.module')
- >>> modules = Module.find([
- ... ('name', 'in', ['carrier_percentage',
- ... 'purchase_shipment_cost', 'sale_shipment_cost']),
+ >>> config = activate_modules([
+ ... 'carrier_percentage',
+ ... 'purchase_shipment_cost',
+ ... 'sale_shipment_cost',
... ])
- >>> for module in modules:
- ... module.click('install')
- >>> Wizard('ir.module.install_upgrade').execute('upgrade')
Create company::
>>> _ = create_company()
>>> company = get_company()
-Reload the context::
-
- >>> User = Model.get('res.user')
- >>> config._context = User.get_preferences(True, config.context)
-
Create fiscal year::
>>> fiscalyear = set_fiscalyear_invoice_sequences(
diff --git a/tests/test_carrier_percentage.py b/tests/test_carrier_percentage.py
index 2ca7fd5..f3244cc 100644
--- a/tests/test_carrier_percentage.py
+++ b/tests/test_carrier_percentage.py
@@ -5,7 +5,7 @@ import doctest
from decimal import Decimal
import trytond.tests.test_tryton
from trytond.tests.test_tryton import ModuleTestCase, with_transaction
-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
from trytond.pool import Pool
@@ -65,7 +65,7 @@ def suite():
CarrierPercentageTestCase))
suite.addTests(doctest.DocFileSuite(
'scenario_carrier_percentage_with_purchase_shipment_cost.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 37acab1..3016848 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.1
+version=4.2.0
depends:
carrier
currency
diff --git a/trytond_carrier_percentage.egg-info/PKG-INFO b/trytond_carrier_percentage.egg-info/PKG-INFO
index 697b3e0..1205389 100644
--- a/trytond_carrier_percentage.egg-info/PKG-INFO
+++ b/trytond_carrier_percentage.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-carrier-percentage
-Version: 4.0.1
+Version: 4.2.0
Summary: Tryton module to add cost method "on percentage" on carrier
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_carrier_percentage
==========================
@@ -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_carrier_percentage.egg-info/SOURCES.txt b/trytond_carrier_percentage.egg-info/SOURCES.txt
index d225fd2..99d11c1 100644
--- a/trytond_carrier_percentage.egg-info/SOURCES.txt
+++ b/trytond_carrier_percentage.egg-info/SOURCES.txt
@@ -13,50 +13,46 @@ tryton.cfg
./sale.py
./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_carrier_percentage_with_purchase_shipment_cost.rst
./tests/test_carrier_percentage.py
./view/carrier_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_carrier_percentage_with_purchase_shipment_cost.rst
trytond_carrier_percentage.egg-info/PKG-INFO
diff --git a/trytond_carrier_percentage.egg-info/requires.txt b/trytond_carrier_percentage.egg-info/requires.txt
index 7dbc9bf..760ceee 100644
--- a/trytond_carrier_percentage.egg-info/requires.txt
+++ b/trytond_carrier_percentage.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_carrier >= 4.0, < 4.1
-trytond_currency >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
+trytond_carrier >= 4.2, < 4.3
+trytond_currency >= 4.2, < 4.3
+trytond >= 4.2, < 4.3
--
tryton-modules-carrier-percentage
More information about the tryton-debian-vcs
mailing list