From ee12d825b964b3c9294ee90f370fbd3e592cfcab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 1 Feb 2017 21:21:01 +0100 Subject: [PATCH] Use total weight of package issue6158 review29891002 --- CHANGELOG | 4 +++- INSTALL | 6 ++++++ stock.py | 2 +- tryton.cfg | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1c72ee35ae..6e2195ffd7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,2 +1,4 @@ +* Use total weight of package + Version 4.2.0 - 2016-11-28 -* Initial release \ No newline at end of file +* Initial release diff --git a/INSTALL b/INSTALL index 1d88956f93..a2528d3519 100644 --- a/INSTALL +++ b/INSTALL @@ -6,6 +6,12 @@ Prerequisites * Python 2.7 or later (http://www.python.org/) * trytond (http://www.tryton.org/) + * trytond_party (http://www.tryton.org/) + * trytond_product (http://www.tryton.org/) + * trytond_stock (http://www.tryton.org/) + * trytond_stock_shipment_measurements (http://www.tryton.org/) + * trytond_stock_package (http://www.tryton.org/) + * trytond_stock_package_shipping (http://www.tryton.org/) Installation ------------ diff --git a/stock.py b/stock.py index 28f6b30170..fcd3fec54d 100644 --- a/stock.py +++ b/stock.py @@ -309,7 +309,7 @@ class CreateShippingUPS(Wizard): 'UnitOfMeasurement': { 'Code': 'KGS' if use_metric else 'LBS', }, - 'Weight': str(UoM.compute_qty(kg, package.weight, + 'Weight': str(UoM.compute_qty(kg, package.total_weight, kg if use_metric else lb)), }, } diff --git a/tryton.cfg b/tryton.cfg index 909195bb43..3f2566c862 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -6,6 +6,7 @@ depends: party product stock + stock_shipment_measurements stock_package stock_package_shipping xml: