[tryton-debian-vcs] tryton-modules-purchase branch upstream-3.8 updated. upstream/3.8.1-1-g26dfccf
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-3.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase.git;a=commitdiff;h=upstream/3.8.1-1-g26dfccf
commit 26dfccf5838b1b35461877e83a2e75b119446f16
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jul 11 20:29:46 2016 +0200
Adding upstream version 3.8.2.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index b8bb257..f1c4570 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.2 - 2016-07-05
+* Bug fixes (see mercurial logs for details)
+
Version 3.8.1 - 2016-04-06
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 28f5068..2db3f7d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase
-Version: 3.8.1
+Version: 3.8.2
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/purchase.py b/purchase.py
index 98091b6..c6926f8 100644
--- a/purchase.py
+++ b/purchase.py
@@ -288,10 +288,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)
@@ -1178,8 +1178,12 @@ class PurchaseLine(ModelSQL, ModelView):
'_parent_purchase.purchase_date', '_parent_purchase.party')
def on_change_with_delivery_date(self, name=None):
if self.moves:
- return min(m.effective_date if m.effective_date else m.planned_date
- for m in self.moves)
+ dates = filter(
+ None, (m.effective_date or m.planned_date for m in self.moves))
+ if dates:
+ return min(dates)
+ else:
+ return
if (self.product
and self.quantity > 0
and self.purchase and self.purchase.party
diff --git a/tryton.cfg b/tryton.cfg
index 98a88c8..485d807 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.1
+version=3.8.2
depends:
account
account_invoice
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index 7496ee2..9892b9e 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: 3.8.1
+Version: 3.8.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