[tryton-debian-vcs] tryton-modules-sale-shipment-cost branch upstream-3.6 updated. upstream/3.6.1-1-g0ffb30e
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Mar 14 12:11:11 UTC 2017
The following commit has been merged in the upstream-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-shipment-cost.git;a=commitdiff;h=upstream/3.6.1-1-g0ffb30e
commit 0ffb30e28c7a6e48a0e72f88bc686fac11a8700e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 14 10:52:47 2017 +0100
Adding upstream version 3.6.2.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index a9d08e5..2aaeb6c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.2 - 2017-03-10
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.1 - 2016-12-17
* Bug fixes (see mercurial logs for details)
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 2c5054f..cde3d5c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale_shipment_cost
-Version: 3.6.1
+Version: 3.6.2
Summary: Tryton module for sale shipment cost
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/stock.py b/stock.py
index e18fc82..9a4bd43 100644
--- a/stock.py
+++ b/stock.py
@@ -110,11 +110,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 da09ab4..21f480f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.1
+version=3.6.2
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 ee7d9a5..51cf0a1 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: 3.6.1
+Version: 3.6.2
Summary: Tryton module for sale shipment cost
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-sale-shipment-cost
More information about the tryton-debian-vcs
mailing list