[tryton-debian-vcs] tryton-modules-carrier-weight branch upstream updated. upstream/2.8.0-1-g2026515
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:33:56 UTC 2013
The following commit has been merged in the upstream branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-carrier-weight.git;a=commitdiff;h=upstream/2.8.0-1-g2026515
commit 2026515e02ffead8aa9cff1cadbda0e4c84250e8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:26:54 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 8d85d43..69dc0e9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 9b9465a..ee71556 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_carrier_weight
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add cost method "on weight" on carrier
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_carrier_weight
======================
@@ -58,6 +58,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/es_AR.po b/locale/es_AR.po
index f9be67f..4470e94 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,weight_currency:"
msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
msgctxt "field:carrier,weight_currency_digits:"
msgid "Weight Currency Digits"
diff --git a/locale/es_AR.po b/locale/sl_SI.po
similarity index 73%
copy from locale/es_AR.po
copy to locale/sl_SI.po
index f9be67f..ba8c65e 100644
--- a/locale/es_AR.po
+++ b/locale/sl_SI.po
@@ -4,35 +4,35 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:carrier,weight_currency:"
msgid "Currency"
-msgstr "Divisa"
+msgstr "Valuta"
msgctxt "field:carrier,weight_currency_digits:"
msgid "Weight Currency Digits"
-msgstr "Dígitos moneda del peso"
+msgstr "Decimalke"
msgctxt "field:carrier,weight_price_list:"
msgid "Price List"
-msgstr "Lista de precios"
+msgstr "Cenik"
msgctxt "field:carrier,weight_uom:"
msgid "Weight Uom"
-msgstr "UdM del Peso"
+msgstr "ME za težo"
msgctxt "field:carrier,weight_uom_digits:"
msgid "Weight Uom Digits"
-msgstr "Dígitos UdM del Peso"
+msgstr "Decimalke za težo"
msgctxt "field:carrier.weight_price_list,carrier:"
msgid "Carrier"
-msgstr "Transportista"
+msgstr "Špediter"
msgctxt "field:carrier.weight_price_list,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt "field:carrier.weight_price_list,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
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 "Precio"
+msgstr "Cena"
msgctxt "field:carrier.weight_price_list,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:carrier.weight_price_list,weight:"
msgid "Weight"
-msgstr "Peso"
+msgstr "Teža"
msgctxt "field:carrier.weight_price_list,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt "field:carrier.weight_price_list,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
msgctxt "model:carrier.weight_price_list,name:"
msgid "Carrier Weight Price List"
-msgstr "Lista de precios del peso transportista"
+msgstr "Ceniki po teži"
msgctxt "selection:carrier,carrier_cost_method:"
msgid "Weight"
-msgstr "Peso"
+msgstr "Teža"
msgctxt "view:carrier.weight_price_list:"
msgid "Carrier Weight Price List"
-msgstr "Lista de precios del peso transportista"
+msgstr "Cenik po teži"
msgctxt "view:carrier.weight_price_list:"
msgid "Carrier Weight Price Lists"
-msgstr "Listas de precios del peso transportista"
+msgstr "Ceniki po teži"
diff --git a/setup.py b/setup.py
index afd6671..cf682f6 100644
--- a/setup.py
+++ b/setup.py
@@ -62,6 +62,7 @@ setup(name='trytond_carrier_weight',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/stock.py b/stock.py
index f7cc078..0511f59 100644
--- a/stock.py
+++ b/stock.py
@@ -37,7 +37,10 @@ class ShipmentIn:
for key, parcel in groupby(lines, key=keyfunc):
weight = 0
for line in parcel:
- if line.product and line.quantity and line.uom:
+ if (line.product
+ and line.quantity
+ and line.uom
+ and line.product.weight):
quantity = Uom.compute_qty(line.uom, line.quantity,
line.product.default_uom, round=False)
weight += Uom.compute_qty(line.product.weight_uom,
@@ -75,7 +78,10 @@ class ShipmentOut:
for key, parcel in groupby(lines, key=keyfunc):
weight = 0
for line in parcel:
- if line.product and line.quantity and line.uom:
+ if (line.product
+ and line.quantity
+ and line.uom
+ and line.product.weight):
quantity = Uom.compute_qty(line.uom, line.quantity,
line.product.default_uom, round=False)
weight += Uom.compute_qty(line.product.weight_uom,
diff --git a/tests/__init__.py b/tests/__init__.py
index c01b6bf..9d9ea3e 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from test_carrier_weight import suite
+
+__all__ = ['suite']
diff --git a/tests/scenario_carrier_weight.rst b/tests/scenario_carrier_weight.rst
index d135e20..61f9a76 100644
--- a/tests/scenario_carrier_weight.rst
+++ b/tests/scenario_carrier_weight.rst
@@ -89,7 +89,7 @@ Create chart of accounts::
>>> AccountTemplate = Model.get('account.account.template')
>>> Account = Model.get('account.account')
>>> AccountJournal = Model.get('account.journal')
- >>> account_template, = AccountTemplate.find([('parent', '=', False)])
+ >>> account_template, = AccountTemplate.find([('parent', '=', None)])
>>> create_chart = Wizard('account.create_chart')
>>> create_chart.execute('account')
>>> create_chart.form.account_template = account_template
diff --git a/tryton.cfg b/tryton.cfg
index bb7f271..fcc9507 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
carrier
company
diff --git a/trytond_carrier_weight.egg-info/PKG-INFO b/trytond_carrier_weight.egg-info/PKG-INFO
index d5cca13..57fbd58 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: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add cost method "on weight" on carrier
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_carrier_weight
======================
@@ -58,6 +58,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_carrier_weight.egg-info/SOURCES.txt b/trytond_carrier_weight.egg-info/SOURCES.txt
index ceecda8..b023ba6 100644
--- a/trytond_carrier_weight.egg-info/SOURCES.txt
+++ b/trytond_carrier_weight.egg-info/SOURCES.txt
@@ -24,6 +24,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
tests/scenario_carrier_weight.rst
trytond_carrier_weight.egg-info/PKG-INFO
trytond_carrier_weight.egg-info/SOURCES.txt
diff --git a/trytond_carrier_weight.egg-info/requires.txt b/trytond_carrier_weight.egg-info/requires.txt
index 2660c84..96ada65 100644
--- a/trytond_carrier_weight.egg-info/requires.txt
+++ b/trytond_carrier_weight.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_carrier >= 2.8, < 2.9
-trytond_company >= 2.8, < 2.9
-trytond_currency >= 2.8, < 2.9
-trytond_product >= 2.8, < 2.9
-trytond_product_measurements >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_carrier >= 3.0, < 3.1
+trytond_company >= 3.0, < 3.1
+trytond_currency >= 3.0, < 3.1
+trytond_product >= 3.0, < 3.1
+trytond_product_measurements >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
--
tryton-modules-carrier-weight
More information about the tryton-debian-vcs
mailing list