--- a/.hgignore	Thu Jun 24 09:58:01 2010 +0200
+++ b/.hgignore	Thu Jun 24 11:58:06 2010 +0200
@@ -26,6 +26,7 @@
 src/result.xml
 
 src-db/database/lib/dbmanager.jar
+src-db/database/formalChangesScript.xml
 src-core/lib/openbravo-core.jar
 src-wad/lib/openbravo-wad.jar
 src-trl/lib/openbravo-trl.jar

--- a/build.xml	Thu Jun 24 09:58:01 2010 +0200
+++ b/build.xml	Thu Jun 24 11:58:06 2010 +0200
@@ -92,6 +92,7 @@
   <property name="obx.export.CS" value="false" />
   <property name="chekPerms" value="false" />
   <property name="force" value="false" />
+  <property name="strict.template.application" value="false" />
   <property name="rd" value="false" />
   <property name="local" value="true" />
   <property name="apply.modules.complete.compilation" value="false" />

--- a/config/Openbravo.properties.template	Thu Jun 24 09:58:01 2010 +0200
+++ b/config/Openbravo.properties.template	Thu Jun 24 11:58:06 2010 +0200
@@ -140,6 +140,22 @@
 
 safe.mode=true
 
+################################
+# Strict Template Application  #
+################################
+
+# This property is used to set the configuration script application mode.
+# If the template application mode is strict, then inconsistencies in the template
+# (such as the value to be changed being different from the value in a column
+# data change of a configuration script) will make the process fail.
+# If it's not strict the process will show a warning, but otherwise continue
+
+# For production environments, this property should be false.
+# For development environments, specially those working with
+# Industry templates and configuration scripts, it is advisable to set this property to true
+
+strict.template.application=false
+
 ##############
 # Hibernate #
 ##############

--- a/src-db/database/build.xml	Thu Jun 24 09:58:01 2010 +0200
+++ b/src-db/database/build.xml	Thu Jun 24 11:58:06 2010 +0200
@@ -94,6 +94,7 @@
       <arg value="${base.modules}/"/>
       <arg value="*/src-db/database/sourcedata"/>
       <arg value="${force}"/>
+      <arg value="${strict.template.application}"/>
       <classpath refid="runtime-classpath" />
       <syspropertyset>
          <propertyref name="java.security.egd" />
@@ -123,6 +124,7 @@
       <arg value="*/src-db/database/sourcedata"/>
       <arg value="${module}"/>
       <arg value="${force}"/>
+      <arg value="${strict.template.application}"/>
       <classpath refid="runtime-classpath" />
       <syspropertyset>
          <propertyref name="java.security.egd" />

Binary file src-db/database/lib/dbsourcemanager.jar has changed