From 96f92843c5c515ab9cfcb2851659d1a386ca82c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 21 Oct 2013 17:41:14 +0200 Subject: [PATCH 1/2] Increase version number --- tryton.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tryton.cfg b/tryton.cfg index 4595cb7d77..10ce152bd6 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=3.0.0 +version=3.0.1 depends: ir purchase From 4bbc4247fca7b1362dd5af67fc092d9fe5dc455c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 18 Feb 2014 18:56:26 +0100 Subject: [PATCH 2/2] Do not created purchase request when moves exist for the sale line issue3651 review3191004 (transplanted from a7db0cb0f2509471b958347e0c583cc4606317a8) --- sale.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sale.py b/sale.py index deb97ed9e1..9be31f9f93 100644 --- a/sale.py +++ b/sale.py @@ -75,7 +75,8 @@ class SaleLine: if (self.type != 'line' or not self.product or self.quantity <= 0 - or not self.product.purchasable): + or not self.product.purchasable + or any(m.state != 'cancel' for m in self.moves)): return False return self.product.supply_on_sale