[tryton-debian-vcs] tryton-modules-purchase branch upstream updated. upstream/4.0.1-1-g1bd5b52
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Jul 12 13:05:13 UTC 2016
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase.git;a=commitdiff;h=upstream/4.0.1-1-g1bd5b52
commit 1bd5b52459fa4a704d8eb9d0bcf6a1907a690711
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jul 11 20:26:03 2016 +0200
Adding upstream version 4.0.2.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 0ea7407..b10c19f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.2 - 2016-07-05
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.1 - 2016-05-11
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index c35bcc3..11ac03b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase
-Version: 4.0.1
+Version: 4.0.2
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/purchase.py b/purchase.py
index 27a57f8..140ba7d 100644
--- a/purchase.py
+++ b/purchase.py
@@ -292,10 +292,10 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin):
condition=purchase_line.purchase == sql_table.id
).join(invoice_line, 'LEFT',
condition=(invoice_line.origin ==
- Concat(PurchaseLine.__name__, purchase_line.id))
+ Concat(PurchaseLine.__name__ + ',', purchase_line.id))
).join(move, 'LEFT',
- condition=(move.origin == Concat(PurchaseLine.__name__,
- purchase_line.id))
+ condition=(move.origin == Concat(
+ PurchaseLine.__name__ + ',', purchase_line.id))
).select(sql_table.id,
where=((sql_table.state == 'confirmed')
& ((invoice_line.id != Null)
diff --git a/tryton.cfg b/tryton.cfg
index 5f3f141..7005a5c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.1
+version=4.0.2
depends:
account
account_invoice
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index 02463f8..8865a97 100644
--- a/trytond_purchase.egg-info/PKG-INFO
+++ b/trytond_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-purchase
-Version: 4.0.1
+Version: 4.0.2
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-purchase
More information about the tryton-debian-vcs
mailing list