[tryton-debian-vcs] tryton-modules-stock-package-shipping branch debian updated. debian/4.2.0-1-2-g660c163
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:36:58 UTC 2017
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-package-shipping.git;a=commitdiff;h=debian/4.2.0-1-2-g660c163
commit 660c163e54034b2d086d784ebe5057d757685bf8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 7 15:27:04 2017 +0200
Merging upstream version 4.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 1c72ee3..57d8820 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,6 @@
+Version 4.4.0 - 2017-05-01
+* Bug fixes (see mercurial logs for details)
+* Move package weight to stock_shipment_measurements module
+
Version 4.2.0 - 2016-11-28
-* Initial release
\ No newline at end of file
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
index f51e549..0d03c0a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2016 Nicolas Évrard.
-Copyright (C) 2016 B2CK.
+Copyright (C) 2016-2017 Nicolas Évrard.
+Copyright (C) 2016-2017 B2CK.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 3d1aea8..51b8794 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_package_shipping
-Version: 4.2.0
+Version: 4.4.0
Summary: The package shipping module of the Tryton application platform.
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.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_stock_package_shipping
==============================
@@ -51,7 +51,7 @@ Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
diff --git a/locale/bg.po b/locale/bg.po
index 1471235..424afd1 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -25,11 +25,6 @@ msgid "Shipping Reference"
msgstr ""
#, fuzzy
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr "Тегло"
-
-#, fuzzy
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr "Височина"
@@ -75,10 +70,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr ""
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr ""
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr ""
diff --git a/locale/ca.po b/locale/ca.po
index 94ac9da..30f1af7 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -26,10 +26,6 @@ msgctxt "field:stock.package,shipping_reference:"
msgid "Shipping Reference"
msgstr "Referència d'enviament"
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr "Pes"
-
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr "Altura"
@@ -70,10 +66,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr "Descripció d'enviament"
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr "El pes total del contingut del paquet en Kg."
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr "Crea enviament"
diff --git a/locale/cs.po b/locale/cs.po
index 517c70c..adf18f2 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -24,10 +24,6 @@ msgctxt "field:stock.package,shipping_reference:"
msgid "Shipping Reference"
msgstr ""
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr ""
-
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr ""
@@ -68,10 +64,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr ""
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr ""
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr ""
diff --git a/locale/de.po b/locale/de.po
index 6086c55..ffd9010 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -26,10 +26,6 @@ msgctxt "field:stock.package,shipping_reference:"
msgid "Shipping Reference"
msgstr "Versandbeleg"
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr "Gewicht"
-
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr "Höhe"
@@ -70,10 +66,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr "Versandbeschreibung"
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr "Das Gesamtgewicht aller Pakete in kg."
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr "Versand erstellen"
diff --git a/locale/es.po b/locale/es.po
index 881faa4..2ebefff 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -26,10 +26,6 @@ msgctxt "field:stock.package,shipping_reference:"
msgid "Shipping Reference"
msgstr "Referencia de envío"
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr "Peso"
-
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr "Altura"
@@ -70,10 +66,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr "Descripción del envío"
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr "El peso total del contenido del paquete en Kg."
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr "Crear envío"
diff --git a/locale/es_419.po b/locale/es_419.po
index 2b9eda8..c1c0dd5 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -26,10 +26,6 @@ msgctxt "field:stock.package,shipping_reference:"
msgid "Shipping Reference"
msgstr ""
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr ""
-
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr ""
@@ -70,10 +66,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr ""
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr ""
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr ""
diff --git a/locale/fr.po b/locale/fr.po
index d3f5b32..116f169 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -26,10 +26,6 @@ msgctxt "field:stock.package,shipping_reference:"
msgid "Shipping Reference"
msgstr "Référence de livraison"
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr "Poids"
-
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr "Hauteur"
@@ -70,10 +66,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr "Description de la livraison"
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr "Le poids total des mouvements de l'emballage en kg."
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr "Créer la livraison"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 512b951..56c54c1 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -25,11 +25,6 @@ msgid "Shipping Reference"
msgstr ""
#, fuzzy
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr "Tömeg"
-
-#, fuzzy
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr "Magasság"
@@ -75,10 +70,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr ""
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr ""
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 769b007..e6d8b97 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -24,10 +24,6 @@ msgctxt "field:stock.package,shipping_reference:"
msgid "Shipping Reference"
msgstr ""
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr ""
-
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr ""
@@ -69,10 +65,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr ""
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr ""
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr ""
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index d350928..02d00d1 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -24,10 +24,6 @@ msgctxt "field:stock.package,shipping_reference:"
msgid "Shipping Reference"
msgstr ""
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr ""
-
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr ""
@@ -68,10 +64,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr ""
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr ""
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr "Create Shipping"
diff --git a/locale/lo.po b/locale/lo.po
index ba275bc..4ed5131 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -25,11 +25,6 @@ msgid "Shipping Reference"
msgstr ""
#, fuzzy
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr "ນໍ້າໜັກ"
-
-#, fuzzy
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr "ນໍ້າໜັກ"
@@ -71,10 +66,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr ""
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr ""
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr ""
diff --git a/locale/lt.po b/locale/lt.po
index 517c70c..adf18f2 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -24,10 +24,6 @@ msgctxt "field:stock.package,shipping_reference:"
msgid "Shipping Reference"
msgstr ""
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr ""
-
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr ""
@@ -68,10 +64,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr ""
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr ""
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr ""
diff --git a/locale/nl.po b/locale/nl.po
index 302e10f..0d71338 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -25,11 +25,6 @@ msgid "Shipping Reference"
msgstr ""
#, fuzzy
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr "Gewicht"
-
-#, fuzzy
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr "Gewicht"
@@ -72,10 +67,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr ""
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr ""
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr ""
diff --git a/locale/pl.po b/locale/pl.po
index d350928..02d00d1 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -24,10 +24,6 @@ msgctxt "field:stock.package,shipping_reference:"
msgid "Shipping Reference"
msgstr ""
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr ""
-
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr ""
@@ -68,10 +64,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr ""
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr ""
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr "Create Shipping"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 4656d54..9d8bb48 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -4,98 +4,84 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
msgid "The shipment \"%(shipment)s\" does not have a carrier set"
-msgstr ""
+msgstr "A remessa \"%(shipment)s\" não tem uma transportadora definida"
msgctxt "error:stock.shipment.out:"
msgid ""
"The shipment \"%(shipment)s\" must be packed before creating the shipping "
"labels"
msgstr ""
+"A remessa \"%(shipment)s\" deve ser empacotada antes da criação das "
+"etiquetas da remessa"
msgctxt "field:carrier,shipping_service:"
msgid "Shipping Service"
-msgstr ""
+msgstr "Serviço de Envio"
msgctxt "field:stock.package,shipping_label:"
msgid "Shipping Label"
-msgstr ""
+msgstr "Etiquetas de envio"
msgctxt "field:stock.package,shipping_reference:"
msgid "Shipping Reference"
-msgstr ""
+msgstr "Referência de Envio"
-#, fuzzy
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr "Peso"
-
-#, fuzzy
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr "Altura"
-#, fuzzy
msgctxt "field:stock.package.type,height_digits:"
msgid "Height Digits"
msgstr "Dígitos decimais da altura"
msgctxt "field:stock.package.type,height_uom:"
msgid "Height Unit"
-msgstr ""
+msgstr "Unidade da Altura"
-#, fuzzy
msgctxt "field:stock.package.type,length:"
msgid "Length"
msgstr "Comprimento"
-#, fuzzy
msgctxt "field:stock.package.type,length_digits:"
msgid "Length Digits"
msgstr "Dígitos decimais do comprimento"
msgctxt "field:stock.package.type,length_uom:"
msgid "Length Unit"
-msgstr ""
+msgstr "Unidade do Comprimento"
-#, fuzzy
msgctxt "field:stock.package.type,width:"
msgid "Width"
msgstr "Largura"
-#, fuzzy
msgctxt "field:stock.package.type,width_digits:"
msgid "Width Digits"
msgstr "Dígitos decimais da largura"
msgctxt "field:stock.package.type,width_uom:"
msgid "Width Unit"
-msgstr ""
+msgstr "Unidade da Largura"
msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
-msgstr ""
-
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr ""
+msgstr "Descrição do Envio"
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
-msgstr ""
+msgstr "Criar Envio"
msgctxt "model:ir.ui.menu,name:menu_package_shipping_configuration"
msgid "Shipping"
-msgstr ""
+msgstr "Envio"
-#, fuzzy
msgctxt "selection:carrier,shipping_service:"
msgid ""
-msgstr "Português (Brasil)"
+msgstr ""
msgctxt "view:stock.package.type:"
msgid "Dimensions"
-msgstr ""
+msgstr "Dimensões"
msgctxt "view:stock.shipment.out:"
msgid "Create Shipping for Packages"
-msgstr ""
+msgstr "Criar Envio para Pacotes"
diff --git a/locale/ru.po b/locale/ru.po
index 6eb5a14..1bca666 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -25,11 +25,6 @@ msgid "Shipping Reference"
msgstr ""
#, fuzzy
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr "Ширина"
-
-#, fuzzy
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr "Ширина"
@@ -72,10 +67,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr ""
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr ""
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr ""
diff --git a/locale/sl.po b/locale/sl.po
index 5514bda..6947753 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -4,88 +4,73 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
msgid "The shipment \"%(shipment)s\" does not have a carrier set"
-msgstr ""
+msgstr "Za dostavo \"%(shipment)s\" še ni izbran špediter."
msgctxt "error:stock.shipment.out:"
msgid ""
"The shipment \"%(shipment)s\" must be packed before creating the shipping "
"labels"
-msgstr ""
+msgstr "Pred izdelavo nalepk mora bit dostava \"%(shipment)s\" zapakirana."
msgctxt "field:carrier,shipping_service:"
msgid "Shipping Service"
-msgstr ""
+msgstr "Dostavna služba"
msgctxt "field:stock.package,shipping_label:"
msgid "Shipping Label"
-msgstr ""
+msgstr "Nalepka pošiljke"
msgctxt "field:stock.package,shipping_reference:"
msgid "Shipping Reference"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr "Teža"
+msgstr "Sklic paketne dostave"
-#, fuzzy
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr "Višina"
-#, fuzzy
msgctxt "field:stock.package.type,height_digits:"
msgid "Height Digits"
msgstr "Decimalke za višino"
msgctxt "field:stock.package.type,height_uom:"
msgid "Height Unit"
-msgstr ""
+msgstr "Enota višine"
-#, fuzzy
msgctxt "field:stock.package.type,length:"
msgid "Length"
msgstr "Dolžina"
-#, fuzzy
msgctxt "field:stock.package.type,length_digits:"
msgid "Length Digits"
msgstr "Decimalke za dolžino"
msgctxt "field:stock.package.type,length_uom:"
msgid "Length Unit"
-msgstr ""
+msgstr "Enota dolžine"
-#, fuzzy
msgctxt "field:stock.package.type,width:"
msgid "Width"
msgstr "Širina"
-#, fuzzy
msgctxt "field:stock.package.type,width_digits:"
msgid "Width Digits"
msgstr "Decimalke za širino"
msgctxt "field:stock.package.type,width_uom:"
msgid "Width Unit"
-msgstr ""
+msgstr "Enota širine"
msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
-msgstr ""
-
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr ""
+msgstr "Opis pošiljke"
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
-msgstr ""
+msgstr "Izdelava dostave"
msgctxt "model:ir.ui.menu,name:menu_package_shipping_configuration"
msgid "Shipping"
-msgstr ""
+msgstr "Dostava"
msgctxt "selection:carrier,shipping_service:"
msgid ""
@@ -93,8 +78,8 @@ msgstr ""
msgctxt "view:stock.package.type:"
msgid "Dimensions"
-msgstr ""
+msgstr "Dimenzije"
msgctxt "view:stock.shipment.out:"
msgid "Create Shipping for Packages"
-msgstr ""
+msgstr "Izdelava paketne dostave"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index cf5e1d5..62abfc3 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -24,10 +24,6 @@ msgctxt "field:stock.package,shipping_reference:"
msgid "Shipping Reference"
msgstr ""
-msgctxt "field:stock.package,weight:"
-msgid "Weight"
-msgstr ""
-
msgctxt "field:stock.package.type,height:"
msgid "Height"
msgstr ""
@@ -69,10 +65,6 @@ msgctxt "field:stock.shipment.out,shipping_description:"
msgid "Shipping Description"
msgstr ""
-msgctxt "help:stock.package,weight:"
-msgid "The total weight of the package's moves in kg."
-msgstr ""
-
msgctxt "model:ir.action,name:act_create_shipping_wizard"
msgid "Create Shipping"
msgstr ""
diff --git a/setup.py b/setup.py
index 11afe0f..136e1d3 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@ setup(name=name,
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
'Natural Language :: Czech',
diff --git a/stock.py b/stock.py
index 18639ca..61b5815 100644
--- a/stock.py
+++ b/stock.py
@@ -2,7 +2,7 @@
# this repository contains the full copyright notices and license terms.
from trytond.model import Workflow, ModelView, fields
-from trytond.pool import Pool, PoolMeta
+from trytond.pool import PoolMeta
from trytond.pyson import Eval, Bool, Id
from trytond.wizard import Wizard, StateTransition
@@ -87,10 +87,6 @@ class Package:
'readonly': Eval('_parent_shipment', {}).get('carrier', False),
})
shipping_label = fields.Binary('Shipping Label', readonly=True)
- weight = fields.Function(
- fields.Float('Weight', digits=None,
- help="The total weight of the package's moves in kg."),
- 'get_weight')
@classmethod
def search_rec_name(cls, name, clause):
@@ -99,35 +95,6 @@ class Package:
('shipping_reference',) + tuple(clause[:1]),
]
- def get_weight(self, name):
- pool = Pool()
- UoM = pool.get('product.uom')
- UoMCategory = pool.get('product.uom.category')
- ModelData = pool.get('ir.model.data')
-
- weight_category = UoMCategory(
- ModelData.get_id('product', 'uom_cat_weight'))
- kg = UoM(ModelData.get_id('product', 'uom_kilogram'))
-
- weight = 0
- for move in self.moves:
- # Use first the weight from product_measurements as it could
- # include some handling weight
- if move.product.weight is not None:
- weight += UoM.compute_qty(
- move.product.weight_uom,
- move.internal_quantity * move.product.weight,
- kg, round=False)
- elif move.product.default_uom.category == weight_category:
- weight += UoM.compute_qty(
- move.product.default_uom,
- move.internal_quantity,
- kg, round=False)
- else:
- weight = None
- break
- return weight
-
class ShipmentOut:
__metaclass__ = PoolMeta
@@ -169,16 +136,21 @@ class ShipmentOut:
]
@classmethod
- @Workflow.transition('packed')
- def pack(cls, shipments):
- super(ShipmentOut, cls).pack(shipments)
+ def validate(cls, shipments):
+ super(ShipmentOut, cls).validate(shipments)
for shipment in shipments:
if shipment.carrier and shipment.carrier.shipping_service:
method_name = ('validate_packing_%s'
% shipment.carrier.shipping_service)
validator = getattr(shipment, method_name)
validator()
- elif not shipment.carrier:
+
+ @classmethod
+ @Workflow.transition('packed')
+ def pack(cls, shipments):
+ super(ShipmentOut, cls).pack(shipments)
+ for shipment in shipments:
+ if not shipment.carrier:
cls.raise_user_warning(
'shipment_out_no_carrier_%s' % shipment.id,
'shipment_without_carrier', {
diff --git a/tests/test_shipping.py b/tests/test_shipping.py
index acc4420..c66e94a 100644
--- a/tests/test_shipping.py
+++ b/tests/test_shipping.py
@@ -3,69 +3,14 @@
import unittest
-from trytond.tests.test_tryton import ModuleTestCase, with_transaction
+from trytond.tests.test_tryton import ModuleTestCase
from trytond.tests.test_tryton import suite as test_suite
-from trytond.pool import Pool
class StockPackageShippingTestCase(ModuleTestCase):
'Test Stock Package Shipping module'
module = 'stock_package_shipping'
- @with_transaction()
- def test_package_weight(self):
- 'Test package weight'
- pool = Pool()
- UoM = pool.get('product.uom')
- Template = pool.get('product.template')
- Product = pool.get('product.product')
- Move = pool.get('stock.move')
- Package = pool.get('stock.package')
-
- u, = UoM.search([('symbol', '=', 'u')])
- g, = UoM.search([('symbol', '=', 'g')])
-
- template_u = Template(
- name='Product Unit',
- type='goods',
- list_price=0,
- cost_price=0,
- default_uom=u,
- weight=500,
- weight_uom=g,
- )
- template_u.save()
- product_u = Product(template=template_u)
- product_u.save()
-
- template_g = Template(
- name='Product Gram',
- type='goods',
- list_price=0,
- cost_price=0,
- default_uom=g,
- )
- template_g.save()
- product_g = Product(template=template_g)
- product_g.save()
-
- move1 = Move(
- product=product_u,
- uom=u,
- quantity=1,
- internal_quantity=1,
- )
- move2 = Move(
- product=product_g,
- uom=g,
- quantity=200,
- internal_quantity=200,
- )
-
- package = Package()
- package.moves = [move1, move2]
- self.assertEqual(package.get_weight('weight'), 0.7)
-
def suite():
suite = test_suite()
diff --git a/tryton.cfg b/tryton.cfg
index 23a9e4a..cd81a17 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.4.0
depends:
ir
res
@@ -7,6 +7,7 @@ depends:
product
stock
stock_package
+ stock_shipment_measurements
sale_shipment_cost
product_measurements
xml:
diff --git a/trytond_stock_package_shipping.egg-info/PKG-INFO b/trytond_stock_package_shipping.egg-info/PKG-INFO
index dc245fe..ca98ac2 100644
--- a/trytond_stock_package_shipping.egg-info/PKG-INFO
+++ b/trytond_stock_package_shipping.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-package-shipping
-Version: 4.2.0
+Version: 4.4.0
Summary: The package shipping module of the Tryton application platform.
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.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_stock_package_shipping
==============================
@@ -51,7 +51,7 @@ Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
diff --git a/trytond_stock_package_shipping.egg-info/requires.txt b/trytond_stock_package_shipping.egg-info/requires.txt
index 1931999..4c6f23a 100644
--- a/trytond_stock_package_shipping.egg-info/requires.txt
+++ b/trytond_stock_package_shipping.egg-info/requires.txt
@@ -1,7 +1,8 @@
-trytond_carrier >= 4.2, < 4.3
-trytond_product >= 4.2, < 4.3
-trytond_stock >= 4.2, < 4.3
-trytond_stock_package >= 4.2, < 4.3
-trytond_sale_shipment_cost >= 4.2, < 4.3
-trytond_product_measurements >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+trytond_carrier >= 4.4, < 4.5
+trytond_product >= 4.4, < 4.5
+trytond_stock >= 4.4, < 4.5
+trytond_stock_package >= 4.4, < 4.5
+trytond_stock_shipment_measurements >= 4.4, < 4.5
+trytond_sale_shipment_cost >= 4.4, < 4.5
+trytond_product_measurements >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
--
tryton-modules-stock-package-shipping
More information about the tryton-debian-vcs
mailing list