0011818: Required additional updates shows only the last available version not the minimum

diff --git a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
@@ -24,6 +24,7 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -40,6 +41,7 @@
 import org.openbravo.erpCommon.modules.ModuleTree;
 import org.openbravo.erpCommon.modules.UninstallModule;
 import org.openbravo.erpCommon.modules.VersionUtility;
+import org.openbravo.erpCommon.modules.VersionUtility.VersionComparator;
 import org.openbravo.erpCommon.obps.ActivationKey;
 import org.openbravo.erpCommon.obps.ActivationKey.CommercialModuleStatus;
 import org.openbravo.erpCommon.utility.ComboTableData;
@@ -562,6 +564,8 @@
     OBError message = null;
     boolean found = false;
     boolean check;
+    // to hold (key,value) = (moduleId, minVersion)
+    Map<String, String> minVersions = new HashMap<String, String>();
 
     VersionUtility.setPool(this);
 
@@ -629,6 +633,10 @@
         // after all the checks, save the ImportModule object in session
         // to take it in next steps
         vars.setSessionObject("InstallModule|ImportModule", im);
+
+        // calculate minimum required version of each extra module (installs & updates)
+        minVersions = calcMinVersions(im);
+
       } else { // Dependencies not satisfied, do not show continue button
         message = im.getCheckError();
         discard[5] = "discardContinue";
@@ -655,11 +663,27 @@
     xmlDocument.setParameter("directory", "var baseDirectory = \"" + strReplaceWith + "/\";\n");
     xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage() + "\";");
     xmlDocument.setParameter("theme", vars.getTheme());
-    if (inst != null && inst.length > 0)
-      xmlDocument.setData("installs", FieldProviderFactory.getFieldProviderArray(inst));
+    if (inst != null && inst.length > 0) {
+      FieldProviderFactory[] insts = (FieldProviderFactory[]) FieldProviderFactory
+          .getFieldProviderArray(inst);
+      for (FieldProvider fp : insts) {
+        String moduleId = fp.getField("moduleID");
+        FieldProviderFactory.setField(fp, "versionNoMin", minVersions.get(moduleId));
+      }
+      xmlDocument.setData("installs", insts);
+    }
 
-    if (upd != null && upd.length > 0)
-      xmlDocument.setData("updates", FieldProviderFactory.getFieldProviderArray(upd));
+    if (upd != null && upd.length > 0) {
+      FieldProviderFactory[] upds = (FieldProviderFactory[]) FieldProviderFactory
+          .getFieldProviderArray(upd);
+      for (FieldProvider fp : upds) {
+        String moduleId = fp.getField("moduleID");
+        FieldProviderFactory.setField(fp, "versionNoMin", minVersions.get(moduleId));
+        // TODO: read module version for locally installed module
+        FieldProviderFactory.setField(fp, "versionNoCurr", "ToBeDone");
+      }
+      xmlDocument.setData("updates", upds);
+    }
 
     xmlDocument.setParameter("inpLocalInstall", islocal ? "Y" : "N");
 
@@ -683,6 +707,55 @@
     out.close();
   }
 
