[tryton-debian-vcs] tryton-modules-sale-supply-drop-shipment branch upstream-4.0 updated. upstream/4.0.4-1-gbdd1734

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Oct 5 12:27:38 UTC 2017


The following commit has been merged in the upstream-4.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-supply-drop-shipment.git;a=commitdiff;h=upstream/4.0.4-1-gbdd1734

commit bdd173419daa423b93e0a2b8523ba4e47fa20234
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 5 11:27:25 2017 +0200

    Adding upstream version 4.0.5.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 85397bf..9f37a83 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.5 - 2017-10-04
+* Bug fixes (see mercurial logs for details)
+
 Version 4.0.4 - 2017-06-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index f466460..6e03bfe 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale_supply_drop_shipment
-Version: 4.0.4
+Version: 4.0.5
 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 1531e06..4592e9f 100644
--- a/stock.py
+++ b/stock.py
@@ -377,7 +377,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 de42ed1..017d30e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.0.4
+version=4.0.5
 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 44bb4b5..59b2b23 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.0.4
+Version: 4.0.5
 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