diff options
Diffstat (limited to 'openerp')
| -rw-r--r-- | openerp/addons/base/ir/ir_ui_view.py | 8 | ||||
| -rw-r--r-- | openerp/sql_db.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index 6fe2569211f..1c43faae604 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -899,15 +899,15 @@ class view(osv.osv): if model_value._obj==node_obj: _Node_Field=model_key _Model_Field=model_value._fields_id - flag=False for node_key,node_value in _Node_Obj._columns.items(): if node_value._type=='one2many': if node_value._obj==conn_obj: - if src_node in _Arrow_Obj._columns and flag: + # _Source_Field = "Incoming Arrows" (connected via des_node) + if node_value._fields_id == des_node: _Source_Field=node_key - if des_node in _Arrow_Obj._columns and not flag: + # _Destination_Field = "Outgoing Arrows" (connected via src_node) + if node_value._fields_id == src_node: _Destination_Field=node_key - flag = True datas = _Model_Obj.read(cr, uid, id, [],context) for a in _Node_Obj.read(cr,uid,datas[_Node_Field],[]): diff --git a/openerp/sql_db.py b/openerp/sql_db.py index 0ad135f0ca7..03ba9ca819e 100644 --- a/openerp/sql_db.py +++ b/openerp/sql_db.py @@ -250,7 +250,7 @@ class Cursor(object): def split_for_in_conditions(self, ids): """Split a list of identifiers into one or more smaller tuples safe for IN conditions, after uniquifying them.""" - return tools.misc.split_every(self.IN_MAX, set(ids)) + return tools.misc.split_every(self.IN_MAX, ids) def print_log(self): global sql_counter |