+  /**
+   * calculate minimum required version for each module in consistent set of (installs, updates)
+   * returned by a checkConsistency call
+   * 
+   * @param im
+   */
+  private Map<String, String> calcMinVersions(ImportModule im) {
+    // (key,value) = (moduleId, minRequiredVersion)
+    Map<String, String> minVersions = new HashMap<String, String>();
+    for (Module m : im.getModulesToInstall()) {
+      calcMinVersionFromDeps(minVersions, m.getDependencies());
+      calcMinVersionFromDeps(minVersions, m.getIncludes());
+    }
+    for (Module m : im.getModulesToUpdate()) {
+      calcMinVersionFromDeps(minVersions, m.getDependencies());
+      calcMinVersionFromDeps(minVersions, m.getIncludes());
+    }
+
+    // check and show:
+    for (Module m : im.getModulesToInstall()) {
+      log4j.error("Install module " + m.getName() + " in version " + m.getVersionNo()
+          + ", required is version >=" + minVersions.get(m.getModuleID()));
+    }
+    for (Module m : im.getModulesToUpdate()) {
+      log4j.error("Updating module " + m.getName() + " in version " + m.getVersionNo()
+          + ", required is version >=" + minVersions.get(m.getModuleID()));
+    }
+    return minVersions;
+  }
+
+  /**
+   * Utility method which processes a list of dependencies and fills a Map of (moduleID, minVersion)
+   * 
+   * @param minVersions
+   *          in/out-parameter with map of (moduleID, minVersion)
+   * @param deps
+   *          array of dependency entries
+   */
+  private static void calcMinVersionFromDeps(Map<String, String> minVersions,
+      ModuleDependency[] deps) {
+    for (ModuleDependency md : deps) {
+      String oldMinVersion = minVersions.get(md.getModuleID());
+      VersionComparator vc = new VersionComparator();
+      if (oldMinVersion == null || vc.compare(oldMinVersion, md.getVersionStart()) < 0) {
+        minVersions.put(md.getModuleID(), md.getVersionStart());
+      }
+    }
+  }
+
   private boolean checkCommercialModules(ImportModule im, HttpServletResponse response,
       VariablesSecureApp vars) throws IOException {
     ActivationKey ak = new ActivationKey();
diff --git a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.html b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.html
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.html
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.html
@@ -240,7 +240,7 @@
                     <div class="Label_ReadOnly_Text">Please note: The following additional modules are also required to be able to install the selected module(s):</div>
                     <div style="height: 10px;"></div>
                      <FIELD_TMP id="instList">
-                      <div class="PlainText_normal"><span id="moduleInstall">xxdep1</span>&nbsp;<span id="moduleInstallVer">xxVer</span> - <a class="LabelLink_noicon" href="#" id="linkAdditional" onclick="viewModule('xx');">view details</a></div>
+                      <div class="PlainText_normal"><span id="moduleInstall">xxdep1</span>&nbsp;<span id="moduleInstallVer">xxVer</span> (needed <span id="moduleInstallVerMin">xxxVerMin</span>) - <a class="LabelLink_noicon" href="#" id="linkAdditional" onclick="viewModule('xx');">view details</a></div>
                       <div style="height: 10px;"></div>
                     </FIELD_TMP>
                   </FIELD_TMP>
@@ -248,7 +248,7 @@
                     <div class="Label_ReadOnly_Text">Required additional updates:</div>
                     <div style="height: 10px;"></div>
                     <FIELD_TMP id="updtList">
-                      <div class="PlainText_normal"><span id="moduleUpdate">xxdep1</span>&nbsp;<span id="moduleUpdateVer">xxVer</span> - <a class="LabelLink_noicon" href="#" id="linkUpdate" onclick="viewModule('xx');">view details</a></div>
+                      <div class="PlainText_normal"><span id="moduleUpdate">xxdep1</span>&nbsp;<span id="moduleUpdateVer">xxVer</span> (current <span id="moduleUpdateVerCurr">xxxVerCurr</span>, needed <span id="moduleUpdateVerMin">xxxVerMin</span>) - <a class="LabelLink_noicon" href="#" id="linkUpdate" onclick="viewModule('xx');">view details</a></div>
                       <div style="height: 10px;"></div>
                     </FIELD_TMP>
                   </FIELD_TMP>
diff --git a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.xml b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.xml
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.xml
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.xml
@@ -39,6 +39,7 @@
   <structure name="installs">
     <FIELD id="moduleInstall">name</FIELD>
     <FIELD id="moduleInstallVer">versionNo</FIELD>
+    <FIELD id="moduleInstallVerMin">versionNoMin</FIELD>
     <FIELD id="linkAdditional" attribute="onclick" replace="xx">moduleVersionID</FIELD>
     <SECTION id="instList"/>
   </structure>
@@ -46,6 +47,8 @@
   <structure name="updates">
     <FIELD id="moduleUpdate">name</FIELD>
     <FIELD id="moduleUpdateVer">versionNo</FIELD>
+    <FIELD id="moduleUpdateVerMin">versionNoMin</FIELD>
+    <FIELD id="moduleUpdateVerCurr">versionNoCurr</FIELD>
     <FIELD id="linkUpdate" attribute="onclick" replace="xx">moduleVersionID</FIELD>
     <SECTION id="updtList"/>
   </structure>