From b63a9c364617da385e706036dcb7d5253dc7cfa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?=
 <mhiretskiy@asamoukin.local.calculate.ru>
Date: Mon, 26 Jul 2010 16:09:25 +0000
Subject: [PATCH] Fix calculate template conditions

---
 pym/cl_template.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pym/cl_template.py b/pym/cl_template.py
index 74f4e41..1bf97dd 100644
--- a/pym/cl_template.py
+++ b/pym/cl_template.py
@@ -130,8 +130,9 @@ class _terms(_error, _shareTermsFunction):
                     if k == " and ":
                         flagOR = False
                         if listEqual == [] or False in listEqual:
-                            listEqual = []
-                            break
+#                            listEqual = []
+#                            break
+                            listEqual = [False]
                         else:
                             listEqual = [True]
                     # если or
@@ -144,8 +145,10 @@ class _terms(_error, _shareTermsFunction):
                             listEqual = [True]
                             flagOR = True
             else:
-                if flagOR:
-                    continue
+                #if flagOR:
+                #    continue
+                if flagOR and listEqual and all(listEqual):
+                    break
                 #проверка на допустимость названия переменной
                 flagFunction = False
                 if self._reDenyName.search(vals[0]):