[tryton-debian-vcs] tryton-modules-sale-shipment-cost branch upstream updated. upstream/4.2.0-1-gea17c17

[Mathias Behrle]

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

commit ea17c1786edb9be63d1fac05c4f40e0c5bd2db18
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 14 10:50:03 2017 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index 80f3050..aa50405 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-03-10
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.0 - 2016-11-28
 * Bug fixes (see mercurial logs for details)
 * Use Carrier Selection instead of a company wise default value
diff --git a/COPYRIGHT b/COPYRIGHT
index 2d2b387..bf012da 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2016 Cédric Krier.
+Copyright (C) 2011-2017 Cédric Krier.
 Copyright (C) 2011-2013 Bertrand Chenal.
-Copyright (C) 2011-2016 Nicolas Évrard.
-Copyright (C) 2011-2016 B2CK SPRL.
+Copyright (C) 2011-2017 Nicolas Évrard.
+Copyright (C) 2011-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/PKG-INFO b/PKG-INFO
index 6be448f..6674df9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale_shipment_cost
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module for sale shipment cost
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/stock.py b/stock.py
index 0c62897..c4ca79c 100644
--- a/stock.py
+++ b/stock.py
@@ -111,11 +111,15 @@ class ShipmentOut:
         pattern = self._get_cost_tax_rule_pattern()
         for tax in product.customer_taxes_used:
             if party.customer_tax_rule:
-                tax_ids = party.customer_tax_rule.apply(None, pattern)
+                tax_ids = party.customer_tax_rule.apply(tax, pattern)
                 if tax_ids:
                     taxes.extend(tax_ids)
                 continue
             taxes.append(tax.id)
+        if party.customer_tax_rule:
+            tax_ids = party.customer_tax_rule.apply(None, pattern)
+            if tax_ids:
+                taxes.extend(tax_ids)
         invoice_line.taxes = taxes
 
         invoice_line.account = product.account_revenue_used
diff --git a/tryton.cfg b/tryton.cfg
index a28eae7..8a47096 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.2.1
 depends:
     account_invoice
     carrier
diff --git a/trytond_sale_shipment_cost.egg-info/PKG-INFO b/trytond_sale_shipment_cost.egg-info/PKG-INFO
index 50163f5..ccc8f33 100644
--- a/trytond_sale_shipment_cost.egg-info/PKG-INFO
+++ b/trytond_sale_shipment_cost.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-sale-shipment-cost
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module for sale shipment cost
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-sale-shipment-cost