From 73d3d8ec8af0b46927b992ca73327ab876e2f24f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 21 Oct 2013 17:51:27 +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 19267e00c7..d13f669ae1 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=3.0.0 +version=3.0.1 depends: account ir From e338a11cbf57753514685d42fd9bbc9b33214468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=B6ftner?= Date: Wed, 22 Jan 2014 15:00:29 +0100 Subject: [PATCH 2/2] check for same product in constraint for internal oderpoints issue3591 review2721002 (transplanted from 203cecdea47d9daf7e53bf7d7070a3aa60806004) --- order_point.py | 1 + 1 file changed, 1 insertion(+) diff --git a/order_point.py b/order_point.py index 360b334d2f..9cce2364cb 100644 --- a/order_point.py +++ b/order_point.py @@ -140,6 +140,7 @@ class OrderPoint(ModelSQL, ModelView): query = ['OR'] for op in internals: arg = ['AND', + ('product', '=', op.product.id), ('provisioning_location', '=', op.storage_location.id), ('storage_location', '=', op.provisioning_location.id), ('company', '=', op.company.id),