[tryton-debian-vcs] tryton-modules-account-stock-landed-cost-weight branch debian updated. debian/4.2.0-1-2-gbea67a4
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:32:30 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-account-stock-landed-cost-weight.git;a=commitdiff;h=debian/4.2.0-1-2-gbea67a4
commit bea67a4160974848986f250a1ba6738fbddeff7a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 7 15:26:00 2017 +0200
Merging upstream version 4.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index c24086c..06cff4e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.0 - 2017-05-01
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index be9339f..f568502 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2015-2016 Cédric Krier.
-Copyright (C) 2015-2016 B2CK SPRL.
+Copyright (C) 2015-2017 Cédric Krier.
+Copyright (C) 2015-2017 B2CK SPRL.
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/INSTALL b/INSTALL
index a333c18..91269ed 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,6 +9,7 @@ Prerequisites
* trytond_account_stock_landed_cost (http://www.tryton.org/)
* trytond_product (http://www.tryton.org/)
* trytond_product_measurements (http://www.tryton.org/)
+ * trytond_stock_shipment_measurements (http://www.tryton.org/)
Installation
------------
diff --git a/PKG-INFO b/PKG-INFO
index 6a237af..c3aaaa5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_stock_landed_cost_weight
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module for landed cost per weight
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_account_stock_landed_cost_weight
========================================
@@ -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 :: Chinese (Simplified)
diff --git a/account.py b/account.py
index e89a229..861d164 100644
--- a/account.py
+++ b/account.py
@@ -2,7 +2,7 @@
# this repository contains the full copyright notices and license terms.
from decimal import Decimal
-from trytond.pool import PoolMeta, Pool
+from trytond.pool import PoolMeta
__all__ = ['LandedCost']
@@ -21,25 +21,13 @@ class LandedCost:
def _get_weight_factors(self):
"Return the factor for each move based on weight"
- pool = Pool()
- ModelData = pool.get('ir.model.data')
- Uom = pool.get('product.uom')
-
- kg = Uom(ModelData.get_id('product', 'uom_kilogram'))
moves = [m for s in self.shipments for m in s.incoming_moves
if m.state != 'cancel']
sum_weight = Decimal(0)
weights = {}
for move in moves:
- if not move.product.weight:
- weight = 0
- else:
- weight = Uom.compute_qty(
- move.product.weight_uom,
- move.product.weight * move.internal_quantity,
- kg, round=False)
- weight = Decimal(str(weight))
+ weight = Decimal(str(move.internal_weight or 0))
weights[move.id] = weight
sum_weight += weight
factors = {}
diff --git a/setup.py b/setup.py
index 7957b44..98a7196 100644
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,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 :: Chinese (Simplified)',
diff --git a/tryton.cfg b/tryton.cfg
index 68a06f4..b3aa471 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,7 +1,8 @@
[tryton]
-version=4.2.0
+version=4.4.0
depends:
account_stock_landed_cost
ir
product
product_measurements
+ stock_shipment_measurements
diff --git a/trytond_account_stock_landed_cost_weight.egg-info/PKG-INFO b/trytond_account_stock_landed_cost_weight.egg-info/PKG-INFO
index fa3e61c..a49bc90 100644
--- a/trytond_account_stock_landed_cost_weight.egg-info/PKG-INFO
+++ b/trytond_account_stock_landed_cost_weight.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-stock-landed-cost-weight
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module for landed cost per weight
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_account_stock_landed_cost_weight
========================================
@@ -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 :: Chinese (Simplified)
diff --git a/trytond_account_stock_landed_cost_weight.egg-info/requires.txt b/trytond_account_stock_landed_cost_weight.egg-info/requires.txt
index 64a3c6c..87600bf 100644
--- a/trytond_account_stock_landed_cost_weight.egg-info/requires.txt
+++ b/trytond_account_stock_landed_cost_weight.egg-info/requires.txt
@@ -1,4 +1,5 @@
-trytond_account_stock_landed_cost >= 4.2, < 4.3
-trytond_product >= 4.2, < 4.3
-trytond_product_measurements >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+trytond_account_stock_landed_cost >= 4.4, < 4.5
+trytond_product >= 4.4, < 4.5
+trytond_product_measurements >= 4.4, < 4.5
+trytond_stock_shipment_measurements >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
--
tryton-modules-account-stock-landed-cost-weight
More information about the tryton-debian-vcs
mailing list