[tryton-debian-vcs] tryton-modules-carrier-percentage branch upstream updated. upstream/3.2.0-1-g1a685eb

[Mathias Behrle]

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/3.2.0-1-g1a685eb

commit 1a685eb0ecdda4592affb020a33069e70a31ee9a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Oct 21 11:29:10 2014 +0200

    Adding upstream version 3.4.0.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index b63bd8a..056ee04 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.0 - 2014-10-20
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.0 - 2014-04-21
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index bfec30c..454faaa 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_carrier_percentage
-Version: 3.2.0
+Version: 3.4.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/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
 Description: trytond_carrier_percentage
         ==========================
         
diff --git a/locale/es_EC.po b/locale/es_EC.po
new file mode 100644
index 0000000..fdc83cf
--- /dev/null
+++ b/locale/es_EC.po
@@ -0,0 +1,11 @@
+# 
+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/tests/test_carrier_percentage.py b/tests/test_carrier_percentage.py
index 102bd9f..c582e56 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 POOL, DB_NAME, USER, CONTEXT, \
-    test_view, test_depends, doctest_dropdb
+    test_view, test_depends, doctest_setup, doctest_teardown
 from trytond.transaction import Transaction
 
 
@@ -86,6 +86,6 @@ def suite():
             CarrierWeightTestCase))
     suite.addTests(doctest.DocFileSuite(
             'scenario_carrier_percentage_with_purchase_shipment_cost.rst',
-            setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
+            setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
             optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
     return suite
diff --git a/tryton.cfg b/tryton.cfg
index f5a1c1d..2ba4cc4 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.0
+version=3.4.0
 depends:
     carrier
     currency
diff --git a/trytond_carrier_percentage.egg-info/PKG-INFO b/trytond_carrier_percentage.egg-info/PKG-INFO
index f3d61c3..6857b69 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: 3.2.0
+Version: 3.4.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/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
 Description: trytond_carrier_percentage
         ==========================
         
diff --git a/trytond_carrier_percentage.egg-info/SOURCES.txt b/trytond_carrier_percentage.egg-info/SOURCES.txt
index 9cfe658..00e9761 100644
--- a/trytond_carrier_percentage.egg-info/SOURCES.txt
+++ b/trytond_carrier_percentage.egg-info/SOURCES.txt
@@ -9,10 +9,26 @@ setup.py
 tryton.cfg
 ./__init__.py
 ./carrier.py
+./carrier.xml
 ./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/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.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
@@ -20,6 +36,7 @@ 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/fr_FR.po
 locale/nl_NL.po
diff --git a/trytond_carrier_percentage.egg-info/requires.txt b/trytond_carrier_percentage.egg-info/requires.txt
index 5108cdd..687009a 100644
--- a/trytond_carrier_percentage.egg-info/requires.txt
+++ b/trytond_carrier_percentage.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_carrier >= 3.2, < 3.3
-trytond_currency >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_carrier >= 3.4, < 3.5
+trytond_currency >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
-- 
tryton-modules-carrier-percentage