[tryton-debian-vcs] tryton-modules-purchase-request branch upstream-4.2 updated. upstream/4.2.0-1-gb2e1bfd

[Mathias Behrle]

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

commit b2e1bfd55b293bb2c0a949923511f697aebe8a36
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jul 2 17:44:48 2017 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 5114ce7..29fc905 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-07-01
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.0 - 2016-11-28
 * Bug fixes (see mercurial logs for details)
 * Allow request without product
diff --git a/COPYRIGHT b/COPYRIGHT
index 029f63b..4891bb6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,8 +1,8 @@
-Copyright (C) 2016 Nicolas Évrard.
+Copyright (C) 2016-2017 Nicolas Évrard.
 Copyright (C) 2013-2015 NaN-tic.
-Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2017 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-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 6933766..86db3d3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_purchase_request
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module for purchase requests
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/purchase_request.py b/purchase_request.py
index 0eef1f0..cdf9c1d 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -455,17 +455,21 @@ class CreatePurchase(Wizard):
                 Decimal(1) / 10 ** Line.unit_price.digits[1])
             line.unit_price = product_price
 
+        taxes = []
+        pattern = cls._get_tax_rule_pattern(line, purchase)
         if line.product:
-            taxes = []
             for tax in line.product.supplier_taxes_used:
                 if purchase.party and purchase.party.supplier_tax_rule:
-                    pattern = cls._get_tax_rule_pattern(line, purchase)
                     tax_ids = purchase.party.supplier_tax_rule.apply(
                         tax, pattern)
                     if tax_ids:
                         taxes.extend(tax_ids)
                     continue
                 taxes.append(tax.id)
+        if purchase.party and purchase.party.supplier_tax_rule:
+            tax_ids = purchase.party.supplier_tax_rule.apply(None, pattern)
+            if tax_ids:
+                taxes.extend(tax_ids)
             line.taxes = taxes
         return line
 
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/tryton.cfg b/tryton.cfg
index 6345ed6..653aff2 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.2.1
 depends:
     ir
     purchase
diff --git a/trytond_purchase_request.egg-info/PKG-INFO b/trytond_purchase_request.egg-info/PKG-INFO
index d922a72..dc2d34d 100644
--- a/trytond_purchase_request.egg-info/PKG-INFO
+++ b/trytond_purchase_request.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-purchase-request
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module for purchase requests
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-purchase-request