CommitTool: Update workflow status of old snapshot before installling a new snapshot

product/ERP5/Document/BusinessCommit.py

@@ -160,7 +160,7 @@ class BusinessCommit(Folder):
     if eqv_snapshot not in [None, self]:
       if site.portal_workflow.isTransitionPossible(
           eqv_snapshot, 'install'):
-        eqv_snapshot.install(self)
+        eqv_snapshot.install()
 
   def getItemPathList(self):
     return [l.getProperty('item_path') for l in self.objectValues()]

product/ERP5/Document/BusinessSnapshot.py

@@ -114,7 +114,25 @@ class BusinessSnapshot(Folder):
                       PropertySheet.Version,
                     )
 
+  def getItemList(self):
+    """
+    Returns the collection of all Business Item, Business Property Item and
+    Business Patch item at the given snapshot.
+    """
+    return self.objectValues()
+
+  def getItemPathList(self):
+    """
+    Returns the path of all Business Item, Business Property Item and
+    Business Patch item at the given snapshot.
+    """
+    return [l.getProperty('item_path') for l in self.getItemList()]
+
   def getLastSnapshot(self):
+    """
+    Get last snapshot exisiting.
+    Returns None if there is no last snapshot.
+    """
 
     portal = self.getPortalObject()
     commit_tool = portal.portal_commits
@@ -130,20 +148,6 @@ class BusinessSnapshot(Folder):
 
     return None
 
-  def getItemList(self):
-    """
-    Returns the collection of all Business Item, Business Property Item and
-    Business Patch item at the given snapshot.
-    """
-    return self.objectValues()
-
-  def getItemPathList(self):
-    """
-    Returns the path of all Business Item, Business Property Item and
-    Business Patch item at the given snapshot.
-    """
-    return [l.getProperty('item_path') for l in self.getItemList()]
-
   def buildSnapshot(self):
     """
     Using equivalent commit, create a snapshot of ZODB state
@@ -217,5 +221,14 @@ class BusinessSnapshot(Folder):
     """
     Install the sub-objects in the commit
     """
+    site = self.getPortalObject()
+    # While installing the last snapshot state should be changed to 'replaced'
+    last_snapshot = self.getLastSnapshot()
+    if last_snapshot not in [None, self]:
+      if site.portal_workflow.isTransitionPossible(
+          last_snapshot, 'replace'):
+        last_snapshot.replace(self)
+
+    # Now install the items in new snapshot
     for item in self.objectValues():
       item.install(self)

product/ERP5/Tool/CommitTool.py

@@ -159,8 +159,8 @@ class CommitTool (BaseTool):
     meta_type = 'ERP5 Commit Tool'
     portal_type = 'Commit Tool'
     allowed_types = (
-      'ERP5 Business Commit',
-      'ERP5 Business Snapshot',
+      'Business Commit',
+      'Business Snapshot',
       )
 
     # This stores information on repositories.