[tryton-debian-vcs] tryton-modules-sale-supply-drop-shipment branch debian-stretch-4.2 updated. debian/4.2.2-1-4-g4d01c89
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 5 12:27:37 UTC 2017
The following commit has been merged in the debian-stretch-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-supply-drop-shipment.git;a=commitdiff;h=debian/4.2.2-1-4-g4d01c89
commit 4d01c896ca0b0af8be6a23214624226f8b13467c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 5 11:29:12 2017 +0200
Releasing debian version 4.2.3-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 231a821..5a47feb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-sale-supply-drop-shipment (4.2.3-1) unstable; urgency=medium
+
+ * Use the preferred https URL format in the copyright file.
+ * Bump the Standards-Version to 4.0.1.
+ * Merging upstream version 4.2.3.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 05 Oct 2017 11:29:12 +0200
+
tryton-modules-sale-supply-drop-shipment (4.2.2-1) unstable; urgency=medium
* Setting the branch in the watch file to the fixed version 4.2.
commit 6b3bd91165002db0b9d1dfc0b898af392a8c937b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 5 11:29:11 2017 +0200
Merging upstream version 4.2.3.
diff --git a/CHANGELOG b/CHANGELOG
index daa613e..4d1eeb8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.3 - 2017-10-04
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.2 - 2017-06-06
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 4de4401..dc53f50 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale_supply_drop_shipment
-Version: 4.2.2
+Version: 4.2.3
Summary: Tryton module for sale supply drop shipment
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/purchase.py b/purchase.py
index 415d6a1..6a75b38 100644
--- a/purchase.py
+++ b/purchase.py
@@ -81,7 +81,8 @@ class Purchase:
PurchaseConfig = pool.get('purchase.configuration')
config = PurchaseConfig(1)
- return config.purchase_drop_location.id
+ if config.purchase_drop_location:
+ return config.purchase_drop_location.id
@fields.depends('customer', 'delivery_address')
def on_change_customer(self):
diff --git a/sale.py b/sale.py
index e1f1a7c..cc6ec9c 100644
--- a/sale.py
+++ b/sale.py
@@ -36,7 +36,8 @@ class Sale:
Config = pool.get('sale.configuration')
config = Config(1)
- return config.sale_drop_location.id
+ if config.sale_drop_location:
+ return config.sale_drop_location.id
def get_drop_shipments(self, name):
DropShipment = Pool().get('stock.shipment.drop')
diff --git a/stock.py b/stock.py
index e488ad4..783fea8 100644
--- a/stock.py
+++ b/stock.py
@@ -374,7 +374,8 @@ class ShipmentDrop(Workflow, ModelSQL, ModelView):
s_move.unit_price * internal_quantity)
for product, cost in product_cost.iteritems():
qty = Decimal(str(product_qty[product]))
- product_cost[product] = (cost / qty).quantize(cost_exp)
+ if qty:
+ product_cost[product] = (cost / qty).quantize(cost_exp)
for c_move in shipment.customer_moves:
if c_move.state == 'cancel':
continue
diff --git a/tryton.cfg b/tryton.cfg
index a16c19d..6ff1a2b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.2
+version=4.2.3
depends:
company
ir
diff --git a/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO b/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
index bda6ca2..3d953a9 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
+++ b/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-sale-supply-drop-shipment
-Version: 4.2.2
+Version: 4.2.3
Summary: Tryton module for sale supply drop shipment
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-sale-supply-drop-shipment
More information about the tryton-debian-vcs
mailing list