erp5_trade: fix DuplicateInventoryConstraint

bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.DuplicateInventoryConstraint.py

@@ -26,6 +26,8 @@
 ##############################################################################
 
 from Products.ERP5Type.mixin.constraint import ConstraintMixin
+from Products.ZSQLCatalog.SQLCatalog import SimpleQuery, NegatedQuery
+
 
 class DuplicateInventoryConstraint(ConstraintMixin):
   """
@@ -61,7 +63,7 @@ class DuplicateInventoryConstraint(ConstraintMixin):
   def _checkConsistency(self, obj, fixit = 0):
     """
       Implement here the consistency checker
-      whenever fixit is not 0, object data should be updated to
+      whenever fixit is not 0, object data should be updated to   -----> NON
       satisfy the constraint
     """
 
@@ -105,14 +107,16 @@ class DuplicateInventoryConstraint(ConstraintMixin):
                                      variation_text=variation_text,
                                      from_date=date, at_date=date,
                                      default_stock_table='stock',
+                                     uid = NegatedQuery(SimpleQuery(uid=movement.getUid())),
                                      node=node)
             for inventory in inventory_list:
-              movement = getObjectFromUid(inventory.stock_uid)
-              if movement.getPortalType().find('Inventory') >= 0:
+              other_movement = getObjectFromUid(inventory.stock_uid)
+              if other_movement.getPortalType().find('Inventory') >= 0:
                 errors.append(self._generateDuplicateError(portal, obj, resource,
                                     variation_text))
           # Now we must reindex with some particular tags
-          activate_kw = {'tag': tag}
-          movement.reindexObject(activate_kw=activate_kw)
+          if fixit:
+            activate_kw = {'tag': tag}
+            movement.reindexObject(activate_kw=activate_kw)
 
     return errors