From a57255b9b89d79c8ac33ed42a19f67f0cdc1f889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 1 Oct 2022 15:35:33 +0200
Subject: [PATCH] Use length of field name instead of lstrip to get nested part
 of clause

issue11714
review437381003
---
 common.py | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/common.py b/common.py
index 660e5c264f..98eb94b1d1 100644
--- a/common.py
+++ b/common.py
@@ -36,22 +36,17 @@ def search_shipments_returns(model_name):
                 bool_op = 'AND'
             else:
                 bool_op = 'OR'
-            nested = clause[0].lstrip(name)
-            if nested:
-                return [bool_op,
-                    domain,
-                    ('lines.components.moves.shipment' + nested,)
-                    + tuple(clause[1:3]) + (model_name,) + tuple(clause[3:]),
-                    ]
-            else:
-                if isinstance(clause[2], str):
-                    target = 'rec_name'
+            nested = clause[0][len(name):]
+            if not nested:
+                if isinstance(operand, str):
+                    nested = '.rec_name'
                 else:
-                    target = 'id'
-                return [bool_op,
-                    domain,
-                    ('lines.components.moves.shipment.' + target,)
-                    + tuple(clause[1:3]) + (model_name,)]
+                    nested = '.id'
+            return [bool_op,
+                domain,
+                ('lines.components.moves.shipment' + nested,
+                    operator, operand, model_name, *extra),
+                ]
         return wrapper
     return _search_shipments_returns