[tryton-debian-vcs] tryton-modules-carrier-weight branch upstream updated. upstream/3.2.0-1-g130a006
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:15:28 UTC 2014
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-weight.git;a=commitdiff;h=upstream/3.2.0-1-g130a006
commit 130a006d92d607f8fa7aeb57679274a744f4a14d
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 16c6b8a..c52b654 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_carrier_weight
-Version: 3.2.0
+Version: 3.4.0
Summary: Tryton module to add cost method "on weight" 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_weight
======================
diff --git a/locale/sl_SI.po b/locale/es_EC.po
similarity index 73%
copy from locale/sl_SI.po
copy to locale/es_EC.po
index ba8c65e..db6044a 100644
--- a/locale/sl_SI.po
+++ b/locale/es_EC.po
@@ -4,35 +4,35 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,weight_currency:"
msgid "Currency"
-msgstr "Valuta"
+msgstr "Moneda"
msgctxt "field:carrier,weight_currency_digits:"
msgid "Weight Currency Digits"
-msgstr "Decimalke"
+msgstr "Decimales de Moneda del Peso"
msgctxt "field:carrier,weight_price_list:"
msgid "Price List"
-msgstr "Cenik"
+msgstr "Lista de Precios"
msgctxt "field:carrier,weight_uom:"
msgid "Weight Uom"
-msgstr "ME za težo"
+msgstr "UdM de Peso"
msgctxt "field:carrier,weight_uom_digits:"
msgid "Weight Uom Digits"
-msgstr "Decimalke za težo"
+msgstr "Decimales de UdM del Peso"
msgctxt "field:carrier.weight_price_list,carrier:"
msgid "Carrier"
-msgstr "Špediter"
+msgstr "Transporte"
msgctxt "field:carrier.weight_price_list,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Fecha de Creación"
msgctxt "field:carrier.weight_price_list,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Creado por Usuario"
msgctxt "field:carrier.weight_price_list,id:"
msgid "ID"
@@ -40,36 +40,36 @@ msgstr "ID"
msgctxt "field:carrier.weight_price_list,price:"
msgid "Price"
-msgstr "Cena"
+msgstr "Precio"
msgctxt "field:carrier.weight_price_list,rec_name:"
msgid "Name"
-msgstr "Ime"
+msgstr "Nombre"
msgctxt "field:carrier.weight_price_list,weight:"
msgid "Weight"
-msgstr "Teža"
+msgstr "Peso"
msgctxt "field:carrier.weight_price_list,write_date:"
msgid "Write Date"
-msgstr "Zapisano"
+msgstr "Fecha de Modificación"
msgctxt "field:carrier.weight_price_list,write_uid:"
msgid "Write User"
-msgstr "Zapisal"
+msgstr "Modificado por Usuario"
msgctxt "model:carrier.weight_price_list,name:"
msgid "Carrier Weight Price List"
-msgstr "Ceniki po teži"
+msgstr "Lista de Precio de Transporte por Peso"
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Weight"
-msgstr "Teža"
+msgstr "Peso"
msgctxt "view:carrier.weight_price_list:"
msgid "Carrier Weight Price List"
-msgstr "Cenik po teži"
+msgstr "Lista de Precios de Transporte por Peso"
msgctxt "view:carrier.weight_price_list:"
msgid "Carrier Weight Price Lists"
-msgstr "Ceniki po teži"
+msgstr "Listas de Precios de Transporte por Peso"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index ba8c65e..7103739 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -28,11 +28,11 @@ msgstr "Špediter"
msgctxt "field:carrier.weight_price_list,create_date:"
msgid "Create Date"
-msgstr "Ustvarjeno"
+msgstr "Izdelano"
msgctxt "field:carrier.weight_price_list,create_uid:"
msgid "Create User"
-msgstr "Ustvaril"
+msgstr "Izdelal"
msgctxt "field:carrier.weight_price_list,id:"
msgid "ID"
diff --git a/tests/scenario_carrier_weight.rst b/tests/scenario_carrier_weight.rst
index 6334874..9e604ad 100644
--- a/tests/scenario_carrier_weight.rst
+++ b/tests/scenario_carrier_weight.rst
@@ -17,6 +17,7 @@ Imports::
Create database::
>>> config = config.set_trytond()
+ >>> config.pool.test = True
Install carrier_weight, purchase_shipment_cost and sale_shipment_cost::
diff --git a/tests/test_carrier_weight.py b/tests/test_carrier_weight.py
index 6c0942e..8142fee 100644
--- a/tests/test_carrier_weight.py
+++ b/tests/test_carrier_weight.py
@@ -5,7 +5,8 @@ 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
+from trytond.tests.test_tryton import doctest_setup, doctest_teardown
from trytond.transaction import Transaction
@@ -100,6 +101,6 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
CarrierWeightTestCase))
suite.addTests(doctest.DocFileSuite('scenario_carrier_weight.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 fb801cd..d8e755c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.0
+version=3.4.0
depends:
carrier
company
diff --git a/trytond_carrier_weight.egg-info/PKG-INFO b/trytond_carrier_weight.egg-info/PKG-INFO
index 0760c6e..983493e 100644
--- a/trytond_carrier_weight.egg-info/PKG-INFO
+++ b/trytond_carrier_weight.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-carrier-weight
-Version: 3.2.0
+Version: 3.4.0
Summary: Tryton module to add cost method "on weight" 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_weight
======================
diff --git a/trytond_carrier_weight.egg-info/SOURCES.txt b/trytond_carrier_weight.egg-info/SOURCES.txt
index b023ba6..b83d2c1 100644
--- a/trytond_carrier_weight.egg-info/SOURCES.txt
+++ b/trytond_carrier_weight.egg-info/SOURCES.txt
@@ -9,10 +9,28 @@ 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_weight.rst
./tests/test_carrier_weight.py
+./view/carrier_form.xml
+./view/weight_price_list_form.xml
+./view/weight_price_list_tree.xml
doc/index.rst
locale/bg_BG.po
locale/ca_ES.po
@@ -20,6 +38,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_weight.egg-info/requires.txt b/trytond_carrier_weight.egg-info/requires.txt
index 55c95d5..f394221 100644
--- a/trytond_carrier_weight.egg-info/requires.txt
+++ b/trytond_carrier_weight.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_carrier >= 3.2, < 3.3
-trytond_company >= 3.2, < 3.3
-trytond_currency >= 3.2, < 3.3
-trytond_product >= 3.2, < 3.3
-trytond_product_measurements >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_carrier >= 3.4, < 3.5
+trytond_company >= 3.4, < 3.5
+trytond_currency >= 3.4, < 3.5
+trytond_product >= 3.4, < 3.5
+trytond_product_measurements >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
--
tryton-modules-carrier-weight
More information about the tryton-debian-vcs
mailing list