From 04a5c76902ca83fd674d3ec412f6c8198f048ed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 5 May 2012 09:28:41 +0200 Subject: [PATCH] Fix nested order_calc tables_args manipulation issue2572 review340003 --- trytond/model/modelsql.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/trytond/model/modelsql.py b/trytond/model/modelsql.py index a23f59446c..9f5ab973eb 100644 --- a/trytond/model/modelsql.py +++ b/trytond/model/modelsql.py @@ -1895,8 +1895,7 @@ class ModelSQL(ModelStorage): table_name + '.' + link_field) for i in range(len(tables)): if table_name in tables[i]: - args = tables_args[tables[i]] - del tables_args[tables[i]] + args = tables_args.pop(tables[i], []) tables[i] = tables[i].replace(table_name, table_name + '.' + link_field) tables_args[tables[i]] = args @@ -1931,8 +1930,7 @@ class ModelSQL(ModelStorage): table_name + '.' + link_field) for i in range(len(tables)): if table_name in tables[i]: - args = tables_args[tables[i]] - del tables_args[tables[i]] + args = tables_args.pop(tables[i], []) tables[i] = tables[i].replace(table_name, table_name + '.' + link_field) tables_args[tables[i]] = args @@ -1951,8 +1949,7 @@ class ModelSQL(ModelStorage): table_name2 + '.' + link_field2) for i in range(1, len(tables)): if table_name2 in tables[i]: - args = tables_args[tables[i]] - del tables_args[tables[i]] + args = tables_args.pop(tables[i], []) tables[i] = tables[i].replace(table_name2, table_name2 + '.' + link_field2) tables_args[tables[i]] = args