[tryton-debian-vcs] tryton-modules-purchase-request branch debian updated. debian/4.4.1-1-3-g85a1e45
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Jul 2 17:56:24 UTC 2017
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase-request.git;a=commitdiff;h=debian/4.4.1-1-3-g85a1e45
commit 85a1e4503a88d534a32756f21cabef3cdb8fb137
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jul 2 17:43:19 2017 +0200
Releasing debian version 4.4.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 78a3544..c2e6007 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-purchase-request (4.4.2-1) unstable; urgency=medium
+
+ * Change the maintainer address to tryton-debian at lists.alioth.debian.org
+ (Closes: #865109).
+ * Merging upstream version 4.4.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 02 Jul 2017 17:43:19 +0200
+
tryton-modules-purchase-request (4.4.1-1) unstable; urgency=medium
* Add the actual upstream maintainer key to signing-key.asc.
commit 88330e83942cb5ae35ba0e3a3b995faa38fa7ca3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jul 2 17:43:19 2017 +0200
Merging upstream version 4.4.2.
diff --git a/CHANGELOG b/CHANGELOG
index 079411f..2a73029 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.2 - 2017-07-01
+* Bug fixes (see mercurial logs for details)
+
Version 4.4.1 - 2017-06-06
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 5dd6940..9d1af5c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase_request
-Version: 4.4.1
+Version: 4.4.2
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 ef2aa42..56a23ea 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -376,11 +376,15 @@ class CreatePurchase(Wizard):
if (getattr(self.ask_party, 'party', None)
and getattr(self.ask_party, 'company', None)):
+ def compare_string(first, second):
+ return (first or '') == (second or '')
+
def to_write(request):
return (not request.purchase_line
and not request.party
and request.product == self.ask_party.product
- and request.description == self.ask_party.description)
+ and compare_string(
+ request.description, self.ask_party.description))
reqs = filter(to_write, requests)
if reqs:
Request.write(reqs, {
@@ -466,17 +470,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/tryton.cfg b/tryton.cfg
index bfe1b2b..da0fb67 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.1
+version=4.4.2
depends:
ir
purchase
diff --git a/trytond_purchase_request.egg-info/PKG-INFO b/trytond_purchase_request.egg-info/PKG-INFO
index 3670be7..3d4d7bf 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.4.1
+Version: 4.4.2
Summary: Tryton module for purchase requests
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-purchase-request
More information about the tryton-debian-vcs
mailing list